[Pkg-kde-commits] rev 2263 - in trunk/packages/kdegraphics/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-11-14 02:02:07 +0000 (Mon, 14 Nov 2005)
New Revision: 2263

Added:
   trunk/packages/kdegraphics/debian/patches/11_djvu-lib.diff
Modified:
   trunk/packages/kdegraphics/debian/kviewshell.install
Log:
I think I've found a fix for the rpath problem. Simply tell kdegraphics to
build a 'regular' library instead of a module. Not yet fully tested, since
my stock of djvu files is a tad low... buildprep to follow.


Modified: trunk/packages/kdegraphics/debian/kviewshell.install
===================================================================
--- trunk/packages/kdegraphics/debian/kviewshell.install	2005-11-13 22:41:40 UTC (rev 2262)
+++ trunk/packages/kdegraphics/debian/kviewshell.install	2005-11-14 02:02:07 UTC (rev 2263)
@@ -1,12 +1,12 @@
 debian/tmp/usr/bin/kviewshell
+debian/tmp/usr/lib/libdjvu.la
+debian/tmp/usr/lib/libdjvu.so
 debian/tmp/usr/lib/kde3/djvuviewpart.so
 debian/tmp/usr/lib/kde3/djvuviewpart.la
 debian/tmp/usr/lib/kde3/emptymultipagepart.la
 debian/tmp/usr/lib/kde3/emptymultipagepart.so
 debian/tmp/usr/lib/kde3/kviewerpart.la
 debian/tmp/usr/lib/kde3/kviewerpart.so
-debian/tmp/usr/lib/kde3/libdjvu.so
-debian/tmp/usr/lib/kde3/libdjvu.la
 debian/tmp/usr/lib/libkmultipage.so.0
 debian/tmp/usr/lib/libkmultipage.so.0.0.0
 debian/tmp/usr/share/apps/djvumultipage.rc

Added: trunk/packages/kdegraphics/debian/patches/11_djvu-lib.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/11_djvu-lib.diff	2005-11-13 22:41:40 UTC (rev 2262)
+++ trunk/packages/kdegraphics/debian/patches/11_djvu-lib.diff	2005-11-14 02:02:07 UTC (rev 2263)
@@ -0,0 +1,10 @@
+--- kde.orig/kviewshell/plugins/djvu/libdjvu/Makefile.am
++++ kde.patched/kviewshell/plugins/djvu/libdjvu/Makefile.am
+@@ -1,6 +1,6 @@
+ INCLUDES = -I$(top_srcdir) $(all_includes)
+ 
+-kde_module_LTLIBRARIES = libdjvu.la
++lib_LTLIBRARIES = libdjvu.la
+ libdjvu_la_LDFLAGS = -avoid-version $(all_libraries)
+ libdjvu_la_LIBADD = $(LIBJPEG)
+ libdjvu_la_SOURCES = Arrays.cpp DjVuDocEditor.cpp DjVuMessageLite.cpp GOS.cpp IW44Image.cpp \