diff -Nru bcache-tools-1.0.8/debian/bcache-tools.dirs bcache-tools-1.0.8/debian/bcache-tools.dirs --- bcache-tools-1.0.8/debian/bcache-tools.dirs 2015-06-10 13:18:50.000000000 +0000 +++ bcache-tools-1.0.8/debian/bcache-tools.dirs 2018-03-27 16:44:16.000000000 +0000 @@ -1,4 +1,4 @@ -usr/sbin/ lib/udev/rules.d/ -usr/share/man/man8/ +usr/sbin/ usr/share/initramfs-tools/hooks/ +usr/share/man/man8/ diff -Nru bcache-tools-1.0.8/debian/bcache-tools.postinst bcache-tools-1.0.8/debian/bcache-tools.postinst --- bcache-tools-1.0.8/debian/bcache-tools.postinst 2015-06-26 14:25:47.000000000 +0000 +++ bcache-tools-1.0.8/debian/bcache-tools.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -#!/bin/sh -set -e - -case "$1" in - configure) - [ -x /usr/sbin/update-initramfs ] && update-initramfs -u - [ -x /etc/kernel/postinst.d/dracut ] && /etc/kernel/postinst.d/dracut $(uname -r) - ;; -esac - -#DEBHELPER# - -exit 0 diff -Nru bcache-tools-1.0.8/debian/bcache-tools.preinst bcache-tools-1.0.8/debian/bcache-tools.preinst --- bcache-tools-1.0.8/debian/bcache-tools.preinst 2015-06-10 13:18:50.000000000 +0000 +++ bcache-tools-1.0.8/debian/bcache-tools.preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -#!/bin/sh - -oldscript=/etc/initramfs-tools/hooks/bcache -dpkg-maintscript-helper rm_conffile $oldscript 1.0.1-1~ -- "$@" -case "$1" in - install|upgrade) - if [ -f $oldscript ]; then - for hash in ca5a1c3f716e3ec69057f657cb79cee2f47c7ef6619983d86e647ac1f9f1f099 \ - 74c5338e21c926d3cbbc1b44c5525667dc964fe91189ffa6b11352974ef56950 - do - if echo "$hash $oldscript" | - sha256sum --check --status -; then - # Old conffile was not modified, let's just remove it - rm -f $oldscript - fi - done - if [ -f $oldscript ]; then - # Otherwise, disable and rename it - chmod -x $oldscript - mv $oldscript $oldscript.dpkg-remove - fi - fi - ;; -esac -#DEBHELPER# diff -Nru bcache-tools-1.0.8/debian/bcache-tools.triggers bcache-tools-1.0.8/debian/bcache-tools.triggers --- bcache-tools-1.0.8/debian/bcache-tools.triggers 1970-01-01 00:00:00.000000000 +0000 +++ bcache-tools-1.0.8/debian/bcache-tools.triggers 2018-03-27 16:44:16.000000000 +0000 @@ -0,0 +1 @@ +activate-noawait update-initramfs diff -Nru bcache-tools-1.0.8/debian/changelog bcache-tools-1.0.8/debian/changelog --- bcache-tools-1.0.8/debian/changelog 2017-04-21 20:46:03.000000000 +0000 +++ bcache-tools-1.0.8/debian/changelog 2018-03-27 18:21:51.000000000 +0000 @@ -1,9 +1,20 @@ -bcache-tools (1.0.8-2build1) artful; urgency=medium +bcache-tools (1.0.8-3) unstable; urgency=medium - * No-change rebuild to pick up -fPIE compiler default in static - libraries + * d/bcache-tools.preinst: fail on unexpected error (Closes: #866250). + * Drop buggy and prehistoric upgrade path. This removes the need for + d/bcache-tools.preinst entirely. + * Fix spelling mistake in quilt patch to fix lintian warning. + * Switch from commands in postinst to update-initramfs trigger. This + applies to both initramfs-tools and dracut and removes the need for + d/bcache-tools.postinst entirely. + * Update URLs to use SSL where possible. + * Update Standards-Version to 4.1.3. The only change needed was some + of the moves to SSL URLs as above. + * wrap-and-sort. + * Update debhelper compat level to 11. No changes needed. + * Update dep3 headers following patch resubmission. - -- Steve Langasek Fri, 21 Apr 2017 20:46:03 +0000 + -- Robie Basak Tue, 27 Mar 2018 18:56:23 +0100 bcache-tools (1.0.8-2) unstable; urgency=medium diff -Nru bcache-tools-1.0.8/debian/compat bcache-tools-1.0.8/debian/compat --- bcache-tools-1.0.8/debian/compat 2015-06-10 13:18:50.000000000 +0000 +++ bcache-tools-1.0.8/debian/compat 2018-03-27 18:20:54.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru bcache-tools-1.0.8/debian/control bcache-tools-1.0.8/debian/control --- bcache-tools-1.0.8/debian/control 2015-06-10 13:18:50.000000000 +0000 +++ bcache-tools-1.0.8/debian/control 2018-03-27 18:20:54.000000000 +0000 @@ -3,15 +3,15 @@ Uploaders: Robie Basak Section: utils Priority: optional -Standards-Version: 3.9.5 -Build-Depends: debhelper (>= 9), pkg-config, uuid-dev, libblkid-dev -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/bcache-tools.git +Standards-Version: 4.1.3 +Build-Depends: debhelper (>= 11), libblkid-dev, pkg-config, uuid-dev +Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/bcache-tools.git Vcs-Git: git://anonscm.debian.org/collab-maint/bcache-tools.git -Homepage: http://bcache.evilpiepirate.org/ +Homepage: https://bcache.evilpiepirate.org/ Package: bcache-tools Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: initramfs-tools | linux-initramfs-tool Description: bcache userspace tools Bcache allows the use of SSDs to cache other block devices. diff -Nru bcache-tools-1.0.8/debian/copyright bcache-tools-1.0.8/debian/copyright --- bcache-tools-1.0.8/debian/copyright 2015-06-10 13:18:50.000000000 +0000 +++ bcache-tools-1.0.8/debian/copyright 2018-03-27 16:44:16.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: kmo@daterainc.com linux-bcache@vger.kernel.org Source: http://evilpiepirate.org/git/bcache-tools.git diff -Nru bcache-tools-1.0.8/debian/patches/0001-Clean-should-remove-bcache-register.patch bcache-tools-1.0.8/debian/patches/0001-Clean-should-remove-bcache-register.patch --- bcache-tools-1.0.8/debian/patches/0001-Clean-should-remove-bcache-register.patch 2015-06-10 13:18:50.000000000 +0000 +++ bcache-tools-1.0.8/debian/patches/0001-Clean-should-remove-bcache-register.patch 2018-03-27 18:21:00.000000000 +0000 @@ -3,7 +3,8 @@ Subject: Clean should remove bcache-register Forwarded: http://article.gmane.org/gmane.linux.kernel.bcache.devel/2853 -Last-Update: 2015-05-13 + https://github.com/koverstreet/bcache-tools/pull/3 +Last-Update: 2018-03-27 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -Nru bcache-tools-1.0.8/debian/patches/0002-Don-t-inline-crc64-for-gcc-5-compatability.patch bcache-tools-1.0.8/debian/patches/0002-Don-t-inline-crc64-for-gcc-5-compatability.patch --- bcache-tools-1.0.8/debian/patches/0002-Don-t-inline-crc64-for-gcc-5-compatability.patch 2015-06-10 13:18:50.000000000 +0000 +++ bcache-tools-1.0.8/debian/patches/0002-Don-t-inline-crc64-for-gcc-5-compatability.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From: David Mohr -Date: Tue, 26 May 2015 20:34:31 -0600 -Subject: Don't inline crc64 for gcc-5 compatability - -Forwarded: http://article.gmane.org/gmane.linux.kernel.bcache.devel/2919 - -By James Cowgill, see Debian bug #777798 ---- - bcache.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bcache.c b/bcache.c -index 8f37445..8b4b986 100644 ---- a/bcache.c -+++ b/bcache.c -@@ -115,7 +115,7 @@ static const uint64_t crc_table[256] = { - 0x9AFCE626CE85B507ULL - }; - --inline uint64_t crc64(const void *_data, size_t len) -+uint64_t crc64(const void *_data, size_t len) - { - uint64_t crc = 0xFFFFFFFFFFFFFFFFULL; - const unsigned char *data = _data; diff -Nru bcache-tools-1.0.8/debian/patches/0002-Don-t-inline-crc64-for-gcc-5-compatibility.patch bcache-tools-1.0.8/debian/patches/0002-Don-t-inline-crc64-for-gcc-5-compatibility.patch --- bcache-tools-1.0.8/debian/patches/0002-Don-t-inline-crc64-for-gcc-5-compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ bcache-tools-1.0.8/debian/patches/0002-Don-t-inline-crc64-for-gcc-5-compatibility.patch 2018-03-27 18:21:00.000000000 +0000 @@ -0,0 +1,26 @@ +Author: David Mohr +Date: Tue, 26 May 2015 20:34:31 -0600 +Subject: Don't inline crc64 for gcc-5 compatibility + +Forwarded: http://article.gmane.org/gmane.linux.kernel.bcache.devel/2919 + https://github.com/koverstreet/bcache-tools/pull/2 +Last-Update: 2018-03-27 + +By James Cowgill, see Debian bug #777798 +--- + bcache.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bcache.c b/bcache.c +index 8f37445..8b4b986 100644 +--- a/bcache.c ++++ b/bcache.c +@@ -115,7 +115,7 @@ static const uint64_t crc_table[256] = { + 0x9AFCE626CE85B507ULL + }; + +-inline uint64_t crc64(const void *_data, size_t len) ++uint64_t crc64(const void *_data, size_t len) + { + uint64_t crc = 0xFFFFFFFFFFFFFFFFULL; + const unsigned char *data = _data; diff -Nru bcache-tools-1.0.8/debian/patches/series bcache-tools-1.0.8/debian/patches/series --- bcache-tools-1.0.8/debian/patches/series 2015-06-10 13:18:50.000000000 +0000 +++ bcache-tools-1.0.8/debian/patches/series 2018-03-27 16:44:16.000000000 +0000 @@ -1,2 +1,2 @@ 0001-Clean-should-remove-bcache-register.patch -0002-Don-t-inline-crc64-for-gcc-5-compatability.patch +0002-Don-t-inline-crc64-for-gcc-5-compatibility.patch diff -Nru bcache-tools-1.0.8/debian/watch bcache-tools-1.0.8/debian/watch --- bcache-tools-1.0.8/debian/watch 2015-06-10 13:18:50.000000000 +0000 +++ bcache-tools-1.0.8/debian/watch 2018-03-27 16:44:16.000000000 +0000 @@ -1,6 +1,6 @@ version=3 -http://evilpiepirate.org/git/bcache-tools.git/refs/ /git/bcache-tools.git/tag/\?id=v(\d[\d.]*) +https://evilpiepirate.org/git/bcache-tools.git/refs/ /git/bcache-tools.git/tag/\?id=v(\d[\d.]*) # tag/\?id=(v?\d[\d.]*) #opts="filenamemangle=s/(?:.*)?v?(\d[\d\.]*)\.tar\.gz/bcache-tools-$1.tar.gz/" \