Reverting t64 migration for backports.

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

8 files changed, 13 insertions, 16 deletions

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 <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: 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/libtirpc3t64.install b/debian/libtirpc3.install
index 3ddde58..3ddde58 100644
--- a/debian/libtirpc3t64.install
+++ b/debian/libtirpc3.install
diff --git a/debian/libtirpc3t64.postrm.in b/debian/libtirpc3.postrm.in
index 3faa043..cf94a3e 100644
--- a/debian/libtirpc3t64.postrm.in
+++ b/debian/libtirpc3.postrm.in
@@ -7,7 +7,7 @@ set -e
 case $1 in
 	remove)
 		for file in libtirpc.so.3 libtirpc.so.3.0.0; do
-			dpkg-divert --package libtirpc3t64 --no-rename \
+			dpkg-divert --package libtirpc3 --no-rename \
 				--remove --divert \
 				/lib/#DEB_HOST_MULTIARCH#/$file.usr-is-merged \
 				/lib/#DEB_HOST_MULTIARCH#/$file
diff --git a/debian/libtirpc3t64.preinst.in b/debian/libtirpc3.preinst.in
index 4c6a96b..831e547 100644
--- a/debian/libtirpc3t64.preinst.in
+++ b/debian/libtirpc3.preinst.in
@@ -7,7 +7,7 @@ set -e
 case $1 in
 	install)
 		for file in libtirpc.so.3 libtirpc.so.3.0.0; do
-			dpkg-divert --package libtirpc3t64 --no-rename \
+			dpkg-divert --package libtirpc3 --no-rename \
 				--divert \
 				/lib/#DEB_HOST_MULTIARCH#/$file.usr-is-merged \
 				/lib/#DEB_HOST_MULTIARCH#/$file
diff --git a/debian/libtirpc3t64.symbols b/debian/libtirpc3.symbols
index 3078e16..bfd0882 100644
--- a/debian/libtirpc3t64.symbols
+++ b/debian/libtirpc3.symbols
@@ -1,4 +1,4 @@
-libtirpc.so.3 libtirpc3t64 #MINVER#
+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
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/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