OSSP CVS Repository

ossp - Check-in [5992]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 5992
Date: 2008-Mar-06 11:04:48 (local)
2008-Mar-06 10:04:48 (UTC)
User:rse
Branch:
Comment: Upgrade build environment to GNU libtool 2.2
Tickets:
Inspections:
Files:
ossp-pkg/uuid/ChangeLog      1.154 -> 1.155     5 inserted, 0 deleted
ossp-pkg/uuid/devtool.conf      1.36 -> 1.37     1 inserted, 1 deleted
ossp-pkg/uuid/devtool.func      1.2 -> 1.3     3 inserted, 3 deleted

ossp-pkg/uuid/ChangeLog 1.154 -> 1.155

--- ChangeLog    2008/02/21 15:36:52     1.154
+++ ChangeLog    2008/03/06 10:04:48     1.155
@@ -11,6 +11,11 @@
   This is a list of all changes to OSSP uuid.
   For a more brief summary please have a look at the NEWS file.
 
+  Changes between 1.6.1 and 1.6.2 (21-Feb-2008 to 06-Mar-2008)
+
+   o Upgrade build environment to GNU libtool 2.2.
+     [Ralf S. Engelschall]
+
   Changes between 1.6.0 and 1.6.1 (19-May-2007 to 21-Feb-2008)
 
    o Port to Win32 API.


ossp-pkg/uuid/devtool.conf 1.36 -> 1.37

--- devtool.conf 2008/02/21 08:58:01     1.36
+++ devtool.conf 2008/03/06 10:04:49     1.37
@@ -4,7 +4,7 @@
 
 %autogen
     @autogen shtool   2.0.7  "2.0.*" all
-    @autogen libtool  1.5.26 "1.5*"
+    @autogen libtool  2.2    "2.2*"
     @autogen autoconf 2.61   "2.6[0-9]*"
 
 %autoclean


ossp-pkg/uuid/devtool.func 1.2 -> 1.3

--- devtool.func 2004/01/19 12:15:57     1.2
+++ devtool.func 2008/03/06 10:04:49     1.3
@@ -38,9 +38,9 @@
         libtool )
             libtoolize_version=`devtool_require libtoolize --version 4 "$1" "$2"`
             echo "generating (GNU Libtool $libtoolize_version): ltmain.sh, libtool.m4, config.guess, config.sub"
-            libtoolize --force --copy >/dev/null 2>&1
-            cp `libtoolize --force --copy --dry-run | grep "add the contents of" |\
-                sed -e 's;^[^\`]*\`;;' -e "s;'.*;;"` libtool.m4
+            libtoolize --force --copy --install >/dev/null 2>&1
+            cat `libtoolize --force --copy --install --dry-run | sed -e '1,/add the contents of/d' |\
+                sed -e 's;^[^\`]*\`;;' -e "s;'.*;;"` >libtool.m4
             ;;
         shtool )
             shtoolize_version=`devtool_require shtoolize -v 3 "$1" "$2"`

CVSTrac 2.0.1