diff --git a/debian/changelog b/debian/changelog index 3fa8da8..aad9ab7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xfsprogs (6.3.0-1ubuntu1) mantic; urgency=medium + + * Merge from Debian unstable (LP: #2025656). Remaining changes: + - Enable CET on amd64. + + -- Dave Jones Mon, 03 Jul 2023 15:10:12 +0100 + xfsprogs (6.3.0-1) unstable; urgency=low * New upstream release @@ -16,12 +23,41 @@ xfsprogs (6.1.1-1) unstable; urgency=low -- Nathan Scott Fri, 13 Jan 2023 19:03:00 +0100 +xfsprogs (6.1.0-1ubuntu1) lunar; urgency=medium + + * Merge with Debian unstable (LP: #2008066). Remaining changes: + - Enable CET on amd64. + Dropped changes, applied in Debian: + - Drop trying to create upstream distribution + + -- Simon Chopin Wed, 22 Feb 2023 11:16:59 +0100 + +xfsprogs (6.1.0-1) unstable; urgency=low + + * New upstream release + + -- Nathan Scott Fri, 23 Dec 2022 12:00:00 +0100 + xfsprogs (6.0.1-1) unstable; urgency=low * New upstream release -- Nathan Scott Fri, 23 Dec 2022 12:00:00 +0100 +xfsprogs (6.0.0-1ubuntu2) lunar; urgency=medium + + * Rebuild against latest icu + + -- Jeremy Bicha Sat, 04 Feb 2023 11:14:03 -0500 + +xfsprogs (6.0.0-1ubuntu1) lunar; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Drop trying to create upstream distribution. + - Enable CET on amd64. + + -- Julian Andres Klode Tue, 22 Nov 2022 16:15:23 +0100 + xfsprogs (6.0.0-1) unstable; urgency=low * New upstream release @@ -40,6 +76,14 @@ xfsprogs (5.18.0-1) unstable; urgency=medium -- Nathan Scott Fri, 03 Jun 2022 15:18:30 -0400 +xfsprogs (5.16.0-1ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Drop trying to create upstream distribution. + - Enable CET on amd64. + + -- Julian Andres Klode Thu, 19 May 2022 17:27:43 +0200 + xfsprogs (5.16.0-1) unstable; urgency=medium * New upstream release @@ -89,6 +133,31 @@ xfsprogs (5.14.0-rc1-1) unstable; urgency=medium -- Bastian Germann Sun, 14 Nov 2021 23:18:22 +0100 +xfsprogs (5.13.0-1ubuntu3) kinetic; urgency=medium + + * No-change rebuild against latest icu + + -- Jeremy Bicha Fri, 29 Apr 2022 08:09:44 -0400 + +xfsprogs (5.13.0-1ubuntu2) jammy; urgency=medium + + * No-change rebuild for icu soname change. + + -- Matthias Klose Wed, 09 Feb 2022 05:42:33 +0100 + +xfsprogs (5.13.0-1ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Enable blkid in d-i, by dropping explicitly passed configure option + (broken configure). + - Drop trying to create upstream distribution. + - Enable CET on amd64. + * Drop trailing whitespace in debian/changelog ubuntu entries + * Restore install-sh from include/ after running autoreconf; otherwise + it fails with "../../install-sh: so_dot_version does not exist." + + -- Julian Andres Klode Mon, 15 Nov 2021 11:56:49 +0100 + xfsprogs (5.13.0-1) unstable; urgency=medium * New upstream release @@ -117,6 +186,31 @@ xfsprogs (5.11.0-rc0-1) experimental; urgency=medium -- Bastian Germann Sat, 20 Feb 2021 11:57:31 +0100 +xfsprogs (5.10.0-4ubuntu2) impish; urgency=medium + + * No-change rebuild to build packages with zstd compression. + + -- Matthias Klose Thu, 07 Oct 2021 12:27:00 +0200 + +xfsprogs (5.10.0-4ubuntu1) impish; urgency=low + + [ Ubuntu Merge-o-Matic ] + * Merge from Debian unstable. Remaining changes: + - Enable blkid in d-i, by dropping explicitly passed configure option + (broken configure). + - Drop trying to create upstream distribution. + - Enable CET on amd64. + - xfsprogs upstream has regressed config.guess, so use + dh_update_autotools_config. + + -- Julian Andres Klode Mon, 10 May 2021 11:30:40 +0200 + +xfsprogs (5.10.0-4) unstable; urgency=high + + * Source-only reupload (Closes: #981662) + + -- Bastian Germann Tue, 16 Feb 2021 13:31:30 +0100 + xfsprogs (5.10.0-3) unstable; urgency=medium * Drop unused dh-python from Build-Depends (Closes: #981361) @@ -125,6 +219,29 @@ xfsprogs (5.10.0-3) unstable; urgency=medium -- Bastian Germann Fri, 05 Feb 2021 00:18:31 +0100 +xfsprogs (5.10.0-2ubuntu3) hirsute; urgency=medium + + * No-change rebuild to drop the udeb package. + + -- Matthias Klose Mon, 22 Feb 2021 10:46:39 +0100 + +xfsprogs (5.10.0-2ubuntu2) hirsute; urgency=medium + + * xfsprogs upstream has regressed config.guess, so use + dh_update_autotools_config. + + -- Steve Langasek Fri, 29 Jan 2021 22:15:40 +0000 + +xfsprogs (5.10.0-2ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Enable blkid in d-i, by dropping explicitly passed configure option + (broken configure). + - Drop trying to create upstream distribution. + - Enable CET on amd64. + + -- Steve Langasek Fri, 29 Jan 2021 12:24:41 -0800 + xfsprogs (5.10.0-2) unstable; urgency=low * Team upload @@ -208,6 +325,33 @@ xfsprogs (5.7.0-rc0-1) unstable; urgency=low -- Nathan Scott Thu, 07 May 2020 13:06:26 -0500 +xfsprogs (5.6.0-1ubuntu4) groovy; urgency=medium + + * No-change rebuild against libicu67 + + -- Steve Langasek Tue, 28 Jul 2020 16:21:05 +0000 + +xfsprogs (5.6.0-1ubuntu3) groovy; urgency=medium + + * Only enable CET on amd64. + + -- Dimitri John Ledkov Thu, 25 Jun 2020 23:00:43 +0100 + +xfsprogs (5.6.0-1ubuntu2) groovy; urgency=medium + + * Enable CET. + + -- Dimitri John Ledkov Thu, 25 Jun 2020 14:53:35 +0100 + +xfsprogs (5.6.0-1ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Enable blkid in d-i, by dropping explicitly passed configure option + (broken configure). + - Drop trying to create upstream distribution. + + -- Julian Andres Klode Mon, 27 Apr 2020 12:59:52 +0200 + xfsprogs (5.6.0-1) unstable; urgency=low * New upstream release @@ -262,6 +406,21 @@ xfsprogs (5.4.0-rc0-1) unstable; urgency=low -- Nathan Scott Fri, 15 Nov 2019 15:00:00 -0500 +xfsprogs (5.3.0-1ubuntu2) focal; urgency=medium + + * No-change rebuild for icu soname change. + + -- Matthias Klose Tue, 03 Mar 2020 21:42:53 +0100 + +xfsprogs (5.3.0-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Enable blkid in d-i, by dropping explicitly passed configure option + (broken configure). + - Drop trying to create upstream distribution. + + -- Steve Langasek Thu, 13 Feb 2020 11:08:40 -0800 + xfsprogs (5.3.0-1) unstable; urgency=low * New upstream release @@ -286,6 +445,15 @@ xfsprogs (5.3.0-rc0-1) unstable; urgency=low -- Nathan Scott Fri, 16 Aug 2019 12:14:23 -0500 +xfsprogs (5.2.1-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Enable blkid in d-i, by dropping explicitly passed configure option + (broken configure). + - Drop trying to create upstream distribution. + + -- Steve Langasek Tue, 05 Nov 2019 22:07:24 -0800 + xfsprogs (5.2.1-1) unstable; urgency=low * New upstream release @@ -316,6 +484,15 @@ xfsprogs (5.1.0-rc0-1) unstable; urgency=low -- Nathan Scott Tue, 07 May 2019 21:27:56 -0500 +xfsprogs (5.0.0-1ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Enable blkid in d-i, by dropping explicitly passed configure option + (broken configure). + - Drop trying to create upstream distribution. + + -- Steve Langasek Wed, 22 May 2019 16:46:33 -0700 + xfsprogs (5.0.0-1) unstable; urgency=low * New upstream release @@ -328,6 +505,21 @@ xfsprogs (5.0.0-rc1-1) unstable; urgency=low -- Nathan Scott Fri, 26 Apr 2019 16:18:28 -0500 +xfsprogs (4.20.0-1ubuntu2) eoan; urgency=medium + + * Fix mismerge and broken debian/rules. + + -- Steve Langasek Mon, 22 Apr 2019 19:44:17 +0000 + +xfsprogs (4.20.0-1ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Enable blkid in d-i, by dropping explicitly passed configure option + (broken configure). + - Drop trying to create upstream distribution. + + -- Steve Langasek Mon, 22 Apr 2019 11:46:36 -0700 + xfsprogs (4.20.0-1) unstable; urgency=low * New upstream release @@ -403,6 +595,15 @@ xfsprogs (4.16.0-1) unstable; urgency=low -- Nathan Scott Thu, 26 Apr 2018 15:13:07 -0500 +xfsprogs (4.15.1-1ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Enable blkid in d-i, by dropping explicitly passed configure option + (broken configure). + - Drop trying to create upstream distribution. + + -- Steve Langasek Mon, 14 May 2018 22:27:51 -0700 + xfsprogs (4.15.1-1) unstable; urgency=low * New upstream release @@ -460,6 +661,39 @@ xfsprogs (4.10.0) unstable; urgency=low -- Nathan Scott Sun, 26 Feb 2017 14:02:20 -0600 +xfsprogs (4.9.0+nmu1ubuntu2) bionic; urgency=medium + + * io/copy_file_range.c: cherry-pick upstream change for compatibility with + glibc 2.27. + + -- Steve Langasek Tue, 17 Apr 2018 23:44:31 -0700 + +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. + * Remove code in include/buildmacros which creates bogus symlinks for + libraries. (Closes: #766811) + + -- Michael Biebl Fri, 17 Mar 2017 19:27:58 +0100 + xfsprogs (4.9.0) unstable; urgency=low * New upstream release @@ -484,6 +718,45 @@ xfsprogs (4.5.0) unstable; urgency=low -- 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 @@ -1279,3 +1552,4 @@ xfsprogs (1.1.0) unstable; urgency=low Local variables: mode: debian-changelog End: + diff --git a/debian/control b/debian/control index 344466d..7cb0303 100644 --- a/debian/control +++ b/debian/control @@ -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 , Bastian Germann Build-Depends: libinih-dev (>= 53), uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config, liburcu-dev Standards-Version: 4.0.0 diff --git a/debian/rules b/debian/rules index 80400d0..79c8ebc 100755 --- a/debian/rules +++ b/debian/rules @@ -36,6 +36,13 @@ configure_options = \ --disable-threadsan \ --enable-lto +ifeq ($(target),amd64) +export DEB_CFLAGS_MAINT_APPEND=-fcf-protection +export DEB_LDFLAGS_MAINT_APPEND=-fcf-protection +endif +include /usr/share/dpkg/default.mk + + options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \ INSTALL_USER=root INSTALL_GROUP=root LDFLAGS='$(LDFLAGS)' \ LOCAL_CONFIGURE_OPTIONS="$(configure_options) --enable-editline=yes --enable-blkid=yes" ;