Author: lisu Date: Tue Jan 6 08:36:22 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up to 0.1.16
---- Files affected:
SOURCES:
ocp-Makefile.patch (1.2 -> 1.3) , ocp-desktop.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/ocp-Makefile.patch
diff -u SOURCES/ocp-Makefile.patch:1.2 SOURCES/ocp-Makefile.patch:1.3
--- SOURCES/ocp-Makefile.patch:1.2 Fri Jan 18 11:59:08 2008
+++ SOURCES/ocp-Makefile.patch Tue Jan 6 09:36:13 2009
@@ -1,31 +1,32 @@
---- ocp-0.1.15/Makefile.in~ 2008-01-18 12:51:57.000000000 +0100
-+++ ocp-0.1.15/Makefile.in 2008-01-18 12:51:52.000000000 +0100
-@@ -7,7 +7,6 @@
+--- ocp-0.1.16/Makefile.in~ 2009-01-06 09:19:16.000000000 +0100
++++ ocp-0.1.16/Makefile.in 2009-01-06 09:22:17.000000000 +0100
+@@ -16,7 +16,6 @@
install: all
- mkdir -p "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)"
-- $(CP) AUTHORS BUGS COPYING CREDITS KEYBOARD_REMAPS SUID TODO
"$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)"
+ mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)"
+- $(CP) AUTHORS BUGS COPYING CREDITS KEYBOARD_REMAPS SUID TODO
"$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)"
mkdir -p "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data"
$(CP) ocp.pak "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data"
mkdir -p "$(DESTDIR)/etc"
-@@ -18,15 +17,10 @@
+@@ -28,15 +27,10 @@
mkdir -p "$(DESTDIR)$(BINDIR)"
$(CP) ocp "$(DESTDIR)$(BINDIR)/ocp$(DIR_SUFFIX)"
- if ! test -z $(DIR_SUFFIX); then ln -sf "$(BINDIR)/ocp$(DIR_SUFFIX)"
"$(DESTDIR)$(BINDIR)/ocp"; fi
+ if ! test -z $(DIR_SUFFIX); then ln -sf "ocp$(DIR_SUFFIX)"
"$(DESTDIR)$(BINDIR)/ocp"; fi
- $(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/pixmaps/mini" "$(DESTDIR)$(SYSCONFDIR)/X11/wmconfig"
+- 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"
- $(CP) desktop/opencubicplayer.xpm "$(DESTDIR)$(PREFIX)/share/pixmaps"
-- $(CP) desktop/opencubicplayer_mini.xpm
"$(DESTDIR)$(PREFIX)/share/pixmaps/mini"
+- $(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"
++ $(CP) desktop/opencubicplayer.xpm "$(DESTDIR)$(PREFIX)/share/pixmaps"
endif
$(MAKE) -C binfile TOPDIR=../$(TOPDIR) install
$(MAKE) -C boot TOPDIR=../$(TOPDIR) install
-@@ -52,7 +46,6 @@
+@@ -64,7 +58,6 @@
$(MAKE) -C playxm TOPDIR=../$(TOPDIR) install
$(MAKE) -C stuff TOPDIR=../$(TOPDIR) install
$(MAKE) -C medialib TOPDIR=../$(TOPDIR) install
================================================================
Index: SOURCES/ocp-desktop.patch
diff -u SOURCES/ocp-desktop.patch:1.1 SOURCES/ocp-desktop.patch:1.2
--- SOURCES/ocp-desktop.patch:1.1 Thu Oct 25 00:04:20 2007
+++ SOURCES/ocp-desktop.patch Tue Jan 6 09:36:15 2009
@@ -1,19 +1,15 @@
---- ocp-0.1.14/desktop/opencubicplayer.desktop.in~ 2007-10-21
19:45:23.000000000 +0200
-+++ ocp-0.1.14/desktop/opencubicplayer.desktop.in 2007-10-24
23:47:58.000000000 +0200
-@@ -1,9 +1,11 @@
+--- 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 @@
[Desktop Entry]
Name=Open Cubic Player
-Comment=Open Cubic Player @PACKAGE_VERSION@ for UNIX
--Encoding=Legacy-Mixed
++Comment=Open Cubic Player for UNIX
+ Encoding=UTF-8
-ex...@bindir@/ocp
--Icon=mini/opencubicplayer_mini.xpm
--Terminal=0
-+Comment=Open Cubic Player for UNIX
-+Comment[pl]=Open Cubic Player dla UNIXa
-+Encoding=UTF-8
+Exec=ocp
-+Icon=opencubicplayer.xpm
-+Terminal=false
+ Icon=opencubicplayer
+ Terminal=false
Type=Application
-Categories=Application;AudioVideo;
+Categories=AudioVideo;Player;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ocp-Makefile.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ocp-desktop.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
