diffstat of debian/ for xfsprogs_4.9.0+nmu1 xfsprogs_4.9.0+nmu1ubuntu1 changelog | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ control | 3 ++- rules | 16 ++++++++++------ 3 files changed, 70 insertions(+), 7 deletions(-) diff -Nru xfsprogs-4.9.0+nmu1/debian/changelog xfsprogs-4.9.0+nmu1ubuntu1/debian/changelog --- xfsprogs-4.9.0+nmu1/debian/changelog 2017-03-17 18:27:58.000000000 +0000 +++ xfsprogs-4.9.0+nmu1ubuntu1/debian/changelog 2017-07-26 05:33:17.000000000 +0000 @@ -1,3 +1,21 @@ +xfsprogs (4.9.0+nmu1ubuntu1) artful; urgency=low + + * Merge from Debian unstable. + - Fixes a metadata corruption bug. LP: #1696102. + * Remaining changes: + - Enable blkid in d-i, by dropping explicitly passed configure option + (broken configure). + - Drop trying to create upstream distribution. + * Dropped changes, included in Debian: + - Add autotools check for struct fsxattr to fix FTBFS. + - Use FIFREEZE and FITHAW when defined. + - 2be9e939868400 "linux.h: include " + - 721948f7688e7d "xfs.h: define XFS_IOC_FREEZE even if FIFREEZE is defined" + - 83f4b5ac15fa3d "xfs_fs.h: XFS_IOC_FS[SG]SETXATTR to FS_IOC_FS[SG]ETXATTR + promotion" + + -- Steve Langasek Tue, 25 Jul 2017 22:33:17 -0700 + xfsprogs (4.9.0+nmu1) unstable; urgency=medium * Non-maintainer upload. @@ -30,6 +48,45 @@ -- Nathan Scott Tue, 15 Mar 2016 12:05:21 +1100 +xfsprogs (4.3.0+nmu1ubuntu4) yakkety; urgency=low + + * switch to upstream fixes for struct xfsattr redefinition: + - 2be9e939868400 "linux.h: include " + - 721948f7688e7d "xfs.h: define XFS_IOC_FREEZE even if FIFREEZE is defined" + - 83f4b5ac15fa3d "xfs_fs.h: XFS_IOC_FS[SG]SETXATTR to FS_IOC_FS[SG]ETXATTR + promotion" + + -- Andy Whitcroft Wed, 12 Oct 2016 15:52:47 +0100 + +xfsprogs (4.3.0+nmu1ubuntu3) yakkety; urgency=low + + * Add autotools check for struct fsxattr to fix FTBFS. + * Use FIFREEZE and FITHAW when defined. + + -- Andy Whitcroft Tue, 11 Oct 2016 09:34:49 +0100 + +xfsprogs (4.3.0+nmu1ubuntu2) yakkety; urgency=medium + + * No-change rebuild with PIE as the default. + + -- Matthias Klose Wed, 28 Sep 2016 00:54:50 +0200 + +xfsprogs (4.3.0+nmu1ubuntu1) xenial; urgency=medium + + * Enable blkid in d-i, by dropping explicitly passed configure option + (broken configure). (LP: #1544574). + * Drop trying to create upstream distribution. + + -- Dimitri John Ledkov Tue, 16 Feb 2016 00:20:02 +0000 + +xfsprogs (4.3.0+nmu1) unstable; urgency=medium + + * Non-maintainer upload. + * Disabled the code in include/buildmacros which creates bogus symlinks + for libraries. (Closes: #766811) + + -- Marco d'Itri Wed, 10 Feb 2016 04:24:23 +0100 + xfsprogs (4.3.0) unstable; urgency=low * New upstream release @@ -825,3 +882,4 @@ Local variables: mode: debian-changelog End: + diff -Nru xfsprogs-4.9.0+nmu1/debian/control xfsprogs-4.9.0+nmu1ubuntu1/debian/control --- xfsprogs-4.9.0+nmu1/debian/control 2017-01-05 22:05:55.000000000 +0000 +++ xfsprogs-4.9.0+nmu1ubuntu1/debian/control 2017-07-26 05:33:17.000000000 +0000 @@ -1,7 +1,8 @@ Source: xfsprogs Section: admin Priority: optional -Maintainer: XFS Development Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: XFS Development Team Uploaders: Nathan Scott , Anibal Monsalve Salazar Build-Depends: uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libreadline-gplv2-dev | libreadline5-dev, libblkid-dev (>= 2.17), linux-libc-dev Standards-Version: 3.9.1 diff -Nru xfsprogs-4.9.0+nmu1/debian/rules xfsprogs-4.9.0+nmu1ubuntu1/debian/rules --- xfsprogs-4.9.0+nmu1/debian/rules 2017-01-05 22:05:55.000000000 +0000 +++ xfsprogs-4.9.0+nmu1ubuntu1/debian/rules 2017-03-17 23:17:14.000000000 +0000 @@ -26,20 +26,25 @@ checkdir = test -f debian/rules build: built -built: dibuild config +built: reconf dibuild config @echo "== dpkg-buildpackage: build" 1>&2 $(MAKE) default touch built -config: .census +reconf: .reconf +.reconf: + $(checkdir) + AUTOHEADER=/bin/true dh_autoreconf + touch $@ + +config: .census .reconf .census: @echo "== dpkg-buildpackage: configure" 1>&2 $(checkdir) - AUTOHEADER=/bin/true dh_autoreconf $(options) $(MAKE) include/platform_defs.h touch .census -dibuild: +dibuild: .reconf $(checkdir) @echo "== dpkg-buildpackage: installer" 1>&2 if [ ! -f mkfs/mkfs.xfs-$(bootpkg) ]; then \ @@ -58,7 +63,7 @@ clean: @echo "== dpkg-buildpackage: clean" 1>&2 $(checkdir) - -rm -f built .census mkfs/mkfs.xfs-$(bootpkg) + -rm -f built .census .reconf mkfs/mkfs.xfs-$(bootpkg) $(MAKE) distclean -rm -rf $(dirme) $(dirdev) $(dirdi) -rm -f debian/*substvars debian/files* debian/*.debhelper @@ -74,7 +79,6 @@ $(pkgme) $(MAKE) -C . install $(pkgdev) $(MAKE) -C . install-dev $(pkgdi) $(MAKE) -C debian install-d-i - $(pkgme) $(MAKE) dist rmdir debian/xfslibs-dev/usr/share/doc/xfsprogs dh_installdocs dh_installchangelogs