Including zcat again.

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

5 files changed, 3 insertions, 51 deletions

diff --git a/debian/rules b/debian/rules
index 6e2196b..80e5fe9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,9 +23,5 @@ override_dh_auto_install:
 	# removing unused files
 	rm -f debian/zutils/usr/share/info/dir*
 
-	# skipping zcat (#902936, #903931)
-	mv debian/zutils/bin/zcat debian/zutils/bin/zcat.zutils
-	mv debian/zutils/usr/share/man/man1/zcat.1 debian/zutils/usr/share/man/man1/zcat.zutils.1
-
 override_dh_gencontrol:
 	dh_gencontrol -- -Vbuilt-using="glibc (= $$(dpkg-query --show --showformat='$${source:Version}' libc-dev-bin))"
diff --git a/debian/zutils.lintian-overrides b/debian/zutils.lintian-overrides
index 62ec06b..dfcaf05 100644
--- a/debian/zutils.lintian-overrides
+++ b/debian/zutils.lintian-overrides
@@ -1,4 +1,4 @@
-zutils: statically-linked-binary bin/zcat.zutils
+zutils: statically-linked-binary bin/zcat
 zutils: statically-linked-binary bin/zcmp
 zutils: statically-linked-binary bin/zdiff
 zutils: statically-linked-binary bin/zgrep
diff --git a/debian/zutils.postinst b/debian/zutils.postinst
deleted file mode 100755
index 66ef2da..0000000
--- a/debian/zutils.postinst
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "${1}" in
-	configure)
-		# restoring zcat (#902936, #903931)
-		for FILE in zcat
-		do	if [ ! -e /bin/${FILE}.gzip ]
-			then
-				continue
-			fi
-
-			dpkg-divert --package zutils --quiet --remove --rename --divert /bin/${FILE}.gzip /bin/${FILE}
-			dpkg-divert --package zutils --quiet --remove --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz
-		done
-		;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-
-		;;
-
-	*)
-		echo "postinst called with unknown argument \`${1}'" >&2
-		exit 1
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/zutils.postrm b/debian/zutils.postrm
index 654c983..d732840 100755
--- a/debian/zutils.postrm
+++ b/debian/zutils.postrm
@@ -4,8 +4,7 @@ set -e
 
 case "${1}" in
 	remove)
-		# skipping zcat (#902936, #903931)
-		for FILE in zcmp zdiff zegrep zfgrep zgrep
+		for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
 		do
 			dpkg-divert --package zutils --quiet --remove --rename --divert /bin/${FILE}.gzip /bin/${FILE}
 			dpkg-divert --package zutils --quiet --remove --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz
diff --git a/debian/zutils.preinst b/debian/zutils.preinst
index 68e995c..b9aa4a5 100755
--- a/debian/zutils.preinst
+++ b/debian/zutils.preinst
@@ -4,23 +4,11 @@ set -e
 
 case "${1}" in
 	install)
-		# skipping zcat (#902936, #903931)
-		for FILE in zcmp zdiff zegrep zfgrep zgrep
+		for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
 		do
 			dpkg-divert --package zutils --quiet --add --rename --divert /bin/${FILE}.gzip /bin/${FILE}
 			dpkg-divert --package zutils --quiet --add --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz
 		done
-
-		# restoring zcat (#902936, #903931)
-		for FILE in zcat
-		do	if [ ! -e /bin/${FILE}.gzip ]
-			then
-				continue
-			fi
-
-			dpkg-divert --package zutils --quiet --remove --rename --divert /bin/${FILE}.gzip /bin/${FILE}
-			dpkg-divert --package zutils --quiet --remove --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz
-		done
 		;;
 
 	upgrade|abort-upgrade)