rev 7232 - in people/chrsmrtn/packages: gwenview/debian/patches/common gwenview-i18n/debian/patches/common

[Christopher Martin]

Author: chrsmrtn
Date: 2007-09-17 23:49:16 +0000 (Mon, 17 Sep 2007)
New Revision: 7232

Removed:
   people/chrsmrtn/packages/gwenview-i18n/debian/patches/common/02_autotools_update.diff
   people/chrsmrtn/packages/gwenview/debian/patches/common/02_autotools_update.diff
Modified:
   people/chrsmrtn/packages/gwenview-i18n/debian/patches/common/03_libtool_update.diff
   people/chrsmrtn/packages/gwenview/debian/patches/common/03_libtool_update.diff
Log:
Sync the Gwenview common-patches with KDE.


Deleted: people/chrsmrtn/packages/gwenview/debian/patches/common/02_autotools_update.diff

Modified: people/chrsmrtn/packages/gwenview/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/chrsmrtn/packages/gwenview/debian/patches/common/03_libtool_update.diff	2007-09-17 10:06:42 UTC (rev 7231)
+++ people/chrsmrtn/packages/gwenview/debian/patches/common/03_libtool_update.diff	2007-09-17 23:49:16 UTC (rev 7232)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2006-09-17 04:40:28.000000000 -0400
-+++ b/admin/libtool.m4.in	2006-09-18 18:37:47.000000000 -0400
+--- 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-09-17 04:40:28.000000000 -0400
-+++ b/admin/ltmain.sh	2006-09-18 18:37:47.000000000 -0400
+--- 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.

Deleted: people/chrsmrtn/packages/gwenview-i18n/debian/patches/common/02_autotools_update.diff

Modified: people/chrsmrtn/packages/gwenview-i18n/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/chrsmrtn/packages/gwenview-i18n/debian/patches/common/03_libtool_update.diff	2007-09-17 10:06:42 UTC (rev 7231)
+++ people/chrsmrtn/packages/gwenview-i18n/debian/patches/common/03_libtool_update.diff	2007-09-17 23:49:16 UTC (rev 7232)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2006-09-17 04:40:28.000000000 -0400
-+++ b/admin/libtool.m4.in	2006-09-18 18:37:47.000000000 -0400
+--- 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-09-17 04:40:28.000000000 -0400
-+++ b/admin/ltmain.sh	2006-09-18 18:37:47.000000000 -0400
+--- 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.