tags 439626 + patch
thanks

Hi,

Attached is the diff for my pure-ftpd 1.0.21-11.1 NMU.

NMU is delayed for 2 days.

cheers,

--
Emmanuel Bouthenot

diff -Nru /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/changelog /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/changelog
--- /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/changelog	2007-09-29 15:16:01.000000000 +0200
+++ /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/changelog	2007-09-29 15:16:02.000000000 +0200
@@ -1,3 +1,13 @@
+pure-ftpd (1.0.21-11.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * pure-ftpd-common: check presence of update-inetd in prerm,
+    postrm, postinst scripts (Closes: #439626)
+  * Fix lintian warning on "make clean"
+  * Added missing build dependency on po-debconf
+
+ -- Emmanuel Bouthenot <[EMAIL PROTECTED]>  Sat, 29 Sep 2007 14:16:16 +0200
+
 pure-ftpd (1.0.21-11) unstable; urgency=low
 
   * Portuguese translation of debconf templates added (Closes: #429291,
diff -Nru /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/control /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/control
--- /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/control	2007-09-29 15:16:01.000000000 +0200
+++ /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/control	2007-09-29 15:16:02.000000000 +0200
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Stefan Hornburg (Racke) <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.16), libpam-dev, libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libldap2-dev, libmysqlclient-dev | libmysqlclient15-dev, libpq-dev, libssl-dev, openssl (>= 0.9.6)
+Build-Depends: debhelper (>= 4.1.16), libpam-dev, libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libldap2-dev, libmysqlclient-dev | libmysqlclient15-dev, libpq-dev, libssl-dev, openssl (>= 0.9.6), po-debconf
 Build-Conflicts: libmysqlclient10-dev
 Standards-Version: 3.5.2
 
diff -Nru /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd-ldap.init.d /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd-ldap.init.d
--- /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd-ldap.init.d	1970-01-01 01:00:00.000000000 +0100
+++ /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd-ldap.init.d	2007-09-29 15:16:02.000000000 +0200
@@ -0,0 +1,94 @@
+#! /bin/sh
+#
+# pure-ftpd	starts and stops the pure-ftpd ftp daemon
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+NAME=pure-ftpd
+DESC="ftp server"
+: ${SSDAEMONLOGOPTS:="--quiet"}
+UPLOADDAEMON=/usr/sbin/pure-uploadscript
+UDNAME=pure-uploadscript
+UDDESC="ftp upload handler"
+WRAPPER=/usr/sbin/pure-ftpd-wrapper
+
+# try to figure with suffix this script is called,
+# $0 might be a symlink pointing to this script
+if [ -h $0 ]; then
+	ME=`/bin/readlink $0`
+else 
+	ME=$0
+fi
+
+SUFFIX=`basename $ME | sed -ne 's/^pure-ftpd-\(.*\)/\1/p'`
+if [ "$SUFFIX" ] ; then
+	DAEMON=/usr/sbin/pure-ftpd-$SUFFIX
+else
+	DAEMON=/usr/sbin/pure-ftpd
+fi
+
+export STANDALONE_OR_INETD=inetd
+export VIRTUALCHROOT=
+test -r /etc/default/pure-ftpd-common && . /etc/default/pure-ftpd-common
+
+if [ "$VIRTUALCHROOT" = "true" ]; then
+	if [ "$SUFFIX" ]; then
+		SUFFIX="$SUFFIX-virtualchroot"
+	else
+		SUFFIX="virtualchroot"
+	fi
+fi
+
+test -x $DAEMON || exit 0
+test -x $WRAPPER || exit 0
+
+set -e
+
+start_uploadscript() {
+	if [ "$UPLOADSCRIPT" -a "$STANDALONE_OR_INETD" != inetd ] && \
+		egrep -i '^[ 	]*(yes|1|on)[ 	]*' /etc/pure-ftpd/conf/CallUploadScript > /dev/null 2>&1
+	then
+		UOPTS=""
+		test "$UPLOADUID" && UOPTS="$UOPTS -u $UPLOADUID"
+		test "$UPLOADGID" && UOPTS="$UOPTS -g $UPLOADGID"
+		echo -n "$1 $UDDESC: "
+		start-stop-daemon --start $SSDAEMONLOGOPTS --oknodo \
+			--exec $UPLOADDAEMON -- -r "$UPLOADSCRIPT" -B $UOPTS
+		echo "$UDNAME."
+		
+	fi
+}
+
+case "$1" in
+  start)
+	test "$STANDALONE_OR_INETD" = standalone || exit 0
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start $SSDAEMONLOGOPTS --pidfile /var/run/pure-ftpd/pure-ftpd.pid \
+		--exec $WRAPPER -- $SUFFIX
+	start_uploadscript Starting
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo \
+		--pidfile /var/run/pure-ftpd/pure-ftpd.pid
+	start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo --exec $UPLOADDAEMON
+	echo "$NAME."
+	;;
+  restart|force-reload)
+	test "$STANDALONE_OR_INETD" = standalone || exit 0
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo \
+		--pidfile /var/run/pure-ftpd/pure-ftpd.pid
+	start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo --exec $UPLOADDAEMON
+	sleep 1
+	start-stop-daemon --start $SSDAEMONLOGOPTS --pidfile \
+		/var/run/pure-ftpd/pure-ftpd.pid --exec $WRAPPER -- $SUFFIX
+	start_uploadscript Restarting
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff -Nru /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd-ldap.postinst /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd-ldap.postinst
--- /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd-ldap.postinst	1970-01-01 01:00:00.000000000 +0100
+++ /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd-ldap.postinst	2007-09-29 15:16:02.000000000 +0200
@@ -0,0 +1,33 @@
+#! /bin/sh
+# postinst script for all pure-ftpd flavours
+
+. /usr/share/debconf/confmodule
+
+db_get pure-ftpd/ftpwho-setuid
+SUID="$RET"
+
+if [ ! -x /usr/sbin/dpkg-statoverride ] || \
+   ! dpkg-statoverride --list /usr/sbin/pure-ftpwho >/dev/null; then
+    if [ "$SUID" = true ]; then
+		chmod 4755 /usr/sbin/pure-ftpwho
+	else
+		chmod 0755 /usr/sbin/pure-ftpwho
+	fi
+fi
+
+case "$0" in
+	*mysql*)
+		chmod 600 /etc/pure-ftpd/db/mysql.conf
+		;;
+	*postgresql*)
+		chmod 600 /etc/pure-ftpd/db/postgresql.conf
+		;;
+	*ldap*)
+		chmod 600 /etc/pure-ftpd/db/ldap.conf
+		;;
+esac
+
+#DEBHELPER#
+
+# Don't wait on pure-ftpd to close file handles
+db_stop
diff -Nru /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd-mysql.init.d /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd-mysql.init.d
--- /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd-mysql.init.d	1970-01-01 01:00:00.000000000 +0100
+++ /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd-mysql.init.d	2007-09-29 15:16:02.000000000 +0200
@@ -0,0 +1,94 @@
+#! /bin/sh
+#
+# pure-ftpd	starts and stops the pure-ftpd ftp daemon
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+NAME=pure-ftpd
+DESC="ftp server"
+: ${SSDAEMONLOGOPTS:="--quiet"}
+UPLOADDAEMON=/usr/sbin/pure-uploadscript
+UDNAME=pure-uploadscript
+UDDESC="ftp upload handler"
+WRAPPER=/usr/sbin/pure-ftpd-wrapper
+
+# try to figure with suffix this script is called,
+# $0 might be a symlink pointing to this script
+if [ -h $0 ]; then
+	ME=`/bin/readlink $0`
+else 
+	ME=$0
+fi
+
+SUFFIX=`basename $ME | sed -ne 's/^pure-ftpd-\(.*\)/\1/p'`
+if [ "$SUFFIX" ] ; then
+	DAEMON=/usr/sbin/pure-ftpd-$SUFFIX
+else
+	DAEMON=/usr/sbin/pure-ftpd
+fi
+
+export STANDALONE_OR_INETD=inetd
+export VIRTUALCHROOT=
+test -r /etc/default/pure-ftpd-common && . /etc/default/pure-ftpd-common
+
+if [ "$VIRTUALCHROOT" = "true" ]; then
+	if [ "$SUFFIX" ]; then
+		SUFFIX="$SUFFIX-virtualchroot"
+	else
+		SUFFIX="virtualchroot"
+	fi
+fi
+
+test -x $DAEMON || exit 0
+test -x $WRAPPER || exit 0
+
+set -e
+
+start_uploadscript() {
+	if [ "$UPLOADSCRIPT" -a "$STANDALONE_OR_INETD" != inetd ] && \
+		egrep -i '^[ 	]*(yes|1|on)[ 	]*' /etc/pure-ftpd/conf/CallUploadScript > /dev/null 2>&1
+	then
+		UOPTS=""
+		test "$UPLOADUID" && UOPTS="$UOPTS -u $UPLOADUID"
+		test "$UPLOADGID" && UOPTS="$UOPTS -g $UPLOADGID"
+		echo -n "$1 $UDDESC: "
+		start-stop-daemon --start $SSDAEMONLOGOPTS --oknodo \
+			--exec $UPLOADDAEMON -- -r "$UPLOADSCRIPT" -B $UOPTS
+		echo "$UDNAME."
+		
+	fi
+}
+
+case "$1" in
+  start)
+	test "$STANDALONE_OR_INETD" = standalone || exit 0
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start $SSDAEMONLOGOPTS --pidfile /var/run/pure-ftpd/pure-ftpd.pid \
+		--exec $WRAPPER -- $SUFFIX
+	start_uploadscript Starting
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo \
+		--pidfile /var/run/pure-ftpd/pure-ftpd.pid
+	start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo --exec $UPLOADDAEMON
+	echo "$NAME."
+	;;
+  restart|force-reload)
+	test "$STANDALONE_OR_INETD" = standalone || exit 0
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo \
+		--pidfile /var/run/pure-ftpd/pure-ftpd.pid
+	start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo --exec $UPLOADDAEMON
+	sleep 1
+	start-stop-daemon --start $SSDAEMONLOGOPTS --pidfile \
+		/var/run/pure-ftpd/pure-ftpd.pid --exec $WRAPPER -- $SUFFIX
+	start_uploadscript Restarting
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff -Nru /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd-mysql.postinst /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd-mysql.postinst
--- /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd-mysql.postinst	1970-01-01 01:00:00.000000000 +0100
+++ /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd-mysql.postinst	2007-09-29 15:16:02.000000000 +0200
@@ -0,0 +1,33 @@
+#! /bin/sh
+# postinst script for all pure-ftpd flavours
+
+. /usr/share/debconf/confmodule
+
+db_get pure-ftpd/ftpwho-setuid
+SUID="$RET"
+
+if [ ! -x /usr/sbin/dpkg-statoverride ] || \
+   ! dpkg-statoverride --list /usr/sbin/pure-ftpwho >/dev/null; then
+    if [ "$SUID" = true ]; then
+		chmod 4755 /usr/sbin/pure-ftpwho
+	else
+		chmod 0755 /usr/sbin/pure-ftpwho
+	fi
+fi
+
+case "$0" in
+	*mysql*)
+		chmod 600 /etc/pure-ftpd/db/mysql.conf
+		;;
+	*postgresql*)
+		chmod 600 /etc/pure-ftpd/db/postgresql.conf
+		;;
+	*ldap*)
+		chmod 600 /etc/pure-ftpd/db/ldap.conf
+		;;
+esac
+
+#DEBHELPER#
+
+# Don't wait on pure-ftpd to close file handles
+db_stop
diff -Nru /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd-postgresql.init.d /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd-postgresql.init.d
--- /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd-postgresql.init.d	1970-01-01 01:00:00.000000000 +0100
+++ /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd-postgresql.init.d	2007-09-29 15:16:02.000000000 +0200
@@ -0,0 +1,94 @@
+#! /bin/sh
+#
+# pure-ftpd	starts and stops the pure-ftpd ftp daemon
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+NAME=pure-ftpd
+DESC="ftp server"
+: ${SSDAEMONLOGOPTS:="--quiet"}
+UPLOADDAEMON=/usr/sbin/pure-uploadscript
+UDNAME=pure-uploadscript
+UDDESC="ftp upload handler"
+WRAPPER=/usr/sbin/pure-ftpd-wrapper
+
+# try to figure with suffix this script is called,
+# $0 might be a symlink pointing to this script
+if [ -h $0 ]; then
+	ME=`/bin/readlink $0`
+else 
+	ME=$0
+fi
+
+SUFFIX=`basename $ME | sed -ne 's/^pure-ftpd-\(.*\)/\1/p'`
+if [ "$SUFFIX" ] ; then
+	DAEMON=/usr/sbin/pure-ftpd-$SUFFIX
+else
+	DAEMON=/usr/sbin/pure-ftpd
+fi
+
+export STANDALONE_OR_INETD=inetd
+export VIRTUALCHROOT=
+test -r /etc/default/pure-ftpd-common && . /etc/default/pure-ftpd-common
+
+if [ "$VIRTUALCHROOT" = "true" ]; then
+	if [ "$SUFFIX" ]; then
+		SUFFIX="$SUFFIX-virtualchroot"
+	else
+		SUFFIX="virtualchroot"
+	fi
+fi
+
+test -x $DAEMON || exit 0
+test -x $WRAPPER || exit 0
+
+set -e
+
+start_uploadscript() {
+	if [ "$UPLOADSCRIPT" -a "$STANDALONE_OR_INETD" != inetd ] && \
+		egrep -i '^[ 	]*(yes|1|on)[ 	]*' /etc/pure-ftpd/conf/CallUploadScript > /dev/null 2>&1
+	then
+		UOPTS=""
+		test "$UPLOADUID" && UOPTS="$UOPTS -u $UPLOADUID"
+		test "$UPLOADGID" && UOPTS="$UOPTS -g $UPLOADGID"
+		echo -n "$1 $UDDESC: "
+		start-stop-daemon --start $SSDAEMONLOGOPTS --oknodo \
+			--exec $UPLOADDAEMON -- -r "$UPLOADSCRIPT" -B $UOPTS
+		echo "$UDNAME."
+		
+	fi
+}
+
+case "$1" in
+  start)
+	test "$STANDALONE_OR_INETD" = standalone || exit 0
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start $SSDAEMONLOGOPTS --pidfile /var/run/pure-ftpd/pure-ftpd.pid \
+		--exec $WRAPPER -- $SUFFIX
+	start_uploadscript Starting
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo \
+		--pidfile /var/run/pure-ftpd/pure-ftpd.pid
+	start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo --exec $UPLOADDAEMON
+	echo "$NAME."
+	;;
+  restart|force-reload)
+	test "$STANDALONE_OR_INETD" = standalone || exit 0
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo \
+		--pidfile /var/run/pure-ftpd/pure-ftpd.pid
+	start-stop-daemon --stop $SSDAEMONLOGOPTS --oknodo --exec $UPLOADDAEMON
+	sleep 1
+	start-stop-daemon --start $SSDAEMONLOGOPTS --pidfile \
+		/var/run/pure-ftpd/pure-ftpd.pid --exec $WRAPPER -- $SUFFIX
+	start_uploadscript Restarting
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff -Nru /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd-postgresql.postinst /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd-postgresql.postinst
--- /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd-postgresql.postinst	1970-01-01 01:00:00.000000000 +0100
+++ /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd-postgresql.postinst	2007-09-29 15:16:02.000000000 +0200
@@ -0,0 +1,33 @@
+#! /bin/sh
+# postinst script for all pure-ftpd flavours
+
+. /usr/share/debconf/confmodule
+
+db_get pure-ftpd/ftpwho-setuid
+SUID="$RET"
+
+if [ ! -x /usr/sbin/dpkg-statoverride ] || \
+   ! dpkg-statoverride --list /usr/sbin/pure-ftpwho >/dev/null; then
+    if [ "$SUID" = true ]; then
+		chmod 4755 /usr/sbin/pure-ftpwho
+	else
+		chmod 0755 /usr/sbin/pure-ftpwho
+	fi
+fi
+
+case "$0" in
+	*mysql*)
+		chmod 600 /etc/pure-ftpd/db/mysql.conf
+		;;
+	*postgresql*)
+		chmod 600 /etc/pure-ftpd/db/postgresql.conf
+		;;
+	*ldap*)
+		chmod 600 /etc/pure-ftpd/db/ldap.conf
+		;;
+esac
+
+#DEBHELPER#
+
+# Don't wait on pure-ftpd to close file handles
+db_stop
diff -Nru /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd.postinst /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd.postinst
--- /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/pure-ftpd.postinst	1970-01-01 01:00:00.000000000 +0100
+++ /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/pure-ftpd.postinst	2007-09-29 15:16:02.000000000 +0200
@@ -0,0 +1,33 @@
+#! /bin/sh
+# postinst script for all pure-ftpd flavours
+
+. /usr/share/debconf/confmodule
+
+db_get pure-ftpd/ftpwho-setuid
+SUID="$RET"
+
+if [ ! -x /usr/sbin/dpkg-statoverride ] || \
+   ! dpkg-statoverride --list /usr/sbin/pure-ftpwho >/dev/null; then
+    if [ "$SUID" = true ]; then
+		chmod 4755 /usr/sbin/pure-ftpwho
+	else
+		chmod 0755 /usr/sbin/pure-ftpwho
+	fi
+fi
+
+case "$0" in
+	*mysql*)
+		chmod 600 /etc/pure-ftpd/db/mysql.conf
+		;;
+	*postgresql*)
+		chmod 600 /etc/pure-ftpd/db/postgresql.conf
+		;;
+	*ldap*)
+		chmod 600 /etc/pure-ftpd/db/ldap.conf
+		;;
+esac
+
+#DEBHELPER#
+
+# Don't wait on pure-ftpd to close file handles
+db_stop
diff -Nru /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/rules /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/rules
--- /home/manu/tmp/7KdCkJHzXz/pure-ftpd-1.0.21/debian/rules	2007-09-29 15:16:01.000000000 +0200
+++ /home/manu/tmp/HjG0n5Mqa9/pure-ftpd-1.0.21/debian/rules	2007-09-29 15:16:02.000000000 +0200
@@ -17,7 +17,7 @@
 
 src/vanilla/pure-ftpd:
 	dh_testdir
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	./configure $(cfgflags) $(optflags)
 	$(MAKE)
 	mkdir $(@D)
