Adding debian version 1.6~rc2-2.debian/1.6_rc2-2

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

8 files changed, 56 insertions, 66 deletions

diff --git a/debian/changelog b/debian/changelog
index 95e54bc..37ee7bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lzlib (1.6~rc2-2) unstable; urgency=low
+
+  * Spliting out minilzip into own package to make liblz1 multiarch co-
+    installable.
+  * Updating copyright file.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 24 Aug 2014 16:53:00 +0200
+
 lzlib (1.6~rc2-1) unstable; urgency=low
 
   * Merging upstream version 1.6~rc2.
diff --git a/debian/control b/debian/control
index 5e5bf31..3bfa8c3 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,6 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks: lzip (<< 1.15~)
-Provides:
- minilzip,
- lzip-alternative,
 Description: data compressor based on the LZMA algorithm (library)
  The lzlib compression library provides in-memory LZMA compression and
  decompression functions, including integrity checking of the uncompressed data.
@@ -48,9 +45,34 @@ Depends:
  ${misc:Depends},
  liblz1 (= ${binary:Version}),
  liblz-dev (= ${binary:Version}),
+ minilzip (= ${binary:Version}),
 Description: data compressor based on the LZMA algorithm (debug)
  The lzlib compression library provides in-memory LZMA compression and
  decompression functions, including integrity checking of the uncompressed data.
  The compressed data format used by the library is the lzip format.
  .
  This package contains the debugging symbols.
+
+Package: minilzip
+Section: utils
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Breaks:
+ lzip (<< 1.15~),
+ lzlib1 (<< 1.6~rc2-1~),
+ lzlib-dev (<< 1.6~rc2-1~),
+Provides:
+ minilzip,
+ lzip-alternative,
+Description: minified, lossless data compressor based on the LZMA algorithm
+ Lzip is a lossless data compressor based on the LZMA algorithm, with very safe
+ integrity checking and a user interface similar to the one of gzip or bzip2.
+ Lzip decompresses almost as fast as gzip and compresses better than bzip2,
+ which makes it well suited for software distribution and data archiving.
+ .
+ Minilzip is a minimal version of lzip using the lzip file format; the files
+ produced by Minilzip are fully compatible with lzip.
+ .
+ Minilzip is intended as a test program for the lzlib library.
diff --git a/debian/copyright b/debian/copyright
index 53a58fd..b748219 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,20 +5,20 @@ Source: http://download.savannah.gnu.org/releases/lzip/
 
 Files: *
 Copyright: 2006-2014 Antonio Diaz Diaz <ant_diaz@teleline.es>
-License: GPL-3+
+License: GPL-2+
 
 Files: arg_parser.*
 Copyright: 2006-2014 Antonio Diaz Diaz <ant_diaz@teleline.es>
-License: GPL-3+ with Library exception
+License: GPL-2+ with Library exception
 
 Files: debian/*
 Copyright: 2009-2014 Daniel Baumann <mail@daniel-baumann.ch>
-License: GPL-3+
+License: GPL-2+
 
-License: GPL-3+
+License: GPL-2+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
  (at your option) any later version.
  .
  This program is distributed in the hope that it will be useful,
@@ -30,12 +30,12 @@ License: GPL-3+
  along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  The complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3 file.
+ can be found in /usr/share/common-licenses/GPL-2 file.
 
-License: GPL-3+ with Library exception
+License: GPL-2+ with Library exception
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
  (at your option) any later version.
  .
  This program is distributed in the hope that it will be useful,
@@ -47,7 +47,7 @@ License: GPL-3+ with Library exception
  along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  The complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3 file.
+ can be found in /usr/share/common-licenses/GPL-2 file.
  .
  As a special exception, you may use this file as part of a free
  software library without restriction. Specifically, if other files
diff --git a/debian/liblz1.postinst b/debian/liblz1.postinst
deleted file mode 100644
index 7a9fa90..0000000
--- a/debian/liblz1.postinst
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-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
-		;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-
-		;;
-
-	*)
-		echo "postinst called with unknown argument \`${1}'" >&2
-		exit 1
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/liblz1.prerm b/debian/liblz1.prerm
deleted file mode 100644
index abacdf1..0000000
--- a/debian/liblz1.prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "${1}" in
-	remove|upgrade|deconfigure)
-		update-alternatives --quiet --remove lzip /usr/bin/lzip.mini
-		;;
-
-	failed-upgrade)
-
-		;;
-
-	*)
-		echo "prerm called with unknown argument \`${1}'" >&2
-		exit 1
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/liblz-dev.postinst b/debian/minilzip.postinst
index 4c093c3..4de302e 100644
--- a/debian/liblz-dev.postinst
+++ b/debian/minilzip.postinst
@@ -5,6 +5,10 @@ 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
 		;;
diff --git a/debian/liblz-dev.prerm b/debian/minilzip.prerm
index dace4a4..f7da39e 100644
--- a/debian/liblz-dev.prerm
+++ b/debian/minilzip.prerm
@@ -4,6 +4,8 @@ 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
 		;;
 
diff --git a/debian/rules b/debian/rules
index 6d19533..bf5bac8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,18 +12,18 @@ override_dh_auto_install:
 	dh_auto_install -- LDCONFIG=/bin/true
 
 	# minilzip
-	install -D -m 0755 minilzip_shared debian/liblz1/usr/bin/lzip.mini
-	install -D -m 0644 doc/minilzip.1 debian/liblz1/usr/share/man/man1/lzip.mini.1
+	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
 
-	ln -s /usr/bin/lzip.mini debian/liblz1/usr/bin/minilzip
-	ln -s /usr/share/man/man1/lzip.mini.1.gz debian/liblz1/usr/share/man/man1/minilzip.1.gz
+	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/liblz-dev/usr/bin/lzip.mini-static
-	install -D -m 0644 doc/minilzip.1 debian/liblz-dev/usr/share/man/man1/lzip.mini-static.1
+	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/liblz-dev/usr/bin/minilzip.static
-	ln -s /usr/share/man/man1/lzip.mini-static.1.gz debian/liblz-dev/usr/share/man/man1/minilzip.static.1.gz
+	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
 
 	# removing unused files
 	rm -f debian/tmp/usr/share/info/dir*