Adding debian version 0.4-1.debian/0.4-1

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

5 files changed, 16 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index ed1266a..22cc739 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+zutils (0.4-1) unstable; urgency=low
+
+  * Merging upstream version 0.4.
+  * Removing manual make call in auto_install target, not required
+    anymore.
+  * Adding divertions for newly added zegrep and zfgrep.
+  * Making package architecture dependent, upstream has rewritten
+    helpers in C.
+
+ -- Daniel Baumann <daniel@debian.org>  Fri, 02 Oct 2009 22:17:47 +0200
+
 zutils (0.3-1) unstable; urgency=low
 
   * Updating package to standards version 3.8.3.
diff --git a/debian/control b/debian/control
index 325515f..3e5881c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Vcs-Browser: http://git.debian-maintainers.org/?p=lzip/lzip.git
 Vcs-Git: git://git.debian-maintainers.org/git/lzip/lzip.git
 
 Package: zutils
-Architecture: all
-Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, dpkg (>= 1.15.4) | install-info
 Recommends: bzip2, lzip, xz-utils
 Description: utilities for dealing with compressed files transparently
  Zutils is a collection of utilities for dealing with any combination of
diff --git a/debian/rules b/debian/rules
index f7b64bd..8e3eaf2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 	dh ${@}
 
 override_dh_auto_install:
-	$(MAKE) prefix=$(CURDIR)/debian/zutils/usr bindir=$(CURDIR)/debian/zutils/bin install
+	dh_auto_install
 
 	# Removing useless file
 	rm -f debian/zutils/usr/share/info/dir*
diff --git a/debian/zutils.postrm b/debian/zutils.postrm
index 709bc34..7e652bf 100644
--- a/debian/zutils.postrm
+++ b/debian/zutils.postrm
@@ -4,7 +4,7 @@ set -e
 
 case "${1}" in
 	remove)
-		for FILE in zgrep zcmp zdiff zcat
+		for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
 		do
 			dpkg-divert --package zutils --remove --rename --divert /bin/${FILE}.gzip /bin/${FILE}
 			dpkg-divert --package zutils --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 c24ed84..cca4936 100644
--- a/debian/zutils.preinst
+++ b/debian/zutils.preinst
@@ -4,7 +4,7 @@ set -e
 
 case "${1}" in
 	install)
-		for FILE in zgrep zcmp zdiff zcat
+		for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
 		do
 			dpkg-divert --package zutils --add --rename --divert /bin/${FILE}.gzip /bin/${FILE}
 			dpkg-divert --package zutils --add --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz