Steve Langasek asked for ggz-servers to be updated after the RC bug fix
so that it could depend on libdb4.6 instead of lidb4.4 which was the
result of the previous version.
After a bit of discussion upstream and a few tweaks to the previous
version, I've now got an updated ggz-servers that depends on libdb4.6
and which retains the previous fixes for the two RC bugs.
Depends: libavahi-client3 (>= 0.6.16), libavahi-common3 (>= 0.6.16),
libc6 (>= 2.7-1), libdb4.6, libexpat1 (>= 1.95.8), libggz2 (>=
0.0.14.1), libggzdmod6 (>= 0.0.14.1)
http://incoming.debian.org/ggz-server_0.0.14.1-1.2_amd64.changes
Please can v0.0.14.1-1.2 be unblocked as an optimised fix for the
previous RC bug fixes?
http://lists.debian.org/debian-release/2008/08/msg01487.html
Updated interdiff (relative to 0.0.14.1-1.1)
diff -u ggz-server-0.0.14.1/debian/control ggz-server-0.0.14.1/debian/control
--- ggz-server-0.0.14.1/debian/control
+++ ggz-server-0.0.14.1/debian/control
@@ -5,7 +5,7 @@
Uploaders: Josef Spillner <josef@ggzgamingzone.org>, Peter Eisentraut <petere@debian.org>
Standards-Version: 3.7.3
Build-Depends: autoconf, automake | automake1.9, cdbs, debhelper (>= 5), libtool, libavahi-client-dev, libggz-dev (>= 0.0.14),
- libexpat1-dev (>= 1.95.6), libdb4.4-dev, libfam-dev, lsb-base (>= 3.0-3)
+ libexpat1-dev (>= 1.95.6), libdb-dev, libfam-dev, lsb-base (>= 3.0-3)
Vcs-Svn: svn://svn.debian.org/pkg-ggz/trunk/ggz-server/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ggz/trunk/ggz-server/
Homepage: http://www.ggzgamingzone.org/
diff -u ggz-server-0.0.14.1/debian/changelog ggz-server-0.0.14.1/debian/changelog
--- ggz-server-0.0.14.1/debian/changelog
+++ ggz-server-0.0.14.1/debian/changelog
@@ -1,3 +1,11 @@
+ggz-server (0.0.14.1-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Improve the database.m4 fix to migrate to libdb4.6
+ instead of 4.4 {request from Steve Langasek.}
+
+ -- Neil Williams <codehelp@debian.org> Sat, 30 Aug 2008 22:28:31 +0100
+
ggz-server (0.0.14.1-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -u ggz-server-0.0.14.1/debian/rules ggz-server-0.0.14.1/debian/rules
--- ggz-server-0.0.14.1/debian/rules
+++ ggz-server-0.0.14.1/debian/rules
@@ -14,7 +14,7 @@
DEB_FIXPERMS_EXCLUDE = /var/lib/ggzd
-makebuilddir/ggzd::
+post-patches::
cp INSTALL INSTALL.upstream
autoreconf -if
mv INSTALL.upstream INSTALL
diff -u ggz-server-0.0.14.1/debian/patches/database-m4.patch ggz-server-0.0.14.1/debian/patches/database-m4.patch
--- ggz-server-0.0.14.1/debian/patches/database-m4.patch
+++ ggz-server-0.0.14.1/debian/patches/database-m4.patch
@@ -1,16 +1,87 @@
-diff -Nur -x '*.orig' -x '*~' ggz-server-0.0.14.1/m4/database.m4 ggz-server-0.0.14.1.new/m4/database.m4
---- ggz-server-0.0.14.1/m4/database.m4 2008-01-05 19:02:52.000000000 +0000
-+++ ggz-server-0.0.14.1.new/m4/database.m4 2008-08-29 12:46:15.000000000 +0100
-@@ -130,7 +130,7 @@
+--- ggz-server-0.0.14.1/m4/database.m4 2008-08-29 21:40:35.000000000 +0100
++++ ggz-server.new/m4/database.m4 2008-08-29 21:41:17.000000000 +0100
+@@ -128,9 +128,78 @@
+ minor=$(grep DB_VERSION_MINOR /usr/include/$db4inc 2>/dev/null | cut -f 3)
+
dnl Check for db4 libraries
- dnl Version priority: db4.4, db4.3, db4.2, db4.1, db4.0, db (unversioned)
+- dnl Version priority: db4.4, db4.3, db4.2, db4.1, db4.0, db (unversioned)
++ dnl Version priority: db4.7, db4.6, db4.5, db4.4, db4.3, db4.2, db4.1, db4.0, db (unversioned)
- if test "$db4lib" = "" || test "$minor" = "4"; then
++ if test "$db4lib" = "" && test "$minor" = "7"; then
++ AC_CHECK_LIB(db-4.7, db_env_create_4007,
++ [
++ db4lib="-ldb-4.7"
++ database=db4
++ ],
++ [
++ AC_CHECK_LIB(db-4.7, db_env_create,
++ [
++ db4lib="-ldb-4.7"
++ database=db4
++ ],
++ [
++ AC_CHECK_LIB(db, db_env_create_4007,
++ [
++ db4lib="-ldb"
++ database=db4
++ ],
++ [])
++ ])
++ ])
++ fi
++
++ if test "$db4lib" = "" && test "$minor" = "6"; then
++ AC_CHECK_LIB(db-4.6, db_env_create_4006,
++ [
++ db4lib="-ldb-4.6"
++ database=db4
++ ],
++ [
++ AC_CHECK_LIB(db-4.6, db_env_create,
++ [
++ db4lib="-ldb-4.6"
++ database=db4
++ ],
++ [
++ AC_CHECK_LIB(db, db_env_create_4006,
++ [
++ db4lib="-ldb"
++ database=db4
++ ],
++ [])
++ ])
++ ])
++ fi
++
++ if test "$db4lib" = "" && test "$minor" = "5"; then
++ AC_CHECK_LIB(db-4.5, db_env_create_4005,
++ [
++ db4lib="-ldb-4.5"
++ database=db4
++ ],
++ [
++ AC_CHECK_LIB(db-4.5, db_env_create,
++ [
++ db4lib="-ldb-4.5"
++ database=db4
++ ],
++ [
++ AC_CHECK_LIB(db, db_env_create_4005,
++ [
++ db4lib="-ldb"
++ database=db4
++ ],
++ [])
++ ])
++ ])
++ fi
++
+ if test "$db4lib" = "" && test "$minor" = "4"; then
AC_CHECK_LIB(db-4.4, db_env_create_4004,
[
db4lib="-ldb-4.4"
-@@ -153,7 +153,7 @@
+@@ -153,7 +222,7 @@
])
fi
@@ -19,7 +90,7 @@
AC_CHECK_LIB(db-4.3, db_env_create_4003,
[
db4lib="-ldb-4.3"
-@@ -176,7 +176,7 @@
+@@ -176,7 +245,7 @@
])
fi
@@ -28,7 +99,7 @@
AC_CHECK_LIB(db-4.2, db_env_create_4002,
[
db4lib="-ldb-4.2"
-@@ -199,7 +199,7 @@
+@@ -199,7 +268,7 @@
])
fi
@@ -37,7 +108,7 @@
AC_CHECK_LIB(db-4.1, db_env_create_4001,
[
db4lib="-ldb-4.1"
-@@ -222,7 +222,7 @@
+@@ -222,7 +291,7 @@
])
fi
--
Neil Williams
=============
http://www.data-freedom.org/
http://www.nosoftwarepatents.com/
http://www.linux.codehelp.co.uk/
Attachment:
signature.asc
Description: This is a digitally signed message part