rev 6568 - kde-extras/kipi-plugins/trunk/debian/patches

[Achim Bohnet]

Author: ach-guest
Date: 2007-06-25 23:37:12 +0000 (Mon, 25 Jun 2007)
New Revision: 6568

Removed:
   kde-extras/kipi-plugins/trunk/debian/patches/02_autotools_update.diff
Modified:
   kde-extras/kipi-plugins/trunk/debian/patches/03_libtool_update.diff
   kde-extras/kipi-plugins/trunk/debian/patches/98_buildprep.diff
   kde-extras/kipi-plugins/trunk/debian/patches/98_configure.diff
Log:
+ updated patches/* from common-patches
+ regenerated buildpref and configure diffs

Deleted: kde-extras/kipi-plugins/trunk/debian/patches/02_autotools_update.diff

Modified: kde-extras/kipi-plugins/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/03_libtool_update.diff	2007-06-25 23:36:25 UTC (rev 6567)
+++ kde-extras/kipi-plugins/trunk/debian/patches/03_libtool_update.diff	2007-06-25 23:37:12 UTC (rev 6568)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2006-03-17 16:38:41.000000000 -0500
-+++ b/admin/libtool.m4.in	2006-03-24 19:22:40.000000000 -0500
+--- a/admin/libtool.m4.in	2007-05-14 12:58:18.000000000 +0200
++++ b/admin/libtool.m4.in	2007-05-14 23:36:38.000000000 +0200
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -685,7 +685,7 @@
 -  libsuff=
 -  if test "x$LINUX_64_MODE" = x64; then
 -    # Some platforms are per default 64-bit, so there's no /lib64
--    if test -d /lib64; then
+-    if test -d /lib64 -a ! -h /lib64; then
 -      libsuff=64
 -    fi
 -  fi
@@ -3795,8 +3795,8 @@
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
 diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh	2006-03-17 16:38:41.000000000 -0500
-+++ b/admin/ltmain.sh	2006-03-24 19:22:40.000000000 -0500
+--- a/admin/ltmain.sh	2007-05-14 12:58:18.000000000 +0200
++++ b/admin/ltmain.sh	2007-05-14 23:36:38.000000000 +0200
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.

Modified: kde-extras/kipi-plugins/trunk/debian/patches/98_buildprep.diff
===================================================================

Modified: kde-extras/kipi-plugins/trunk/debian/patches/98_configure.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/98_configure.diff	2007-06-25 23:36:25 UTC (rev 6567)
+++ kde-extras/kipi-plugins/trunk/debian/patches/98_configure.diff	2007-06-25 23:37:12 UTC (rev 6568)
@@ -1,6 +1,6 @@
---- kipi-plugins-0.1.3/configure.save-me	2007-05-14 21:22:38.000000000 +0200
-+++ kipi-plugins-0.1.3/configure	2007-05-14 21:22:48.000000000 +0200
-@@ -36238,7 +36238,7 @@
+--- kipi-plugins-0.1.4-beta2/configure.save-me	2007-06-26 01:10:05.000000000 +0200
++++ kipi-plugins-0.1.4-beta2/configure	2007-06-26 01:10:16.000000000 +0200
+@@ -36710,7 +36710,7 @@
  MOC!$MOC$ac_delim
  UIC!$UIC$ac_delim
  UIC_TR!$UIC_TR$ac_delim
@@ -9,7 +9,7 @@
  LIB_QPE!$LIB_QPE$ac_delim
  kde_qtver!$kde_qtver$ac_delim
  KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
-@@ -36328,7 +36328,7 @@
+@@ -36800,7 +36800,7 @@
  kde_styledir!$kde_styledir$ac_delim
  kde_widgetdir!$kde_widgetdir$ac_delim
  LIB_KDED!$LIB_KDED$ac_delim