[SCM] Civilization turn-based strategy game branch, master, updated. debian/2.2.7-2-10-g2d3aa65

Clint Adams clint at debian.org
Mon Aug 29 02:54:23 UTC 2011


The following commit has been merged in the master branch:
commit ce4ecb25852f6f00ce031ce531384f5f2f34d082
Author: Clint Adams <clint at debian.org>
Date:   Sun Aug 28 22:11:18 2011 -0400

    Fudge build system to think there is no libtool mismatch.

diff --git a/debian/patches/libtool-mismatch.diff b/debian/patches/libtool-mismatch.diff
new file mode 100644
index 0000000..233ef32
--- /dev/null
+++ b/debian/patches/libtool-mismatch.diff
@@ -0,0 +1,46 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -7862,12 +7862,12 @@
+ # serial 3012 ltversion.m4
+ # This file is part of GNU Libtool
+ 
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
+ 
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.6'
+-macro_revision='1.3012'
++[macro_version='2.2.6b'
++macro_revision='1.3017'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+--- a/bootstrap/ltmain.sh
++++ b/bootstrap/ltmain.sh
+@@ -73,9 +73,9 @@
+ 
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION=2.2.6
++VERSION=2.2.6b
+ TIMESTAMP=""
+-package_revision=1.3012
++package_revision=1.3017
+ 
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+--- a/configure
++++ b/configure
+@@ -6932,8 +6932,8 @@
+ 
+ 
+ 
+-macro_version='2.2.6'
+-macro_revision='1.3012'
++macro_version='2.2.6b'
++macro_revision='1.3017'
+ 
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c0a1905..d6fce10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ themes_sdl_use_system_fonts.diff
 use_system_lua5.1.diff
 use_system_m4.diff
 work_around_unity_induced_breakage.diff
+libtool-mismatch.diff

-- 
Civilization turn-based strategy game



More information about the Pkg-games-commits mailing list