From 8aebd9e147e3983ae922b33954987d357e798cf7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 07:47:32 +0200 Subject: Reverting t64 migration for backports. Signed-off-by: Daniel Baumann --- debian/clean | 4 ++-- debian/control | 14 ++++++-------- debian/libtirpc3.install | 1 + debian/libtirpc3.postrm.in | 18 ++++++++++++++++++ debian/libtirpc3.preinst.in | 18 ++++++++++++++++++ debian/libtirpc3.symbols | 7 +++++++ debian/libtirpc3t64.install | 1 - debian/libtirpc3t64.lintian-overrides | 1 - debian/libtirpc3t64.postrm.in | 18 ------------------ debian/libtirpc3t64.preinst.in | 18 ------------------ debian/libtirpc3t64.symbols | 7 ------- debian/rules | 4 ++-- 12 files changed, 54 insertions(+), 57 deletions(-) create mode 100644 debian/libtirpc3.install create mode 100644 debian/libtirpc3.postrm.in create mode 100644 debian/libtirpc3.preinst.in create mode 100644 debian/libtirpc3.symbols delete mode 100644 debian/libtirpc3t64.install delete mode 100644 debian/libtirpc3t64.lintian-overrides delete mode 100644 debian/libtirpc3t64.postrm.in delete mode 100644 debian/libtirpc3t64.preinst.in delete mode 100644 debian/libtirpc3t64.symbols diff --git a/debian/clean b/debian/clean index a1a71c6..b5b9573 100644 --- a/debian/clean +++ b/debian/clean @@ -1,3 +1,3 @@ src/config.h -debian/libtirpc3t64.preinst -debian/libtirpc3t64.postrm +debian/libtirpc3.preinst +debian/libtirpc3.postrm diff --git a/debian/control b/debian/control index 2effdec..ae04656 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Maintainer: Progress Linux Maintainers XSBC-Uploaders: Daniel Baumann XSBC-Original-Maintainer: Josue Ortega Bugs: mailto:maintainers@lists.progress-linux.org -Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), libtool, pkg-config, libkrb5-dev +Build-Depends: 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: libtirpc3t64 (= ${binary:Version}), ${misc:Depends} +Depends: libtirpc3 (= ${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,14 +26,12 @@ Description: transport-independent RPC library - development files . This package contains the files needed for development against libtirpc. -Package: libtirpc3t64 -Provides: ${t64:Provides} -Replaces: libtirpc3 +Package: libtirpc3 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libtirpc-common (>= ${source:Version}) -Breaks: libtirpc3 (<< ${source:Version}), nfs-common (<< 1:1.2.8-7), nfs-kernel-server (<< 1:1.2.8-7) +Breaks: 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 @@ -43,8 +41,8 @@ Package: libtirpc-common Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} -Breaks: libtirpc1, libtirpc3t64 (<< 1.1.4-0.1~) -Replaces: libtirpc1, libtirpc3t64 (<< 1.1.4-0.1~) +Breaks: libtirpc1, libtirpc3 (<< 1.1.4-0.1~) +Replaces: libtirpc1, libtirpc3 (<< 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 new file mode 100644 index 0000000..3ddde58 --- /dev/null +++ b/debian/libtirpc3.install @@ -0,0 +1 @@ +usr/lib/*/lib*.so.* diff --git a/debian/libtirpc3.postrm.in b/debian/libtirpc3.postrm.in new file mode 100644 index 0000000..cf94a3e --- /dev/null +++ b/debian/libtirpc3.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 libtirpc3 --no-rename \ + --remove --divert \ + /lib/#DEB_HOST_MULTIARCH#/$file.usr-is-merged \ + /lib/#DEB_HOST_MULTIARCH#/$file + done + ;; +esac + +#DEBHELPER# diff --git a/debian/libtirpc3.preinst.in b/debian/libtirpc3.preinst.in new file mode 100644 index 0000000..831e547 --- /dev/null +++ b/debian/libtirpc3.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 libtirpc3 --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/libtirpc3.symbols new file mode 100644 index 0000000..bfd0882 --- /dev/null +++ b/debian/libtirpc3.symbols @@ -0,0 +1,7 @@ +libtirpc.so.3 libtirpc3 #MINVER# +* Build-Depends-Package: libtirpc-dev + (symver)TIRPC_0.3.0 1.0.2 + (symver)TIRPC_0.3.1 1.0.2 + (symver)TIRPC_0.3.2 1.0.2 + (symver)TIRPC_0.3.3 1.0.2 + (symver)TIRPC_PRIVATE 1.0.2 diff --git a/debian/libtirpc3t64.install b/debian/libtirpc3t64.install deleted file mode 100644 index 3ddde58..0000000 --- a/debian/libtirpc3t64.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/lib*.so.* diff --git a/debian/libtirpc3t64.lintian-overrides b/debian/libtirpc3t64.lintian-overrides deleted file mode 100644 index db4582f..0000000 --- a/debian/libtirpc3t64.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libtirpc3t64: package-name-doesnt-match-sonames libtirpc3 diff --git a/debian/libtirpc3t64.postrm.in b/debian/libtirpc3t64.postrm.in deleted file mode 100644 index 3faa043..0000000 --- a/debian/libtirpc3t64.postrm.in +++ /dev/null @@ -1,18 +0,0 @@ -#!/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 deleted file mode 100644 index 4c6a96b..0000000 --- a/debian/libtirpc3t64.preinst.in +++ /dev/null @@ -1,18 +0,0 @@ -#!/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/libtirpc3t64.symbols b/debian/libtirpc3t64.symbols deleted file mode 100644 index 3078e16..0000000 --- a/debian/libtirpc3t64.symbols +++ /dev/null @@ -1,7 +0,0 @@ -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 - (symver)TIRPC_0.3.2 1.0.2 - (symver)TIRPC_0.3.3 1.0.2 - (symver)TIRPC_PRIVATE 1.0.2 diff --git a/debian/rules b/debian/rules index 6b3fbd1..3fee41b 100755 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,6 @@ override_dh_auto_clean: execute_before_dh_installdeb: sed -e"s/#DEB_HOST_MULTIARCH#/$(DEB_HOST_MULTIARCH)/" \ - debian/libtirpc3t64.preinst.in > debian/libtirpc3t64.preinst + debian/libtirpc3.preinst.in > debian/libtirpc3.preinst sed -e"s/#DEB_HOST_MULTIARCH#/$(DEB_HOST_MULTIARCH)/" \ - debian/libtirpc3t64.postrm.in > debian/libtirpc3t64.postrm + debian/libtirpc3.postrm.in > debian/libtirpc3.postrm -- cgit v1.2.3