diff options
| -rw-r--r-- | debian/.gitignore | 1 | ||||
| -rw-r--r-- | debian/changelog | 39 | ||||
| -rw-r--r-- | debian/control | 22 | ||||
| -rwxr-xr-x | debian/e2fsprogs.install | 4 | ||||
| -rw-r--r-- | debian/e2fsprogs.shlibs.local | 4 | ||||
| -rw-r--r-- | debian/libext2fs2t64.install (renamed from debian/libext2fs2.install) | 0 | ||||
| -rw-r--r-- | debian/libext2fs2t64.lintian-overrides | 1 | ||||
| -rw-r--r-- | debian/libext2fs2t64.postrm | 12 | ||||
| -rw-r--r-- | debian/libext2fs2t64.preinst | 12 | ||||
| -rw-r--r-- | debian/libext2fs2t64.symbols (renamed from debian/libext2fs2.symbols) | 4 | ||||
| -rwxr-xr-x | debian/rules | 7 | ||||
| -rw-r--r-- | debian/shlibs.local | 2 |
12 files changed, 89 insertions, 19 deletions
diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index 91d8482..0000000 --- a/debian/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!patches diff --git a/debian/changelog b/debian/changelog index 0888b33..b5bef5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,42 @@ +e2fsprogs (1.47.0-2.4) unstable; urgency=medium + + * Non-maintainer upload. + * Upload to unstable. + * Version Provides and Breaks (thanks to Matthias Klose). + + -- Helmut Grohne <helmut@subdivi.de> Wed, 13 Mar 2024 07:20:06 +0100 + +e2fsprogs (1.47.0-2.4~exp1) experimental; urgency=medium + + * Non-maintainer upload. + * Revert time64 transitions for libss2 and libcom-err2. + * Enable dh_movetousr (DEP17). (Closes: #1060000) + + Mitigate file loss in libext2fs2 -> libext2fs2t64 upgrade and /usr-move. + + -- Helmut Grohne <helmut@subdivi.de> Sun, 10 Mar 2024 21:02:48 +0100 + +e2fsprogs (1.47.0-2.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix package names in d/*.shlibs.local. (Closes: #1065087) + * Update sonames in d/libext2fs2t64.lintian-overrides. + * Fix packages names in code for updating symbols fies in d/rules. + + -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Fri, 01 Mar 2024 08:01:06 +1300 + +e2fsprogs (1.47.0-2.2) unstable; urgency=medium + + * Non-maintainer upload. + + [ Helmut Grohne ] + * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #1053111) + + [ Michael Hudson-Doyle ] + * Account for changes in udevudevdir as well. + * Rename libraries for 64-bit time_t transition. + + -- Michael Hudson-Doyle <mwhudson@debian.org> Wed, 28 Feb 2024 23:40:42 +0000 + e2fsprogs (1.47.0-2) unstable; urgency=medium * Don't enable metadata_csum_seed and orhpan_file by default (Closes: diff --git a/debian/control b/debian/control index 7701987..f874264 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: e2fsprogs Section: admin Priority: required Maintainer: Theodore Y. Ts'o <tytso@mit.edu> -Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any] <!pkg.e2fsprogs.no-fuse2fs>, debhelper-compat (= 12), dh-exec, libblkid-dev, uuid-dev, m4, udev [linux-any], systemd [linux-any], cron [linux-any] +Build-Depends: dpkg-dev (>= 1.22.5), gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any] <!pkg.e2fsprogs.no-fuse2fs>, debhelper-compat (= 12), dh-exec, libblkid-dev, uuid-dev, m4, udev [linux-any], systemd [linux-any], systemd-dev [linux-any], cron [linux-any], dh-sequence-movetousr Rules-Requires-Root: no Standards-Version: 4.6.2 Homepage: http://e2fsprogs.sourceforge.net @@ -68,9 +68,9 @@ Package: libcom-err2 Section: libs Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libcomerr2 (<< 1.43.9-1~) -Breaks: libcomerr2 (<< 1.43.9-1~) -Provides: libcomerr2 (= ${binary:Version}) +Replaces: libcom-err2t64, libcomerr2 (<< 1.43.9-1~) +Breaks: libcom-err2t64 (<< 1.47.0-2.4~exp1~), libcomerr2 (<< 1.43.9-1~) +Provides: libcom-err2t64 (= ${binary:Version}), libcomerr2 (= ${binary:Version}) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -95,10 +95,12 @@ Description: common error description library - headers and static libraries This package contains the development environment for the com_err library. Package: libss2 +Provides: libss2t64 (= ${binary:Version}) +Breaks: libss2t64 (<< 1.47.0-2.4~exp1~) Section: libs Priority: optional Depends: libcom-err2, ${shlibs:Depends}, ${misc:Depends} -Replaces: e2fsprogs (<< 1.34-1) +Replaces: libss2t64, e2fsprogs (<< 1.34-1) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -138,13 +140,13 @@ Description: stripped-down versions of e2fsprogs, for debian-installer Don't attempt to install this package, it has no support for a couple of features you surely want. Anyway it should refuse to install. -Package: libext2fs2 +Package: libext2fs2t64 Section: libs Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: e2fslibs (<< 1.43.9-1~) -Breaks: e2fslibs (<< 1.43.9-1~) -Provides: e2fslibs (= ${binary:Version}) +Replaces: libext2fs2, e2fslibs (<< 1.43.9-1~) +Breaks: libext2fs2 (<< ${source:Version}), e2fslibs (<< 1.43.9-1~) +Provides: ${t64:Provides}, e2fslibs (= ${binary:Version}) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -161,7 +163,7 @@ Description: ext2/ext3/ext4 file system libraries Package: libext2fs-dev Section: libdevel Priority: optional -Depends: libc6-dev | libc-dev, comerr-dev, libext2fs2 (= ${binary:Version}), ${misc:Depends} +Depends: libc6-dev | libc-dev, comerr-dev, libext2fs2t64 (= ${binary:Version}), ${misc:Depends} Replaces: e2fslibs-dev (<< 1.43.9-1~) Breaks: e2fslibs-dev (<< 1.43.9-1~) Provides: e2fslibs-dev (= ${binary:Version}) diff --git a/debian/e2fsprogs.install b/debian/e2fsprogs.install index 8cf07a6..47f1fac 100755 --- a/debian/e2fsprogs.install +++ b/debian/e2fsprogs.install @@ -49,5 +49,5 @@ usr/share/man/man8/mklost+found.8 usr/share/man/man8/resize2fs.8 usr/share/man/man8/tune2fs.8 etc -[linux-any] lib/udev/rules.d -[linux-any] lib/systemd/system +[linux-any] ${deb_udevudevdir}/rules.d +[linux-any] ${deb_systemdsystemunitdir} diff --git a/debian/e2fsprogs.shlibs.local b/debian/e2fsprogs.shlibs.local index a99d2a0..8f24082 100644 --- a/debian/e2fsprogs.shlibs.local +++ b/debian/e2fsprogs.shlibs.local @@ -1,2 +1,2 @@ -libext2fs 2 libext2fs2 (= ${binary:Version}) -libe2p 2 libext2fs2 (= ${binary:Version}) +libext2fs 2 libext2fs2t64 (= ${binary:Version}) +libe2p 2 libext2fs2t64 (= ${binary:Version}) diff --git a/debian/libext2fs2.install b/debian/libext2fs2t64.install index 11198f7..11198f7 100644 --- a/debian/libext2fs2.install +++ b/debian/libext2fs2t64.install diff --git a/debian/libext2fs2t64.lintian-overrides b/debian/libext2fs2t64.lintian-overrides new file mode 100644 index 0000000..c4fd833 --- /dev/null +++ b/debian/libext2fs2t64.lintian-overrides @@ -0,0 +1 @@ +libext2fs2t64: package-name-doesnt-match-sonames libe2p2 libext2fs2 diff --git a/debian/libext2fs2t64.postrm b/debian/libext2fs2t64.postrm new file mode 100644 index 0000000..8a27708 --- /dev/null +++ b/debian/libext2fs2t64.postrm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if test "$1" = remove; then + # DEP17 P1 mitigation. Remove these diversions via postinst once trixie is released. + for lib in e2p.so.2 e2p.so.2.3 ext2fs.so.2 ext2fs.so.2.4; do + dpkg-divert --package libext2fs2t64 --no-rename --divert "/lib/#DEB_HOST_MULTIARCH#/lib$lib.usr-is-merged" --remove "/lib/#DEB_HOST_MULTIARCH#/lib$lib" + done +fi + +#DEBHELPER# diff --git a/debian/libext2fs2t64.preinst b/debian/libext2fs2t64.preinst new file mode 100644 index 0000000..8c802db --- /dev/null +++ b/debian/libext2fs2t64.preinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if test "$1" = install -o "$1" = upgrade; then + # DEP17 P1 mitigation. Remove these diversions via postinst once trixie is released. + for lib in e2p.so.2 e2p.so.2.3 ext2fs.so.2 ext2fs.so.2.4; do + dpkg-divert --package libext2fs2t64 --no-rename --divert "/lib/#DEB_HOST_MULTIARCH#/lib$lib.usr-is-merged" --add "/lib/#DEB_HOST_MULTIARCH#/lib$lib" + done +fi + +#DEBHELPER# diff --git a/debian/libext2fs2.symbols b/debian/libext2fs2t64.symbols index 6a97cf1..050dbf9 100644 --- a/debian/libext2fs2.symbols +++ b/debian/libext2fs2t64.symbols @@ -1,4 +1,4 @@ -libe2p.so.2 libext2fs2 #MINVER# +libe2p.so.2 libext2fs2t64 #MINVER# * Build-Depends-Package: libext2fs-dev e2p_edit_feature2@Base 1.40.7 e2p_edit_feature@Base 1.37 @@ -44,7 +44,7 @@ libe2p.so.2 libext2fs2 #MINVER# print_fs_state@Base 1.37 setflags@Base 1.37 setversion@Base 1.37 -libext2fs.so.2 libext2fs2 #MINVER# +libext2fs.so.2 libext2fs2t64 #MINVER# * Build-Depends-Package: libext2fs-dev badblocks_list_add@Base 1.37 badblocks_list_create@Base 1.37 diff --git a/debian/rules b/debian/rules index b85976f..73337d3 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,11 @@ ifeq ($(DEB_HOST_ARCH_OS), hurd) SKIP_FUSE2FS=yes endif +ifeq ($(DEB_HOST_ARCH_OS), linux) +export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,) +export deb_udevudevdir = $(shell pkg-config pkg-config --variable=udevdir udev | sed s,^/,,) +endif + ifneq ($(filter pkg.e2fsprogs.no-fuse2fs,$(DEB_BUILD_PROFILES)),) SKIP_FUSE2FS=yes endif @@ -30,7 +35,7 @@ INSTALL ?= install INSTALL_PROGRAM ?= $(INSTALL) -p -m 0755 ifneq (,$(findstring update-symbols,$(DEB_BUILD_OPTIONS))) -SYMBOL_LIBS := libext2fs libcomerr2 libss2 +SYMBOL_LIBS := libext2fst64 libcomerr2 libss2 endif CFLAGS_SHLIB = $(CFLAGS) diff --git a/debian/shlibs.local b/debian/shlibs.local index e678de0..c87a16c 100644 --- a/debian/shlibs.local +++ b/debian/shlibs.local @@ -1,4 +1,4 @@ -libext2fs 2 +libext2fst64 2 libe2p 2 libuuid 1 libcom_err 2 |