Merging debian version 1.3.4+ds-1.1.

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

10 files changed, 62 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 9df08cb..158aea5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libtirpc (1.3.4+ds-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062698
+
+ -- Graham Inggs <ginggs@debian.org>  Wed, 28 Feb 2024 20:25:53 +0000
+
 libtirpc (1.3.4+ds-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/clean b/debian/clean
index baba978..a1a71c6 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,3 @@
 src/config.h
+debian/libtirpc3t64.preinst
+debian/libtirpc3t64.postrm
diff --git a/debian/control b/debian/control
index ae04656..2effdec 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
 XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
 XSBC-Original-Maintainer: Josue Ortega <josue@debian.org>
 Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: debhelper-compat (= 13), libtool, pkg-config, libkrb5-dev
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), libtool, pkg-config, libkrb5-dev
 Standards-Version: 4.6.2
 Section: libs
 Homepage: http://sourceforge.net/projects/libtirpc
@@ -18,7 +18,7 @@ Package: libtirpc-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libtirpc3 (= ${binary:Version}), ${misc:Depends}
+Depends: libtirpc3t64 (= ${binary:Version}), ${misc:Depends}
 Description: transport-independent RPC library - development files
  This package contains a port of Sun's transport-independent RPC library to
  Linux. The library is intended as a replacement for the RPC code in the GNU C
@@ -26,12 +26,14 @@ Description: transport-independent RPC library - development files
  .
  This package contains the files needed for development against libtirpc.
 
-Package: libtirpc3
+Package: libtirpc3t64
+Provides: ${t64:Provides}
+Replaces: libtirpc3
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, libtirpc-common (>= ${source:Version})
-Breaks: nfs-common (<< 1:1.2.8-7), nfs-kernel-server (<< 1:1.2.8-7)
+Breaks: libtirpc3 (<< ${source:Version}), nfs-common (<< 1:1.2.8-7), nfs-kernel-server (<< 1:1.2.8-7)
 Description: transport-independent RPC library
  This package contains a port of Sun's transport-independent RPC library to
  Linux. The library is intended as a replacement for the RPC code in the GNU C
@@ -41,8 +43,8 @@ Package: libtirpc-common
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Breaks: libtirpc1, libtirpc3 (<< 1.1.4-0.1~)
-Replaces: libtirpc1, libtirpc3 (<< 1.1.4-0.1~)
+Breaks: libtirpc1, libtirpc3t64 (<< 1.1.4-0.1~)
+Replaces: libtirpc1, libtirpc3t64 (<< 1.1.4-0.1~)
 Description: transport-independent RPC library - common files
  This package contains a port of Sun's transport-independent RPC library to
  Linux. The library is intended as a replacement for the RPC code in the GNU C
diff --git a/debian/libtirpc3.install b/debian/libtirpc3.install
deleted file mode 100644
index 622f9ef..0000000
--- a/debian/libtirpc3.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/*/lib*.so.*
diff --git a/debian/libtirpc3t64.install b/debian/libtirpc3t64.install
new file mode 100644
index 0000000..3ddde58
--- /dev/null
+++ b/debian/libtirpc3t64.install
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff --git a/debian/libtirpc3t64.lintian-overrides b/debian/libtirpc3t64.lintian-overrides
new file mode 100644
index 0000000..db4582f
--- /dev/null
+++ b/debian/libtirpc3t64.lintian-overrides
@@ -0,0 +1 @@
+libtirpc3t64: package-name-doesnt-match-sonames libtirpc3
diff --git a/debian/libtirpc3t64.postrm.in b/debian/libtirpc3t64.postrm.in
new file mode 100644
index 0000000..3faa043
--- /dev/null
+++ b/debian/libtirpc3t64.postrm.in
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+# per Helmut, these can't be safely removed again (in package postinst)
+# until forky
+case $1 in
+	remove)
+		for file in libtirpc.so.3 libtirpc.so.3.0.0; do
+			dpkg-divert --package libtirpc3t64 --no-rename \
+				--remove --divert \
+				/lib/#DEB_HOST_MULTIARCH#/$file.usr-is-merged \
+				/lib/#DEB_HOST_MULTIARCH#/$file
+                done
+                ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/libtirpc3t64.preinst.in b/debian/libtirpc3t64.preinst.in
new file mode 100644
index 0000000..4c6a96b
--- /dev/null
+++ b/debian/libtirpc3t64.preinst.in
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+# per Helmut, these can't be safely removed again (in package postinst)
+# until forky
+case $1 in
+	install)
+		for file in libtirpc.so.3 libtirpc.so.3.0.0; do
+			dpkg-divert --package libtirpc3t64 --no-rename \
+				--divert \
+				/lib/#DEB_HOST_MULTIARCH#/$file.usr-is-merged \
+				/lib/#DEB_HOST_MULTIARCH#/$file
+                done
+                ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/libtirpc3.symbols b/debian/libtirpc3t64.symbols
index bfd0882..3078e16 100644
--- a/debian/libtirpc3.symbols
+++ b/debian/libtirpc3t64.symbols
@@ -1,4 +1,4 @@
-libtirpc.so.3 libtirpc3 #MINVER#
+libtirpc.so.3 libtirpc3t64 #MINVER#
 * Build-Depends-Package: libtirpc-dev
  (symver)TIRPC_0.3.0 1.0.2
  (symver)TIRPC_0.3.1 1.0.2
diff --git a/debian/rules b/debian/rules
index 0178d2f..6b3fbd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,17 +23,15 @@ override_dh_auto_install:
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 override_dh_install:
-	# Move libtirpc.so.* to /lib
-	mkdir -p debian/tmp/lib/$(DEB_HOST_MULTIARCH)
-	mv debian/tmp/usr/lib/*/libtirpc.so.* debian/tmp/lib/$(DEB_HOST_MULTIARCH)
-
-	# Fix up the -dev symlink
-	LINKTARGET=`readlink debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libtirpc.so`; \
-	ln -sf /lib/$(DEB_HOST_MULTIARCH)/$$LINKTARGET debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libtirpc.so
-
 	dh_install -Nlibtirpc3-udeb
 	dh_install -plibtirpc3-udeb --sourcedir=debian/tmp-udeb
 
 override_dh_auto_clean:
 	rm -rf build-deb build-udeb
 	rm -rf debian/tmp-udeb
+
+execute_before_dh_installdeb:
+	sed -e"s/#DEB_HOST_MULTIARCH#/$(DEB_HOST_MULTIARCH)/" \
+		debian/libtirpc3t64.preinst.in > debian/libtirpc3t64.preinst
+	sed -e"s/#DEB_HOST_MULTIARCH#/$(DEB_HOST_MULTIARCH)/" \
+		debian/libtirpc3t64.postrm.in > debian/libtirpc3t64.postrm