From ec1cf08dbeb2d687ea84539478b9385191efdfea Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Fri, 23 Feb 2018 13:05:07 -0600 Subject: [PATCH] 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 Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- Makefile | 4 +++- debian/changelog | 10 ++++++++++ debian/compat | 2 +- debian/control | 2 +- debian/rules | 8 ++++++-- debian/source/format | 1 + 6 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 debian/source/format diff --git a/Makefile b/Makefile index 3bd079646..7ddfa316e 100644 --- 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 585a8729e..0a3a6e69b 100644 --- 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 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 7ed6ff82d..ec635144f 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index 60fcc4660..9a7c569f0 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: XFS Development Team Uploaders: Nathan Scott , Anibal Monsalve Salazar 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 baefdba15..4cba165b7 100755 --- 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 index 000000000..163aaf8d8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 2.47.2