Adding debian version 1.15~pre1-1.debian/1.15_pre1-1

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

8 files changed, 72 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index 0dd5a0d..af0a085 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,20 @@
+lzip (1.15~pre1-1) experimental; urgency=low
+
+  * Correcting email address in previous changelog entry.
+  * Merging upstream version 1.15~pre1.
+  * Updating years in copyright file.
+  * Dropping dpkg-source compression levels.
+  * Prefixing patches with four digits.
+  * Trimming diff headers in patches.
+  * Adding alternative handling for /usr/bin/lzip.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 25 Mar 2013 15:33:04 +0100
+
 lzip (1.14-2) unstable; urgency=low
 
   * Removing all references to my old email address.
 
- -- Daniel Baumann <daniel.baumann@progress-linux.org>  Sun, 10 Mar 2013 21:07:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 10 Mar 2013 21:07:00 +0100
 
 lzip (1.14-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index cb1b11e..f376b1e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,15 +4,15 @@ Upstream-Contact: lzip-bug@nongnu.org
 Source: http://download.savannah.gnu.org/releases/lzip/
 
 Files: *
-Copyright: 2006-2012 Antonio Diaz Diaz <ant_diaz@teleline.es>
+Copyright: 2006-2013 Antonio Diaz Diaz <ant_diaz@teleline.es>
 License: GPL-3+
 
 Files: arg_parser.*
-Copyright: 2006-2012 Antonio Diaz Diaz <ant_diaz@teleline.es>
+Copyright: 2006-2013 Antonio Diaz Diaz <ant_diaz@teleline.es>
 License: GPL-3+ with Library exception
 
 Files: debian/*
-Copyright: 2009-2012 Daniel Baumann <mail@daniel-baumann.ch>
+Copyright: 2009-2013 Daniel Baumann <mail@daniel-baumann.ch>
 License: GPL-3+
 
 License: GPL-3+
diff --git a/debian/lzip.postinst b/debian/lzip.postinst
new file mode 100644
index 0000000..183b047
--- /dev/null
+++ b/debian/lzip.postinst
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	configure)
+		update-alternatives --quiet \
+			--install /usr/bin/lzip lzip /usr/bin/lzip.not-parallel 100 \
+			--slave /usr/share/info/lzip.info.gz lzip.info.gz /usr/share/info/lzip.not-parallel.info.gz \
+			--slave /usr/share/man/man1/lzip.1.gz lzip.1.gz /usr/share/man/man1/lzip.not-parallel.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/lzip.prerm b/debian/lzip.prerm
new file mode 100644
index 0000000..90d9b8b
--- /dev/null
+++ b/debian/lzip.prerm
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	remove|upgrade|deconfigure)
+		update-alternatives --quiet --remove lzip /usr/bin/lzip.not-parallel
+		;;
+
+	failed-upgrade)
+
+		;;
+
+	*)
+		echo "prerm called with unknown argument \`${1}'" >&2
+		exit 1
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/patches/01-build.patch b/debian/patches/0001-build.patch
index 265fcba..ceb9848 100644
--- a/debian/patches/01-build.patch
+++ b/debian/patches/0001-build.patch
@@ -2,8 +2,8 @@ Author: Daniel Baumann <mail@daniel-baumann.ch>
 Description: Avoid overwriting build-environment.
 
 diff -Naurp lzip.orig/configure lzip/configure
---- lzip.orig/configure	2013-03-10 21:00:48.821653006 +0100
-+++ lzip/configure	2013-03-10 21:05:18.874824341 +0100
+--- lzip.orig/configure
++++ lzip/configure
 @@ -23,9 +23,9 @@ datarootdir='$(prefix)/share'
  infodir='$(datarootdir)/info'
  mandir='$(datarootdir)/man'
diff --git a/debian/patches/series b/debian/patches/series
index 605653d..58cf314 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01-build.patch
+0001-build.patch
diff --git a/debian/rules b/debian/rules
index d6a08f8..57b1bf2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,13 @@ override_dh_auto_install:
 	# removing unused files
 	rm -f debian/lzip/usr/share/info/dir*
 
+	# alernative handling
+	mv debian/lzip/usr/bin/lzip debian/lzip/usr/bin/lzip.not-parallel
+	mv debian/lzip/usr/share/info/lzip.info debian/lzip/usr/share/info/lzip.not-parallel.info
+	mv debian/lzip/usr/share/man/man1/lzip.1 debian/lzip/usr/share/man/man1/lzip.not-parallel.1
+
 override_dh_strip:
 	dh_strip --dbg-package=lzip-dbg
 
 override_dh_builddeb:
-	dh_builddeb -- -Zxz -z9
+	dh_builddeb -- -Zxz
diff --git a/debian/source/options b/debian/source/options
index 22a4de9..5bd47b7 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1 @@
 compression = xz
-compression-level = 9