From 4504c1d205c75fbb9e5617cde0268f646a8af90d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 6 Nov 2015 12:36:46 +0100 Subject: Adding debian version 1.4-3. Signed-off-by: Daniel Baumann --- debian/changelog | 8 ++++++++ debian/clzip.postinst | 25 +++++++++++++++++++++++++ debian/clzip.prerm | 22 ++++++++++++++++++++++ debian/control | 1 + debian/patches/0001-build.patch | 19 +++++++++++++++++++ debian/patches/01-build.patch | 19 ------------------- debian/patches/series | 2 +- debian/rules | 9 +++++++++ 8 files changed, 85 insertions(+), 20 deletions(-) create mode 100644 debian/clzip.postinst create mode 100644 debian/clzip.prerm create mode 100644 debian/patches/0001-build.patch delete mode 100644 debian/patches/01-build.patch diff --git a/debian/changelog b/debian/changelog index aadf58c..831ffbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +clzip (1.4-3) experimental; urgency=low + + * Prefixing patches with four digits. + * Trimming diff headers in patches. + * Adding alternative handling for /usr/bin/lzip. + + -- Daniel Baumann Tue, 26 Mar 2013 10:31:22 +0100 + clzip (1.4-2) unstable; urgency=low * Removing all references to my old email address. diff --git a/debian/clzip.postinst b/debian/clzip.postinst new file mode 100644 index 0000000..abe240a --- /dev/null +++ b/debian/clzip.postinst @@ -0,0 +1,25 @@ +#!/bin/sh + +set -e + +case "${1}" in + configure) + update-alternatives --quiet \ + --install /usr/bin/lzip lzip /usr/bin/lzip.c 30 \ + --slave /usr/share/info/lzip.info.gz lzip.info.gz /usr/share/info/lzip.c.info.gz \ + --slave /usr/share/man/man1/lzip.1.gz lzip.1.gz /usr/share/man/man1/lzip.c.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/clzip.prerm b/debian/clzip.prerm new file mode 100644 index 0000000..0d17f9a --- /dev/null +++ b/debian/clzip.prerm @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e + +case "${1}" in + remove|upgrade|deconfigure) + update-alternatives --quiet --remove lzip /usr/bin/lzip.c + ;; + + failed-upgrade) + + ;; + + *) + echo "prerm called with unknown argument \`${1}'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/control b/debian/control index 8c90b3f..00ce2ef 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Homepage: http://www.nongnu.org/lzip/clzip.html Package: clzip Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} +Breaks: lzip (<< 1.15~) Description: C, 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. diff --git a/debian/patches/0001-build.patch b/debian/patches/0001-build.patch new file mode 100644 index 0000000..d4943fd --- /dev/null +++ b/debian/patches/0001-build.patch @@ -0,0 +1,19 @@ +Author: Daniel Baumann +Description: Avoid overwriting build-environment. + +diff -Naurp clzip.orig/configure clzip/configure +--- clzip.orig/configure ++++ clzip/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 3134fb2..0000000 --- a/debian/patches/01-build.patch +++ /dev/null @@ -1,19 +0,0 @@ -Author: Daniel Baumann -Description: Avoid overwriting build-environment. - -diff -Naurp clzip.orig/configure clzip/configure ---- clzip.orig/configure 2013-03-10 19:46:39.318088595 +0100 -+++ clzip/configure 2013-03-10 19:53:13.550359823 +0100 -@@ -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/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 5e4ebf2..3c5ba8b 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,15 @@ override_dh_auto_install: # removing unused files rm -f debian/clzip/usr/share/info/dir* + # alernative handling + mv debian/clzip/usr/bin/clzip debian/clzip/usr/bin/lzip.c + mv debian/clzip/usr/share/info/clzip.info debian/clzip/usr/share/info/lzip.c.info + mv debian/clzip/usr/share/man/man1/clzip.1 debian/clzip/usr/share/man/man1/lzip.c.1 + + ln -s /usr/bin/lzip.c debian/clzip/usr/bin/clzip + ln -s /usr/share/info/lzip.c.info.gz debian/clzip/usr/share/info/clzip.info.gz + ln -s /usr/share/man/man1/lzip.c.1.gz debian/clzip/usr/share/man/man1/clzip.1.gz + override_dh_builddeb: dh_builddeb -- -Zxz -- cgit v1.2.3