[pkg-kde-commits] rev 2621 - in trunk/packages/koffice/debian: . patches

[Isaac Clerencia]

Author: isaac
Date: 2005-12-12 11:02:29 +0000 (Mon, 12 Dec 2005)
New Revision: 2621

Added:
   trunk/packages/koffice/debian/patches/28_libwv2.diff
Modified:
   trunk/packages/koffice/debian/changelog
Log:
No longer rely in wv2-config --libs, use -lwv2 directly


Modified: trunk/packages/koffice/debian/changelog
===================================================================
--- trunk/packages/koffice/debian/changelog	2005-12-12 10:55:39 UTC (rev 2620)
+++ trunk/packages/koffice/debian/changelog	2005-12-12 11:02:29 UTC (rev 2621)
@@ -1,3 +1,12 @@
+koffice (1:1.4.2-4) UNRELEASED; urgency=low
+
+  * koffice branch pull, fixes security bug in included xpdf code,
+    closes: #342294
+  * set LIBWV_LIBS directly to -lwv2 instead of relying on wv2-config --libs,
+    it removes superflous Depends: libgsf in kword, closes: #342888
+
+ -- Isaac Clerencia <isaac at debian.org>  Mon, 12 Dec 2005 11:55:03 +0100
+
 koffice (1:1.4.2-3) unstable; urgency=low
 
   +++ Changes by Isaac Clerencia:

Added: trunk/packages/koffice/debian/patches/28_libwv2.diff
===================================================================
--- trunk/packages/koffice/debian/patches/28_libwv2.diff	2005-12-12 10:55:39 UTC (rev 2620)
+++ trunk/packages/koffice/debian/patches/28_libwv2.diff	2005-12-12 11:02:29 UTC (rev 2621)
@@ -0,0 +1,12 @@
+--- ./filters/kword/msword/configure.in.in	2005-10-05 12:26:33.000000000 +0200
++++ /tmp/configure.in.in	2005-12-11 15:52:01.000000000 +0100
+@@ -26,7 +26,8 @@
+   vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+   if test -n "$vers" && test "$vers" -ge 1009
+   then
+-     LIBWV2_LIBS="`$WV2_CONFIG --libs`"
++     #LIBWV2_LIBS="`$WV2_CONFIG --libs`"
++     LIBWV2_LIBS="-lwv2"
+      LIBWV2_RPATH=
+      for args in $LIBWV2_LIBS; do
+ 	  case $args in