Thanks Jonathan.
Dear RMs, here's an almost identical patch (also, dropping -i as it's also
deprecated, and adding VCS headers).
Thanks,
sez
diff --git a/debian/changelog b/debian/changelog
index df8d3cd..4e560e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+beanstalkd (1.4.6-4) testing-proposed-updates; urgency=low
+
+ * Add fiu-fix.diff (upstream commit 3176e28) to fix FTBFS due to
+ fiu-ctrl silently ignoring obsolete command line arguments
+ (Closes: #687402)
+ * Bump up Standards-Version to 3.9.4
+ - Add Vcs-* headers in debian/control
+
+ -- Serafeim Zanikolas <sez@debian.org> Mon, 08 Oct 2012 18:57:43 +0200
+
beanstalkd (1.4.6-3) unstable; urgency=high
* Patch sh-tests/common.functions to randomise the listener port during
diff --git a/debian/control b/debian/control
index 0eacaeb..ad2d77e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,10 @@ Maintainer: Serafeim Zanikolas <sez@debian.org>
Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libtool,
libevent-dev (>= 1.4.1), fiu-utils (>=0.13-3), procps,
net-tools, python-minimal
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Homepage: http://xph.us/software/beanstalkd/
+Vcs-Git: git://git.debian.org/collab-maint/beanstalkd.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/beanstalkd.git
Package: beanstalkd
Architecture: any
diff --git a/debian/patches/fiu-fix.diff b/debian/patches/fiu-fix.diff
new file mode 100644
index 0000000..dcc2b7d
--- /dev/null
+++ b/debian/patches/fiu-fix.diff
@@ -0,0 +1,60 @@
+# Description: correct fiu-ctrl arguments for 0.90
+# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687402
+# Author: Keith Rarick <kr@xph.us>
+# Last-Update: 2012-10-08
+--- a/sh-tests/binlog-diskfull-delete.sh
++++ b/sh-tests/binlog-diskfull-delete.sh
+@@ -2,7 +2,6 @@
+
+ . "$SRCDIR/sh-tests/common.functions"
+
+-ENOSPC=28
+ server=localhost
+ tmpdir="$TMPDIR"
+ size=1000
+@@ -81,7 +80,7 @@
+ }
+
+ # Make beanstalkd think the disk is full now.
+-fiu-ctrl -e posix/io/oc/open -i $ENOSPC $bpid
++fiu-ctrl -c 'enable name=posix/io/oc/open' $bpid
+
+ # Insert enough jobs to create another binlog file
+ $nc $server $port <<EOF > "$out1"
+@@ -138,7 +137,7 @@
+ test ! -e "$logdir"/binlog.1 || fail First binlog file is still there
+
+ # Now make beanstalkd think the disk once again has space.
+-fiu-ctrl -d posix/io/oc/open $bpid
++fiu-ctrl -c 'disable name=posix/io/oc/open' $bpid
+
+ # Insert enough jobs to create another binlog file
+ $nc $server $port <<EOF > "$out1"
+--- a/sh-tests/binlog-diskfull.sh
++++ b/sh-tests/binlog-diskfull.sh
+@@ -2,7 +2,6 @@
+
+ . "$SRCDIR/sh-tests/common.functions"
+
+-ENOSPC=28
+ server=localhost
+ tmpdir="$TMPDIR"
+ size=1000
+@@ -39,7 +38,7 @@
+ start_beanstalkd $logdir "-s $size" "fiu-run -x"
+
+ # Make beanstalkd think the disk is full now.
+-fiu-ctrl -e posix/io/oc/open -i $ENOSPC $bpid
++fiu-ctrl -c 'enable name=posix/io/oc/open' $bpid
+
+ # Insert enough jobs to create another binlog file
+ $nc $server $port <<EOF > "$out1"
+@@ -70,7 +69,7 @@
+ test "$res" -eq 0 || exit $res
+
+ # Now make beanstalkd think the disk once again has space.
+-fiu-ctrl -d posix/io/oc/open $bpid
++fiu-ctrl -c 'disable name=posix/io/oc/open' $bpid
+
+ # Insert enough jobs to create another binlog file
+ $nc $server $port <<EOF > "$out1"
diff --git a/debian/patches/series b/debian/patches/series
index e47659f..f30298a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+fiu-fix.diff
rename-dprintf.diff
randomise-port.diff
--
Every great idea is worthless without someone to do the work. --Neil Williams
Attachment:
signature.asc
Description: Digital signature