http://incoming.debian.org/ggz-server_0.0.14.1-1.1_amd64.changes closing 478812 (merged with 473350) and 490420: debian/patches/database-m4.patch comes from upstream (isolated to only fix the current problem), see: http://hq.ggzgamingzone.org/~josef/diffs/0.0.14.1/ (package already uses the CDBS patch system) The change to m4/database.m4 requires re-running the autotools so these are added as Build-Depends; autoconf, automake | automake1.9, libtool. The effect of database-m4.patch is to tighten the build-dependencies on libdb-dev such that ggzd ends up linked against libdb4.4 so the build-depends for libdb-dev has been replaced by libdb4.4-dev. (Support for libdb4.6 and later is being implemented upstream.) 'autoreconf -if' overwrites INSTALL so a tweak to debian/rules replaces the upstream one and a second tweak handles the files generated by rerunning the autotools. Thankfully, running the autotools didn't turn out to cause too much bloat in the .diff.gz. The new preinst was developed in consultation with ggz upstream. Interdiff: 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 @@ -4,7 +4,8 @@ Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers@lists.alioth.debian.org> Uploaders: Josef Spillner <josef@ggzgamingzone.org>, Peter Eisentraut <petere@debian.org> Standards-Version: 3.7.3 -Build-Depends: cdbs, debhelper (>= 5), libavahi-client-dev, libggz-dev (>= 0.0.14), libexpat1-dev (>= 1.95.6), libdb-dev, libfam-dev, lsb-base (>= 3.0-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) 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/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 @@ -17,5 +17,13 @@ +makebuilddir/ggzd:: + cp INSTALL INSTALL.upstream + autoreconf -if + mv INSTALL.upstream INSTALL + install/ggzd:: install -d -o games -g games debian/ggzd/var/lib/ggzd binary-install/ggz-game-servers:: rm debian/$(cdbs_curpkg)/etc/ggzd/rooms/entry.room + +clean:: + rm -f config.sub config.guess config.log 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,16 @@ +ggz-server (0.0.14.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Add preinst to fix permissions on /var/lib/ggzd, + Fixes: ggzd Fails to install (Closes: #478812) + (LP: #149583) + * Move from libdb-dev to libdb4.4-dev and add upstream patch + for m4/database.m4 to tighten build-deps. Fixes FTBFS: + ggzdb_db4.c:335: undefined reference to `db_create' + (Closes: #490420) (LP: #241913) + + -- Neil Williams <codehelp@debian.org> Fri, 29 Aug 2008 13:51:20 +0100 + ggz-server (0.0.14.1-1) unstable; urgency=low * New upstream release only in patch2: unchanged: --- ggz-server-0.0.14.1.orig/debian/ggzd.preinst +++ ggz-server-0.0.14.1/debian/ggzd.preinst @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +if [ -d /var/lib/ggzd ]; then + chown games:games -R /var/lib/ggzd/ +fi + +#DEBHELPER# + only in patch2: unchanged: --- ggz-server-0.0.14.1.orig/debian/patches/database-m4.patch +++ ggz-server-0.0.14.1/debian/patches/database-m4.patch @@ -0,0 +1,48 @@ +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 @@ + dnl Check for db4 libraries + dnl Version priority: db4.4, db4.3, db4.2, db4.1, db4.0, db (unversioned) + +- if test "$db4lib" = "" || test "$minor" = "4"; then ++ 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 @@ + ]) + fi + +- if test "$db4lib" = "" || test "$minor" = "3"; then ++ if test "$db4lib" = "" && test "$minor" = "3"; then + AC_CHECK_LIB(db-4.3, db_env_create_4003, + [ + db4lib="-ldb-4.3" +@@ -176,7 +176,7 @@ + ]) + fi + +- if test "$db4lib" = "" || test "$minor" = "2"; then ++ if test "$db4lib" = "" && test "$minor" = "2"; then + AC_CHECK_LIB(db-4.2, db_env_create_4002, + [ + db4lib="-ldb-4.2" +@@ -199,7 +199,7 @@ + ]) + fi + +- if test "$db4lib" = "" || test "$minor" = "1"; then ++ if test "$db4lib" = "" && test "$minor" = "1"; then + AC_CHECK_LIB(db-4.1, db_env_create_4001, + [ + db4lib="-ldb-4.1" +@@ -222,7 +222,7 @@ + ]) + fi + +- if test "$db4lib" = "" || test "$minor" = "0"; then ++ if test "$db4lib" = "" && test "$minor" = "0"; then + AC_CHECK_LIB(db-4.0, db_env_create_4000, + [ + db4lib="-ldb-4.0" -- 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