SOURCES: djvulibre-desktop.patch, djvulibre-nostrip.patch - update...

[qboosh]

Author: qboosh                       Date: Sun Feb  4 22:10:36 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 3.5.18

---- Files affected:
SOURCES:
   djvulibre-desktop.patch (1.2 -> 1.3) , djvulibre-nostrip.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/djvulibre-desktop.patch
diff -u SOURCES/djvulibre-desktop.patch:1.2 SOURCES/djvulibre-desktop.patch:1.3
--- SOURCES/djvulibre-desktop.patch:1.2	Sun Jul 25 23:18:24 2004
+++ SOURCES/djvulibre-desktop.patch	Sun Feb  4 23:10:31 2007
@@ -1,13 +1,50 @@
---- djvulibre-3.5.14/gui/desktop/djview.desktop.orig	2004-05-05 18:10:01.000000000 +0200
-+++ djvulibre-3.5.14/gui/desktop/djview.desktop	2004-07-25 21:04:09.754254528 +0200
-@@ -11,6 +11,8 @@
- GenericName[fr]=Afficheur DjVu
- GenericName[it]=Visualizzatore DjVu
- GenericName[ja]=DjVuăƒ“ăƒĽăƒźă‚˘
-+GenericName[pl]=PrzeglÄ
darka DjVu
- StartupWMClass=Djview
--Terminal=0
+--- djvulibre-3.5.18/desktopfiles/djvulibre-djview3.desktop.orig	2007-01-15 05:19:46.000000000 +0100
++++ djvulibre-3.5.18/desktopfiles/djvulibre-djview3.desktop	2007-02-04 21:06:05.879093998 +0100
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Type=Application
 -Categories=Qt;Graphics
-+Terminal=false
+-MimeType=image/x-djvu;image/x.djvu;image/vnd.djvu
 +Categories=Qt;Graphics;Viewer;
-+# vi: encoding=utf-8
++MimeType=image/x-djvu;image/x.djvu;image/vnd.djvu;
+ Name=DjView3
+ Exec=djview3 %f
+ Terminal=false
+--- djvulibre-3.5.18/desktopfiles/Makefile.in.orig	2007-01-14 19:26:33.000000000 +0100
++++ djvulibre-3.5.18/desktopfiles/Makefile.in	2007-02-04 21:42:41.916239023 +0100
+@@ -37,6 +37,9 @@
+ datadir_djvu = ${datadir}/djvu/osi/desktop
+ datadir_djview = ${datadir}/djvu/djview3/desktop
+ 
++desktopdir = /usr/share/applications
++iconsdir = /usr/share/icons
++mimedir = /usr/share/mime
+ 
+ # -------- all
+ 
+@@ -81,16 +84,16 @@
+ @GUI_YES at echo-xdg: echo-djview-xdg
+ 
+ install-djvu-files: FORCE
+-	${INSTALL} -d ${DESTDIR}${datadir_djvu}
+-	${INSTALL_PROGRAM} register-djvu-mime ${DESTDIR}${datadir_djvu}
+-	${INSTALL_DATA} ${srcdir}/*djvu.png ${DESTDIR}${datadir_djvu}
+-	${INSTALL_DATA} ${srcdir}/*mime.xml ${DESTDIR}${datadir_djvu}
++	${INSTALL} -d ${DESTDIR}${mimedir}/packages ${DESTDIR}${iconsdir}/hicolor/{22x22,32x32,48x48}/{mimetypes,apps}
++	${INSTALL_DATA} ${srcdir}/hi22-djvu.png ${DESTDIR}${iconsdir}/hicolor/22x22/mimetypes/djvu.png
++	${INSTALL_DATA} ${srcdir}/hi32-djvu.png ${DESTDIR}${iconsdir}/hicolor/32x32/mimetypes/djvu.png
++	${INSTALL_DATA} ${srcdir}/hi48-djvu.png ${DESTDIR}${iconsdir}/hicolor/48x48/mimetypes/djvu.png
++	#${INSTALL_DATA} ${srcdir}/djvulibre-mime.xml ${DESTDIR}${mimedir}/packages/djvulibre.xml
+ 
+ install-djview-files: FORCE
+-	${INSTALL} -d ${DESTDIR}${datadir_djview}
+-	${INSTALL_PROGRAM} register-djview-menu ${DESTDIR}${datadir_djview}
+-	${INSTALL_DATA} ${srcdir}/*djview3.png ${DESTDIR}${datadir_djview}
+-	${INSTALL_DATA} ${srcdir}/*djview3.desktop ${DESTDIR}${datadir_djview}
++	${INSTALL} -d ${DESTDIR}${desktopdir} ${DESTDIR}${iconsdir}/hicolor/{22x22,32x32,48x48}/{mimetypes,apps}
++	${INSTALL_DATA} ${srcdir}/hi32-djview3.png ${DESTDIR}${iconsdir}/hicolor/32x32/apps/djview3.png
++	${INSTALL_DATA} ${srcdir}/djvulibre-djview3.desktop ${DESTDIR}${desktopdir}/djview3.desktop
+ 
+ run-djvu-xdg: FORCE
+ 	-test -z "${DESTDIR}" && \

================================================================
Index: SOURCES/djvulibre-nostrip.patch
diff -u SOURCES/djvulibre-nostrip.patch:1.3 SOURCES/djvulibre-nostrip.patch:1.4
--- SOURCES/djvulibre-nostrip.patch:1.3	Tue Jul 19 19:17:35 2005
+++ SOURCES/djvulibre-nostrip.patch	Sun Feb  4 23:10:31 2007
@@ -1,15 +1,14 @@
-diff -aurN djvulibre-3.5.15.orig/gui/djview/Makefile.in djvulibre-3.5.15/gui/djview/Makefile.in
---- djvulibre-3.5.15.orig/gui/djview/Makefile.in	2004-08-24 19:58:55.000000000 +0200
-+++ djvulibre-3.5.15/gui/djview/Makefile.in	2005-07-19 19:15:19.000000000 +0200
+--- djvulibre-3.5.18/gui/djview/Makefile.in.orig	2007-01-08 15:33:17.000000000 +0100
++++ djvulibre-3.5.18/gui/djview/Makefile.in	2007-02-04 21:04:26.349422126 +0100
 @@ -174,7 +174,7 @@
  install-bin: ${PROGRAM} FORCE
  	${INSTALL} -d ${DESTDIR}${bindir}
  	${LIBTOOL} --mode=install \
--	  ${INSTALL_PROGRAM} -s ${PROGRAM} ${DESTDIR}${bindir}
-+	  ${INSTALL_PROGRAM} ${PROGRAM} ${DESTDIR}${bindir}
+-	  ${INSTALL_PROGRAM} -s ${PROGRAM} ${DESTDIR}${bindir}/djview3
++	  ${INSTALL_PROGRAM} ${PROGRAM} ${DESTDIR}${bindir}/djview3
+ 	cd ${DESTDIR}${bindir} && ${LN_S} djview3 djview || true
  
  install-man: FORCE
- 	${INSTALL} -d ${DESTDIR}${mandir}/man1
 diff -aurN djvulibre-3.5.15.orig/tools/Makefile.in djvulibre-3.5.15/tools/Makefile.in
 --- djvulibre-3.5.15.orig/tools/Makefile.in	2005-03-13 20:17:32.000000000 +0100
 +++ djvulibre-3.5.15/tools/Makefile.in	2005-07-19 19:15:38.000000000 +0200
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/djvulibre-desktop.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/djvulibre-nostrip.patch?r1=1.3&r2=1.4&f=u