Joerg,
I have put a 5-day delayed NMU to fix this FTBS. If you want to fix it
yourself you will know what to do. The source diff is attached.
diff -u muddleftpd-1.3.13.1/debian/control muddleftpd-1.3.13.1/debian/control
--- muddleftpd-1.3.13.1/debian/control
+++ muddleftpd-1.3.13.1/debian/control
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Joerg Jaspert <jo...@debian.org>
Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.2), libpam0g-dev, texinfo, libcap-dev
[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libmysqlclient15-dev
+Build-Depends: debhelper (>= 4.0.2), libpam0g-dev, texinfo, libcap-dev
[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libmysqlclient-dev, dh-autoreconf
Package: muddleftpd
Provides: ftp-server
diff -u muddleftpd-1.3.13.1/debian/changelog
muddleftpd-1.3.13.1/debian/changelog
--- muddleftpd-1.3.13.1/debian/changelog
+++ muddleftpd-1.3.13.1/debian/changelog
@@ -1,3 +1,11 @@
+muddleftpd (1.3.13.1-4.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Backported changes from Ubuntu to enable rebuild against
+ mysql-5.5 (Closes: #673260)
+
+ -- Nicholas Bamber <nicho...@periapt.co.uk> Sun, 10 Jun 2012 11:18:08 +0000
+
muddleftpd (1.3.13.1-4.2) unstable; urgency=low
* Non-maintainer upload to solve release goal.
diff -u muddleftpd-1.3.13.1/debian/rules muddleftpd-1.3.13.1/debian/rules
--- muddleftpd-1.3.13.1/debian/rules
+++ muddleftpd-1.3.13.1/debian/rules
@@ -17,12 +17,16 @@
TOPDIR := $(shell pwd)
t = ${TOPDIR}/debian/muddleftpd
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
configure: configure-stamp
configure-stamp:
dh_testdir
+ dh_autoreconf
CFLAGS='$(CFLAGS)' ./configure --prefix=/usr
--mandir='$${prefix}/share/man' \
- --infodir='$${prefix}/share/info' --with-authsmb --with-authmud
--with-authmysql
+ --infodir='$${prefix}/share/info' --with-authsmb --with-authmud
--with-authmysql \
+ --with-mysql-lib=lib/$(DEB_HOST_MULTIARCH)
touch configure-stamp
build: configure-stamp build-stamp
@@ -37,6 +41,7 @@
rm -f build-stamp configure-stamp
-$(MAKE) distclean
+ dh_autoreconf_clean
dh_clean
install: build
only in patch2:
unchanged:
--- muddleftpd-1.3.13.1.orig/configure.ac
+++ muddleftpd-1.3.13.1/configure.ac
@@ -190,6 +190,10 @@
fi
# MYSQL module
+AC_ARG_WITH(mysql-lib,AC_HELP_STRING([--with-mysql-lib=DIR],[Directory under
prefix to search for mysql libraries]),
+ [ mysql_lib="$withval" ],
+ [ mysql_lib="" ])
+
AC_ARG_WITH(authmysql,
AC_HELP_STRING([--with-authmysql=DIR], [creates MySQL authentication
module, optionally specifies the DIR of mysql files]),
[authmysql="$withval"],
only in patch2:
unchanged:
--- muddleftpd-1.3.13.1.orig/modules/auth/authlibmysql/configure.ac
+++ muddleftpd-1.3.13.1/modules/auth/authlibmysql/configure.ac
@@ -38,6 +38,10 @@
exit
])
+AC_ARG_WITH(mysql-lib,AC_HELP_STRING([--with-mysql-lib=DIR],[Directory under
prefix to search for mysql libraries]),
+ [ mysql_lib="$withval" ],
+ [ mysql_lib="" ])
+
AC_ARG_WITH(authmysql,
AC_HELP_STRING([--with-authmysql=DIR],[Create MySQL authentication module,
optionally specify dir of mysql files]),
[ with_mysql="$withval" ],
@@ -79,7 +83,7 @@
fi
else
- for i in lib lib/mysql; do
+ for i in $mysql_lib lib lib/mysql; do
str="$MYSQL_DIR/$i/libmysqlclient.*"
for j in `echo $str`; do
if test -r $j; then
