tags 650338 + pending tags 666279 + patch tags 666279 + pending thanks Dear maintainer,
I've prepared an NMU for ulogd (versioned as 1.24-3.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Sting: Englishman In New York
diff -u ulogd-1.24/debian/control ulogd-1.24/debian/control --- ulogd-1.24/debian/control +++ ulogd-1.24/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Achilleas Kotsis <achi...@kotsis.net> Uploaders: Pierre Chifflier <pol...@debian.org> -Build-Depends: debhelper (>= 5), libmysqlclient-dev, libpq-dev, libpcap-dev, libsqlite3-dev, cdbs, autotools-dev +Build-Depends: debhelper (>= 5), libmysqlclient-dev, libpq-dev, libpcap-dev, libsqlite3-dev, cdbs, autotools-dev, dh-autoreconf, dpkg-dev (>= 1.16.0) Standards-Version: 3.8.3 Homepage: http://www.netfilter.org/projects/ulogd/ diff -u ulogd-1.24/debian/changelog ulogd-1.24/debian/changelog --- ulogd-1.24/debian/changelog +++ ulogd-1.24/debian/changelog @@ -1,3 +1,20 @@ +ulogd (1.24-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: cp: cannot stat + `./debian/tmp/usr/lib/ulogd/ulogd_SQLITE3.so': No such file or + directory": + - add patch fix_multiarch.patch from Ubuntu / Clint Byrum, + taken from #650338 + - remove changes to ./configure, use dh-autoreconf instead + - build-depend on dh-autoreconf and new enough dpkg-dev + (Closes: #666279) + * Fix "Fails to link with libmysqlclient with multi-arch and --as- + needed": add patch mysql_Makefile.patch from Ubuntu / Clint Byrum. + (Closes: #650338) + + -- gregor herrmann <gre...@debian.org> Sat, 14 Apr 2012 20:25:46 +0200 + ulogd (1.24-3) unstable; urgency=low * Acknowledge NMUs. diff -u ulogd-1.24/debian/rules ulogd-1.24/debian/rules --- ulogd-1.24/debian/rules +++ ulogd-1.24/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/autoreconf.mk DEB_CONFIGURE_SCRIPT_ENV = DEB_MAKE_INVOKE = make diff -u ulogd-1.24/debian/patches/mysql_Makefile.in.patch ulogd-1.24/debian/patches/mysql_Makefile.in.patch --- ulogd-1.24/debian/patches/mysql_Makefile.in.patch +++ ulogd-1.24/debian/patches/mysql_Makefile.in.patch @@ -6,7 +6,7 @@ $(SHARED_LIBS): %.so: %_sh.o - $(LD) -shared $(MYSQL_LDFLAGS) -o $@ $< -lc + #$(LD) -shared $(MYSQL_LDFLAGS) -o $@ $< -lc -+ $(CC) -nostartfiles -shared $(MYSQL_LDFLAGS) -o $@ $< ++ $(CC) -nostartfiles -shared -o $@ $< $(MYSQL_LDFLAGS) %_sh.o: %.c $(CC) $(MYSQL_CFLAGS) $(SH_CFLAGS) -o $@ -c $< only in patch2: unchanged: --- ulogd-1.24.orig/debian/patches/fix_multiarch.patch +++ ulogd-1.24/debian/patches/fix_multiarch.patch @@ -0,0 +1,46 @@ +--- configure.in.orig 2011-11-28 15:11:45.615575212 -0800 ++++ configure.in 2011-11-28 15:11:54.051081913 -0800 +@@ -81,17 +81,12 @@ + dnl Having a look in the libary itself should be more reliable than + dnl parsing the output of mysql --version. + +- AC_MSG_CHECKING(for mysql_real_escape_string support) +- +- MYSQL_FUNCTION_TEST=`strings ${MYSQLLIBS}/libmysqlclient.so | grep mysql_real_escape_string` +- +- if test "x$MYSQL_FUNCTION_TEST" = x +- then ++ AC_CHECK_LIB(mysqlclient, mysql_real_escape_string, ++ [AC_MSG_RESULT(found new MySQL)], ++ [ + EXTRA_MYSQL_DEF="-DOLD_MYSQL=1 " + AC_MSG_RESULT(found old MySQL) +- else +- AC_MSG_RESULT(found new MySQL) +- fi ++ ]) + + fi + ]) +@@ -181,7 +176,7 @@ + fi + mysqldir="" + AC_MSG_CHECKING(for sqlite3 files) +-for d in $dir /usr /usr/local /usr/local/sqlite3 ++for d in $dir /usr /usr/local /usr/local/sqlite3 /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH` + do + if test -f $d/lib/sqlite3/libsqlite3.so + then +@@ -206,6 +201,12 @@ + AC_MSG_RESULT(found sqlite in $d) + sqlite3dir=$d + sqlite3dir_suffix= ++ break ++ elif test -f $d/libsqlite3.so ++ then ++ AC_MSG_RESULT(found sqlite in $d) ++ sqlite3dir=$d ++ sqlite3dir_suffix= + break + fi + done
signature.asc
Description: Digital signature
