packages: ocp/ocp-Makefile.patch, ocp/ocp-desktop.patch - updated for 0.1.19

[lisu]

Author: lisu                         Date: Sun May 16 07:41:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 0.1.19

---- Files affected:
packages/ocp:
   ocp-Makefile.patch (1.4 -> 1.5) , ocp-desktop.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/ocp/ocp-Makefile.patch
diff -u packages/ocp/ocp-Makefile.patch:1.4 packages/ocp/ocp-Makefile.patch:1.5
--- packages/ocp/ocp-Makefile.patch:1.4	Wed Jan 20 13:46:01 2010
+++ packages/ocp/ocp-Makefile.patch	Sun May 16 09:41:35 2010
@@ -1,5 +1,5 @@
---- ocp-0.1.18/Makefile.in~	2010-01-20 12:55:09.523239281 +0100
-+++ ocp-0.1.18/Makefile.in	2010-01-20 13:02:50.896529537 +0100
+--- ocp-0.1.19/Makefile.in~	2010-05-16 11:33:51.712738731 +0200
++++ ocp-0.1.19/Makefile.in	2010-05-16 11:37:12.162807478 +0200
 @@ -35,8 +35,6 @@
  
  
@@ -9,29 +9,29 @@
  	mkdir -p "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data"
  	$(CP) ocp.hlp "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data"
  	mkdir -p "$(DESTDIR)/etc"
-@@ -60,15 +58,10 @@
+@@ -60,14 +58,10 @@
  ifeq ($(HAVE_X11),1)
  	$(CP) ocp-x11 "$(DESTDIR)$(BINDIR)/ocp-x11"
  endif
 -	$(CP) ultrafix.sh "$(DESTDIR)$(BINDIR)/ultrafix.sh"
 -	mkdir -p "$(DESTDIR)$(ULTRADIR)"
 -	$(MAKE) -C doc DESTDIR="$(DESTDIR)" install TOPDIR="../$(TOPDIR)"
+-
  ifeq ($(HAVE_X11),1)
--	mkdir -p "$(DESTDIR)$(PREFIX)/share/applications" "$(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/" "$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/" "$(DESTDIR)$(SYSCONFDIR)/X11/wmconfig"
-+	mkdir -p "$(DESTDIR)$(PREFIX)/share/applications" "$(DESTDIR)$(PREFIX)/share/pixmaps"
- 	$(CP) desktop/opencubicplayer.desktop "$(DESTDIR)$(PREFIX)/share/applications"
+-	mkdir -p "$(DESTDIR)$(PREFIX)/share/applications" "$(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/" "$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/"
 -	$(CP) desktop/opencubicplayer.xpm "$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/opencubicplayer.xpm"
 -	$(CP) desktop/opencubicplayer_mini.xpm "$(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/opencubicplayer.xpm"
--	$(CP) desktop/opencubicplayer "$(DESTDIR)$(SYSCONFDIR)/X11/wmconfig"
++	mkdir -p "$(DESTDIR)$(PREFIX)/share/applications" "$(DESTDIR)$(PREFIX)/share/pixmaps"
++	$(CP) desktop/opencubicplayer.desktop "$(DESTDIR)$(PREFIX)/share/applications"
 +	$(CP) desktop/opencubicplayer.xpm "$(DESTDIR)$(PREFIX)/share/pixmaps"
  endif
- 	$(MAKE) -C boot TOPDIR=../$(TOPDIR) install
- 	$(MAKE) -C cpiface TOPDIR=../$(TOPDIR) install
-@@ -95,7 +88,6 @@
- 	$(MAKE) -C playxm TOPDIR=../$(TOPDIR) install
+ 
+ ifeq ($(HAVE_X11),1)
+@@ -104,7 +98,6 @@
+ 	$(MAKE) -C playym TOPDIR=../$(TOPDIR) install
  	$(MAKE) -C stuff TOPDIR=../$(TOPDIR) install
  	$(MAKE) -C medialib TOPDIR=../$(TOPDIR) install
 -	$(MAKE) -C doc TOPDIR="../$(TOPDIR)" install
  
  uninstall:
- 	$(MAKE) -C boot TOPDIR=../$(TOPDIR) uninstall
+ 	$(MAKE) -C asm_emu TOPDIR=../$(TOPDIR) uninstall

================================================================
Index: packages/ocp/ocp-desktop.patch
diff -u packages/ocp/ocp-desktop.patch:1.2 packages/ocp/ocp-desktop.patch:1.3
--- packages/ocp/ocp-desktop.patch:1.2	Tue Jan  6 09:36:15 2009
+++ packages/ocp/ocp-desktop.patch	Sun May 16 09:41:35 2010
@@ -1,8 +1,9 @@
---- ocp-0.1.16/desktop/opencubicplayer.desktop.in~	2009-01-06 09:05:03.000000000 +0100
-+++ ocp-0.1.16/desktop/opencubicplayer.desktop.in	2009-01-06 09:05:03.000000000 +0100
-@@ -1,9 +1,10 @@
+--- ocp-0.1.19/desktop/opencubicplayer.desktop.in~	2010-05-15 20:33:38.000000000 +0200
++++ ocp-0.1.19/desktop/opencubicplayer.desktop.in	2010-05-16 11:32:43.936164827 +0200
+@@ -1,10 +1,11 @@
  [Desktop Entry]
  Name=Open Cubic Player
+ GenericName=Music Player
 -Comment=Open Cubic Player @PACKAGE_VERSION@ for UNIX 
 +Comment=Open Cubic Player for UNIX 
  Encoding=UTF-8
@@ -11,6 +12,5 @@
  Icon=opencubicplayer
  Terminal=false
  Type=Application
--Categories=Application;AudioVideo;
-+Categories=AudioVideo;Player;
+ Categories=Application;AudioVideo;Audio;
 +# vi: encoding=utf-8
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ocp/ocp-Makefile.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ocp/ocp-desktop.patch?r1=1.2&r2=1.3&f=u