[Pkg-kde-commits] rev 1112 - branches/kde-3.4.0/common-patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-05-24 15:53:02 +0000 (Tue, 24 May 2005)
New Revision: 1112

Modified:
   branches/kde-3.4.0/common-patches/03_libtool_update.diff
   branches/kde-3.4.0/common-patches/05_pedantic-errors.diff
   branches/kde-3.4.0/common-patches/07_disable_no_undefined.diff
Log:
Trivial libtool update, and resync the patches that need it.


Modified: branches/kde-3.4.0/common-patches/03_libtool_update.diff
===================================================================
--- branches/kde-3.4.0/common-patches/03_libtool_update.diff	2005-05-24 15:50:18 UTC (rev 1111)
+++ branches/kde-3.4.0/common-patches/03_libtool_update.diff	2005-05-24 15:53:02 UTC (rev 1112)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2005-02-03 11:19:06.000000000 +0100
-+++ b/admin/libtool.m4.in	2005-02-26 06:17:26.591706156 +0100
+--- a/admin/libtool.m4.in	2005-01-18 04:52:36.000000000 -0500
++++ b/admin/libtool.m4.in	2005-05-19 13:26:30.000000000 -0400
 @@ -23,6 +23,7 @@
  ## the same distribution terms that you use for the rest of that program.
  
@@ -1417,8 +1417,8 @@
  AC_MSG_RESULT([$SED])
  ])
 diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh	2005-01-03 15:24:20.000000000 +0100
-+++ b/admin/ltmain.sh	2005-02-26 06:17:26.633698810 +0100
+--- a/admin/ltmain.sh	2004-12-12 14:19:26.000000000 -0500
++++ b/admin/ltmain.sh	2005-05-19 13:26:30.000000000 -0400
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.
@@ -1452,7 +1452,7 @@
 +PROGRAM=ltmain.sh
 +PACKAGE=libtool
 +VERSION=1.5.6
-+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 220 $"
++TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
 +
 +
  # Check that we have a working $echo.
@@ -2763,7 +2763,12 @@
  	  esac
  	  ;;
  	no)
-@@ -2939,7 +2949,7 @@
+@@ -2935,36 +2945,36 @@
+ 
+ 	# Check that each of the things are valid numbers.
+ 	case $current in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
  	*)
  	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -2772,7 +2777,9 @@
  	  ;;
  	esac
  
-@@ -2948,7 +2958,7 @@
+ 	case $revision in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
  	*)
  	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -2781,7 +2788,9 @@
  	  ;;
  	esac
  
-@@ -2957,14 +2967,14 @@
+ 	case $age in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
  	*)
  	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2

Modified: branches/kde-3.4.0/common-patches/05_pedantic-errors.diff
===================================================================
--- branches/kde-3.4.0/common-patches/05_pedantic-errors.diff	2005-05-24 15:50:18 UTC (rev 1111)
+++ branches/kde-3.4.0/common-patches/05_pedantic-errors.diff	2005-05-24 15:53:02 UTC (rev 1112)
@@ -1,6 +1,6 @@
 --- a/admin/acinclude.m4.in
 +++ b/admin/acinclude.m4.in
-@@ -2087,9 +2087,6 @@
+@@ -2139,9 +2139,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"

Modified: branches/kde-3.4.0/common-patches/07_disable_no_undefined.diff
===================================================================
--- branches/kde-3.4.0/common-patches/07_disable_no_undefined.diff	2005-05-24 15:50:18 UTC (rev 1111)
+++ branches/kde-3.4.0/common-patches/07_disable_no_undefined.diff	2005-05-24 15:53:02 UTC (rev 1112)
@@ -1,6 +1,6 @@
 --- a/admin/acinclude.m4.in
 +++ b/admin/acinclude.m4.in
-@@ -1665,15 +1665,6 @@
+@@ -1690,15 +1690,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""