@@ -25,7 +25,7 @@
 
 src/ldap/pure-ftpd:
 	dh_testdir
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	./configure $(cfgflags) $(optflags) --with-ldap
 	$(MAKE)
 	mkdir $(@D)
@@ -33,7 +33,7 @@
 
 src/mysql/pure-ftpd:
 	dh_testdir
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	./configure $(cfgflags) $(optflags) --with-mysql
 	$(MAKE)
 	mkdir $(@D)
@@ -41,7 +41,7 @@
 
 src/postgresql/pure-ftpd:
 	dh_testdir
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	./configure $(cfgflags) $(optflags) --with-pgsql
 	$(MAKE)
 	mkdir $(@D)
@@ -49,7 +49,7 @@
 
 src/vanilla-virtualchroot/pure-ftpd:
 	dh_testdir
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	./configure $(cfgflags) $(optflags) --with-virtualchroot
 	$(MAKE)
 	mkdir $(@D)
@@ -57,7 +57,7 @@
 
 src/ldap-virtualchroot/pure-ftpd:
 	dh_testdir
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	./configure $(cfgflags) $(optflags) --with-virtualchroot --with-ldap
 	$(MAKE)
 	mkdir $(@D)
@@ -65,7 +65,7 @@
 
 src/mysql-virtualchroot/pure-ftpd:
 	dh_testdir
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	./configure $(cfgflags) $(optflags) --with-virtualchroot --with-mysql
 	$(MAKE)
 	mkdir $(@D)
@@ -73,7 +73,7 @@
 
 src/postgresql-virtualchroot/pure-ftpd:
 	dh_testdir
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	./configure $(cfgflags) $(optflags) --with-virtualchroot --with-pgsql
 	$(MAKE)
 	mkdir $(@D)
@@ -93,7 +93,7 @@
 	dh_testdir
 	dh_testroot
 	debconf-updatepo
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f build-stamp configure-stamp config.status
 	rm -rf src/.deps puredb/src/.deps src/vanilla src/ldap src/mysql src/postgresql src/vanilla-virtualchroot src/ldap-virtualchroot src/mysql-virtualchroot src/postgresql-virtualchroot
 	dh_clean

Reply via email to