--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package rsbackup
This upload fixes the FTBFS bug #774013, taking the patch supplied by
Jonathan Wiltshire. I confirmed the result builds on a handy amd64
jessie chroot I have at work.
Debdiff (attached) is cf the version in testing as per instructions;
so it also fixes 773181 which you previously unblocked 1.1-3 for.
Sorry for the noise :(
Regards,
Matthew
unblock rsbackup/1.1-4
-- System Information:
Debian Release: 7.7
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-4-686-pae (SMP w/1 CPU core)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u rsbackup-1.1/debian/changelog rsbackup-1.1/debian/changelog
--- rsbackup-1.1/debian/changelog
+++ rsbackup-1.1/debian/changelog
@@ -1,3 +1,19 @@
+rsbackup (1.1-4) unstable; urgency=low
+
+ * Patch from Jonathan Wiltshire to use install rather than cp for
+ post{inst,rm}, making build less sensitive to source file permissions
+ (Closes: #774013)
+
+ -- Matthew Vernon <matthew@debian.org> Sun, 28 Dec 2014 19:10:11 +0000
+
+rsbackup (1.1-3) unstable; urgency=low
+
+ * Clean up /ets/rsbackup on purge (thanks to Andreas Beckmann for the
+ bug report, and Richard Kettlewell (upstream) for the patch (Closes:
+ #773181)
+
+ -- Matthew Vernon <matthew@debian.org> Tue, 16 Dec 2014 21:42:19 +0000
+
rsbackup (1.1-2) unstable; urgency=low
* Make cronjobs exit quietly if rsbackup.cron not present (i.e. package
diff -u rsbackup-1.1/debian/rules rsbackup-1.1/debian/rules
--- rsbackup-1.1/debian/rules
+++ rsbackup-1.1/debian/rules
@@ -47,7 +47,8 @@
mkdir -p debian/${PACKAGE}/var/log/backup
mkdir -p debian/${PACKAGE}/usr/share/doc-base
cp debian/${PACKAGE}.conffiles debian/${PACKAGE}/DEBIAN/conffiles
- cp debian/${PACKAGE}.postinst debian/${PACKAGE}/DEBIAN/postinst
+ install debian/${PACKAGE}.postinst debian/${PACKAGE}/DEBIAN/postinst
+ install debian/${PACKAGE}.postrm debian/${PACKAGE}/DEBIAN/postrm
cp tools/rsbackup.hourly debian/${PACKAGE}/etc/cron.hourly/rsbackup
cp tools/rsbackup.daily debian/${PACKAGE}/etc/cron.daily/rsbackup
cp tools/rsbackup.weekly debian/${PACKAGE}/etc/cron.weekly/rsbackup
only in patch2:
unchanged:
--- rsbackup-1.1.orig/Makefile.am
+++ rsbackup-1.1/Makefile.am
@@ -18,6 +18,7 @@
debian/changelog debian/control debian/copyright \
debian/doc.rsbackup \
debian/rsbackup.conffiles debian/rsbackup.postinst debian/rules \
+ debian/rsbackup.postrm \
README.md
echo-distdir:
only in patch2:
unchanged:
--- rsbackup-1.1.orig/tools/t-bashisms
+++ rsbackup-1.1/tools/t-bashisms
@@ -0,0 +1,24 @@
+#! /bin/sh
+#
+# Copyright © 2014 Richard Kettlewell.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -e
+if type checkbashisms >/dev/null 2>&1; then
+ for s in rsbackup.cron rsbackup-mount rsbackup-snapshot-hook; do
+ checkbashisms -x -p "$s"
+ done
+else
+ exit 77
+fi
only in patch2:
unchanged:
--- rsbackup-1.1.orig/tests/bashisms
+++ rsbackup-1.1/tests/bashisms
@@ -0,0 +1,26 @@
+#! /bin/sh
+#
+# Copyright © 2014 Richard Kettlewell.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -e
+if type checkbashisms >/dev/null 2>&1; then
+ for s in setup.sh hook \
+ backup prune retire-device retire-volume store check-file check-configs \
+ check-mounted glob-store style; do
+ checkbashisms -f -x -p "${srcdir:-.}/$s"
+ done
+else
+ exit 77
+fi
only in patch2:
unchanged:
--- rsbackup-1.1.orig/debian/rsbackup.postrm
+++ rsbackup-1.1/debian/rsbackup.postrm
@@ -0,0 +1,22 @@
+#! /bin/sh
+# Copyright © 2014 Richard Kettlewell.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -e
+case "$1" in
+purge )
+ rm -f /etc/rsbackup/local
+ rmdir --ignore-fail-on-non-empty /etc/rsbackup
+ ;;
+esac
--- End Message ---
--- Begin Message ---
Hi,
On Sun, Dec 28, 2014 at 10:35:03PM +0000, Matthew Vernon wrote:
> >You added tests/bashisms and tools/t-bashisms in 1.1-3, but didn't mention
> >them in the changelog. Could you explain this (and remove the moreinfo tag
> >from this bug once you do).
>
> Huh; they've come from upstream's master branch; they are harmless
> but unnecessary. Would you like me to re-upload 1.1-4 without them?
No, that's not necessary. We check all changes, and if they are not mentioned
in the changelog, that's a red flag. But in this case it doesn't look like
another round-trip is worth it.
Unblocked.
Cheers,
Ivo
--- End Message ---