Several updates to use more modern Debian packaging

Switch to Debian packaging features available in more
recent years to resolve some long-standing issues.

In particular, using the quilt format gives non-native
package builds finally, while keeping the ability for
developers to do upstream deb builds.  Also split the
binary-arch and binary-indep debian/rules targets as
is now mandated, and update to latest standard version.
Mark a bunch of long-resolved bugs as fixed in the deb
changelog so they are automatically closed by the next
update.

Signed-off-by: Nathan Scott <nathans@debian.org>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/Makefile b/Makefile
index 3bd0796461b271b89d6943a42bbe96df75937a01..7ddfa316ea5b1c56cbe8de990b88b3c488f3440f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -158,7 +158,9 @@ else
        # need to build translations before the source tarball
        $(Q)$(MAKE) $(MAKEOPTS) -C po
        $(Q)$(MAKE) $(MAKEOPTS) $(SRCDIR)
-       $(Q)cd $(SRCDIR) && dpkg-buildpackage
+       $(Q)rm -f $(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
+       $(Q)$(LN_S) $(SRCTAR) $(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
+       $(Q)cd $(SRCDIR) && dpkg-buildpackage $$LOCAL_DPKG_OPTIONS # -sa -S
 endif
 
 $(SRCDIR) : $(_FORCE) $(SRCTAR)

diff --git a/debian/changelog b/debian/changelog
index 585a8729e38cc2def8503ca60a2ec1d0039b6cac..0a3a6e69b71157b7628f81ff708e5d3d8dbdb781 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xfsprogs (4.15.0-rc1-1) unstable; urgency=low
+
+  * Use source-only uploads using quilt format (closes: #144876)
+  * Includes copy_file_range patch for xfs_io (closes: #890716)
+  * Drop libreadline5-dev package dependency (closes: #695875)
+  * Includes old metadump CVE-2012-2150 fix (closes: #793495)
+  * New upstream release (closes: #874209)
+
+ -- Nathan Scott <nathans@debian.org>  Wed, 21 Feb 2018 10:52:38 -0600
+
 xfsprogs (4.14.0) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/compat b/debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9

diff --git a/debian/control b/debian/control
index 60fcc466082fbcd7757f719c8ff8aa97579d0abb..9a7c569f0265777467d2ee19f2678553502c7878 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: XFS Development Team <linux-xfs@vger.kernel.org>
 Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>
 Build-Depends: uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libreadline-gplv2-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libunistring-dev, dh-python
-Standards-Version: 3.9.1
+Standards-Version: 4.0.0
 Homepage: https://xfs.wiki.kernel.org/
 
 Package: xfsprogs

diff --git a/debian/rules b/debian/rules
index baefdba15e55ef304f7f6ce8789fa7c4fa3ec852..4cba165b70c85fbb2dc6cb330304b5fb45af2959 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ package = xfsprogs
 develop = xfslibs-dev
 bootpkg = xfsprogs-udeb
 
-version = $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
+version = $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
 target ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 udebpkg = $(bootpkg)_$(version)_$(target).udeb
 
@@ -25,7 +25,9 @@ diopts  = $(options) \
          export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="--enable-gettext=no --disable-ubsan --disable-addrsan --disable-threadsan" ;
 checkdir = test -f debian/rules
 
-build: built
+build: build-arch build-indep
+build-arch: built
+build-indep: built
 built: dibuild config
        @echo "== dpkg-buildpackage: build" 1>&2
        $(MAKE) default
@@ -76,6 +78,8 @@ binary-arch: checkroot built
        $(pkgdi)  $(MAKE) -C debian install-d-i
        $(pkgme)  $(MAKE) dist
        rmdir debian/xfslibs-dev/usr/share/doc/xfsprogs
+       rm -f debian/xfslibs-dev/lib/libhandle.la
+       rm -fr debian/xfslibs-dev/usr/lib
        dh_installdocs
        dh_installchangelogs
        dh_strip

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)