Reverting t64 migration for backports.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 18 insertions, 21 deletions

diff --git a/debian/control b/debian/control
index 2ef345c..928efd3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
 XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
 XSBC-Original-Maintainer: Theodore Y. Ts'o <tytso@mit.edu>
 Bugs: mailto:maintainers@lists.progress-linux.org
-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
+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], systemd-dev [linux-any], cron [linux-any], dh-sequence-movetousr
 Rules-Requires-Root: no
 Standards-Version: 4.6.2
 Homepage: http://e2fsprogs.sourceforge.net
@@ -73,9 +73,9 @@ Package: libcom-err2
 Section: libs
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
-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})
+Replaces: libcomerr2 (<< 1.43.9-1~)
+Breaks: libcomerr2 (<< 1.43.9-1~)
+Provides: libcomerr2 (= ${binary:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -100,12 +100,10 @@ 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: libss2t64, e2fsprogs (<< 1.34-1)
+Replaces: e2fsprogs (<< 1.34-1)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -145,13 +143,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: libext2fs2t64
+Package: libext2fs2
 Section: libs
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libext2fs2, e2fslibs (<< 1.43.9-1~)
-Breaks: libext2fs2 (<< ${source:Version}), e2fslibs (<< 1.43.9-1~)
-Provides: ${t64:Provides}, e2fslibs (= ${binary:Version})
+Replaces: e2fslibs (<< 1.43.9-1~)
+Breaks: e2fslibs (<< 1.43.9-1~)
+Provides: e2fslibs (= ${binary:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -168,7 +166,7 @@ Description: ext2/ext3/ext4 file system libraries
 Package: libext2fs-dev
 Section: libdevel
 Priority: optional
-Depends: libc6-dev | libc-dev, comerr-dev, libext2fs2t64 (= ${binary:Version}), ${misc:Depends}
+Depends: libc6-dev | libc-dev, comerr-dev, libext2fs2 (= ${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.shlibs.local b/debian/e2fsprogs.shlibs.local
index 8f24082..a99d2a0 100644
--- a/debian/e2fsprogs.shlibs.local
+++ b/debian/e2fsprogs.shlibs.local
@@ -1,2 +1,2 @@
-libext2fs 2 libext2fs2t64 (= ${binary:Version})
-libe2p 2 libext2fs2t64 (= ${binary:Version})
+libext2fs 2 libext2fs2 (= ${binary:Version})
+libe2p 2 libext2fs2 (= ${binary:Version})
diff --git a/debian/libext2fs2t64.install b/debian/libext2fs2.install
index 11198f7..11198f7 100644
--- a/debian/libext2fs2t64.install
+++ b/debian/libext2fs2.install
diff --git a/debian/libext2fs2t64.postrm b/debian/libext2fs2.postrm
index 8a27708..6677f3c 100644
--- a/debian/libext2fs2t64.postrm
+++ b/debian/libext2fs2.postrm
@@ -5,7 +5,7 @@ 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"
+	dpkg-divert --package libext2fs2 --no-rename --divert "/lib/#DEB_HOST_MULTIARCH#/lib$lib.usr-is-merged" --remove "/lib/#DEB_HOST_MULTIARCH#/lib$lib"
     done
 fi
 
diff --git a/debian/libext2fs2t64.preinst b/debian/libext2fs2.preinst
index 8c802db..45f945a 100644
--- a/debian/libext2fs2t64.preinst
+++ b/debian/libext2fs2.preinst
@@ -5,7 +5,7 @@ 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"
+	dpkg-divert --package libext2fs2 --no-rename --divert "/lib/#DEB_HOST_MULTIARCH#/lib$lib.usr-is-merged" --add "/lib/#DEB_HOST_MULTIARCH#/lib$lib"
     done
 fi
 
diff --git a/debian/libext2fs2t64.symbols b/debian/libext2fs2.symbols
index 050dbf9..6a97cf1 100644
--- a/debian/libext2fs2t64.symbols
+++ b/debian/libext2fs2.symbols
@@ -1,4 +1,4 @@
-libe2p.so.2 libext2fs2t64 #MINVER#
+libe2p.so.2 libext2fs2 #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 libext2fs2t64 #MINVER#
  print_fs_state@Base 1.37
  setflags@Base 1.37
  setversion@Base 1.37
-libext2fs.so.2 libext2fs2t64 #MINVER#
+libext2fs.so.2 libext2fs2 #MINVER#
 * Build-Depends-Package: libext2fs-dev
  badblocks_list_add@Base 1.37
  badblocks_list_create@Base 1.37
diff --git a/debian/libext2fs2t64.lintian-overrides b/debian/libext2fs2t64.lintian-overrides
deleted file mode 100644
index c4fd833..0000000
--- a/debian/libext2fs2t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libext2fs2t64: package-name-doesnt-match-sonames libe2p2 libext2fs2
diff --git a/debian/rules b/debian/rules
index 73337d3..24afbab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ INSTALL ?= install
 INSTALL_PROGRAM ?= $(INSTALL) -p -m 0755
 
 ifneq (,$(findstring update-symbols,$(DEB_BUILD_OPTIONS)))
-SYMBOL_LIBS := libext2fst64 libcomerr2 libss2
+SYMBOL_LIBS := libext2fs libcomerr2 libss2
 endif
 
 CFLAGS_SHLIB = $(CFLAGS)
diff --git a/debian/shlibs.local b/debian/shlibs.local
index c87a16c..e678de0 100644
--- a/debian/shlibs.local
+++ b/debian/shlibs.local
@@ -1,4 +1,4 @@
-libext2fst64	2
+libext2fs	2
 libe2p		2
 libuuid		1
 libcom_err	2