Adding debian version 1.6-2.debian/1.6-2debian-jessie

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

5 files changed, 20 insertions, 21 deletions

diff --git a/debian/changelog b/debian/changelog
index 15ec0b9..25f1af5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+lzlib (1.6-2) unstable; urgency=low
+
+  * Updating to standards version 3.9.6.
+  * Harmonizing update-alternatives handling across all lzip-alternative
+    providing packages.
+  * Dropping minilzip-static, not really useful since the minilzip package
+    depends on liblz anyway.
+  * Harmonizing update-alternatives priority across all lzip-alternative
+    providing packages.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 18 Sep 2014 00:15:20 +0200
+
 lzlib (1.6-1) unstable; urgency=low
 
   * Merging upstream version 1.6.
diff --git a/debian/control b/debian/control
index 3bfa8c3..16af877 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Daniel Baumann <mail@daniel-baumann.ch>
 Build-Depends: debhelper (>= 9), texinfo
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://www.nongnu.org/lzip/lzlib.html
 Vcs-Browser: http://daniel-baumann.ch/gitweb/?p=debian/packages/lzlib.git
 Vcs-Git: git://daniel-baumann.ch/git/debian/packages/lzlib.git
diff --git a/debian/minilzip.postinst b/debian/minilzip.postinst
index 4de302e..07cc20a 100644
--- a/debian/minilzip.postinst
+++ b/debian/minilzip.postinst
@@ -5,12 +5,8 @@ set -e
 case "${1}" in
 	configure)
 		update-alternatives --quiet \
-			--install /usr/bin/lzip lzip /usr/bin/lzip.mini 75 \
-			--slave /usr/share/man/man1/lzip.1.gz lzip.1.gz /usr/share/man/man1/lzip.mini.1.gz
-
-		update-alternatives --quiet \
-			--install /usr/bin/lzip lzip /usr/bin/lzip.mini-static 70 \
-			--slave /usr/share/man/man1/lzip.1.gz lzip.1.gz /usr/share/man/man1/lzip.mini-static.1.gz
+			--install /usr/bin/lzip lzip /usr/bin/lzip.minilzip 1000 \
+			--slave /usr/share/man/man1/lzip.1.gz lzip.1.gz /usr/share/man/man1/lzip.minilzip.1.gz
 		;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/minilzip.prerm b/debian/minilzip.prerm
index f7da39e..54ebd3b 100644
--- a/debian/minilzip.prerm
+++ b/debian/minilzip.prerm
@@ -4,9 +4,7 @@ set -e
 
 case "${1}" in
 	remove|upgrade|deconfigure)
-		update-alternatives --quiet --remove lzip /usr/bin/lzip.mini
-
-		update-alternatives --quiet --remove lzip /usr/bin/lzip.mini-static
+		update-alternatives --quiet --remove lzip /usr/bin/lzip.minilzip
 		;;
 
 	failed-upgrade)
diff --git a/debian/rules b/debian/rules
index bf5bac8..4eae67a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,18 +12,11 @@ override_dh_auto_install:
 	dh_auto_install -- LDCONFIG=/bin/true
 
 	# minilzip
-	install -D -m 0755 minilzip_shared debian/minilzip/usr/bin/lzip.mini
-	install -D -m 0644 doc/minilzip.1 debian/minilzip/usr/share/man/man1/lzip.mini.1
+	install -D -m 0755 minilzip_shared debian/minilzip/usr/bin/lzip.minilzip
+	install -D -m 0644 doc/minilzip.1 debian/minilzip/usr/share/man/man1/lzip.minilzip.1
 
-	ln -s /usr/bin/lzip.mini debian/minilzip/usr/bin/minilzip
-	ln -s /usr/share/man/man1/lzip.mini.1.gz debian/minilzip/usr/share/man/man1/minilzip.1.gz
-
-	# minilzip.static
-	install -D -m 0755 minilzip debian/minilzip/usr/bin/lzip.mini-static
-	install -D -m 0644 doc/minilzip.1 debian/minilzip/usr/share/man/man1/lzip.mini-static.1
-
-	ln -s /usr/bin/lzip.mini-static debian/minilzip/usr/bin/minilzip.static
-	ln -s /usr/share/man/man1/lzip.mini-static.1.gz debian/minilzip/usr/share/man/man1/minilzip.static.1.gz
+	ln -s /usr/bin/lzip.minilzip debian/minilzip/usr/bin/minilzip
+	ln -s /usr/share/man/man1/lzip.minilzip.1.gz debian/minilzip/usr/share/man/man1/minilzip.1.gz
 
 	# removing unused files
 	rm -f debian/tmp/usr/share/info/dir*