Adding debian version 1.4~rc1-1.debian/1.4_rc1-1

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

10 files changed, 91 insertions, 26 deletions

diff --git a/debian/changelog b/debian/changelog
index 505ced7..931182c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+pdlzip (1.4~rc1-1) experimental; urgency=low
+
+  * Merging upstream version 1.4~rc1.
+  * Updating years in copyright file.
+  * Dropping dpkg-source compression levels.
+  * Prefixing patches with ffour digits.
+  * Trimming diff headers in patches.
+  * Refreshing build.patch.
+  * Adding alternative handling for /usr/bin/lzip.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 26 Mar 2013 10:16:27 +0100
+
 pdlzip (1.3-4) unstable; urgency=low
 
   * Removing all references to my old email address.
diff --git a/debian/control b/debian/control
index f431a1f..097196d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Homepage: http://www.nongnu.org/lzip/pdlzip.html
 Package: pdlzip
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: lzip (<< 1.15~)
 Description: data compressor based on the LZMA algorithm (simple version)
  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.
diff --git a/debian/copyright b/debian/copyright
index 6817323..ed75286 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,12 @@ Upstream-Contact: lzip-bug@nongnu.org
 Source: http://download.savannah.gnu.org/releases/lzip/
 
 Files: *
-Copyright: 2010-2012 Antonio Diaz Diaz <ant_diaz@teleline.es>
+Copyright: 2010-2013 Antonio Diaz Diaz <ant_diaz@teleline.es>
            Igor Pavlov
 License: PD
 
 Files: debian/*
-Copyright: 2009-2012 Daniel Baumann <mail@daniel-baumann.ch>
+Copyright: 2009-2013 Daniel Baumann <mail@daniel-baumann.ch>
 License: PD
 
 License: PD
diff --git a/debian/patches/0001-build.patch b/debian/patches/0001-build.patch
new file mode 100644
index 0000000..64b6720
--- /dev/null
+++ b/debian/patches/0001-build.patch
@@ -0,0 +1,19 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Avoid overwriting build-environment.
+
+diff -Naurp pdlzip.orig/configure pdlzip/configure
+--- pdlzip.orig/configure
++++ pdlzip/configure
+@@ -23,9 +23,9 @@ datarootdir='$(prefix)/share'
+ infodir='$(datarootdir)/info'
+ mandir='$(datarootdir)/man'
+ CC=gcc
+-CPPFLAGS=
+-CFLAGS='-Wall -W -O2'
+-LDFLAGS=
++#CPPFLAGS=
++#CFLAGS='-Wall -W -O2'
++#LDFLAGS=
+ 
+ # checking whether we are using GNU C.
+ if [ ! -x /bin/gcc ] &&
diff --git a/debian/patches/01-build.patch b/debian/patches/01-build.patch
deleted file mode 100644
index 2f779d7..0000000
--- a/debian/patches/01-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Daniel Baumann <mail@daniel-baumann.ch>
-Description: Avoid overwriting build-environment.
-
-diff -Naurp pdlzip.orig/configure pdlzip/configure
---- pdlzip.orig/configure	2012-06-27 16:06:20.050801430 +0200
-+++ pdlzip/configure	2012-06-30 05:22:30.357871278 +0200
-@@ -24,9 +24,9 @@ infodir='$(datadir)/info'
- mandir='$(datadir)/man'
- sysconfdir='$(prefix)/etc'
- CC=
--CPPFLAGS=
--CFLAGS='-Wall -W -O2'
--LDFLAGS=
-+#CPPFLAGS=
-+#CFLAGS='-Wall -W -O2'
-+#LDFLAGS=
- 
- # Loop over all args
- while [ -n "$1" ] ; do
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/pdlzip.postinst b/debian/pdlzip.postinst
new file mode 100644
index 0000000..58513cc
--- /dev/null
+++ b/debian/pdlzip.postinst
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	configure)
+		update-alternatives --quiet \
+			--install /usr/bin/lzip lzip /usr/bin/lzip.public-domain 20 \
+			--slave /usr/share/man/man1/lzip.1.gz lzip.1.gz /usr/share/man/man1/lzip.public-domain.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/pdlzip.prerm b/debian/pdlzip.prerm
new file mode 100644
index 0000000..e789db0
--- /dev/null
+++ b/debian/pdlzip.prerm
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	remove|upgrade|deconfigure)
+		update-alternatives --quiet --remove lzip /usr/bin/lzip.public-domain
+		;;
+
+	failed-upgrade)
+
+		;;
+
+	*)
+		echo "prerm called with unknown argument \`${1}'" >&2
+		exit 1
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index d69544a..e0e4d5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,15 @@
 override_dh_auto_install:
 	dh_auto_install -- DESTDIR=$(CURDIR)/debian/pdlzip
 
-override_dh_strip:
-	dh_strip --dbg-package=pdlzip-dbg
+	# alernative handling
+	mv debian/pdlzip/usr/bin/pdlzip debian/pdlzip/usr/bin/lzip.public-domain
+	mv debian/pdlzip/usr/share/man/man1/pdlzip.1 debian/pdlzip/usr/share/man/man1/lzip.public-domain.1
+
+	ln -s /usr/bin/lzip.public-domain debian/pdlzip/usr/bin/pdlzip
+	ln -s /usr/share/man/man1/lzip.public-domain.1.gz debian/pdlzip/usr/share/man/man1/pdlzip.1.gz
 
 override_dh_builddeb:
-	dh_builddeb -- -Zxz -z9
+	dh_builddeb -- -Zxz
+
+override_dh_strip:
+	dh_strip --dbg-package=pdlzip-dbg
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