diff options
-rw-r--r-- | debian/changelog | 10 | ||||
-rw-r--r-- | debian/copyright | 6 | ||||
-rw-r--r-- | debian/patches/01-build.patch | 10 | ||||
-rwxr-xr-x | debian/rules | 2 | ||||
-rw-r--r-- | debian/source/options | 1 |
5 files changed, 19 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index a1ec34c..3b14396 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +clzip (1.4-1) unstable; urgency=low + + * Merging upstream version 1.4. + * Trimming diff headers in patches. + * Updating years in copyright file. + * Dropping dpkg-source compression levels. + * Rediffing build.patch. + + -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 10 Mar 2013 19:51:59 +0100 + clzip (1.3-3) unstable; urgency=low * Updating to standards version 3.9.4. diff --git a/debian/copyright b/debian/copyright index bef6c08..5d06df5 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: 2010-2012 Antonio Diaz Diaz <ant_diaz@teleline.es> +Copyright: 2010-2013 Antonio Diaz Diaz <ant_diaz@teleline.es> License: GPL-3+ Files: carg_parser.* -Copyright: 2010-2012 Antonio Diaz Diaz <ant_diaz@teleline.es> +Copyright: 2010-2013 Antonio Diaz Diaz <ant_diaz@teleline.es> License: GPL-3+ with Library exception Files: debian/* -Copyright: 2009-2012 Daniel Baumann <daniel.baumann@progress-technologies.net> +Copyright: 2009-2013 Daniel Baumann <daniel.baumann@progress-technologies.net> License: GPL-3+ License: GPL-3+ diff --git a/debian/patches/01-build.patch b/debian/patches/01-build.patch index 19aad72..35b0bad 100644 --- a/debian/patches/01-build.patch +++ b/debian/patches/01-build.patch @@ -2,12 +2,12 @@ Author: Daniel Baumann <daniel.baumann@progress-technologies.net> Description: Avoid overwriting build-environment. diff -Naurp clzip.orig/configure clzip/configure ---- clzip.orig/configure 2012-06-27 16:02:18.168455662 +0200 -+++ clzip/configure 2012-06-29 04:37:06.563567740 +0200 +--- 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= + CC=gcc -CPPFLAGS= -CFLAGS='-Wall -W -O2' -LDFLAGS= @@ -15,5 +15,5 @@ diff -Naurp clzip.orig/configure clzip/configure +#CFLAGS='-Wall -W -O2' +#LDFLAGS= - # Loop over all args - while [ -n "$1" ] ; do + # checking whether we are using GNU C. + if [ ! -x /bin/gcc ] && diff --git a/debian/rules b/debian/rules index 3b23327..5e4ebf2 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ override_dh_auto_install: rm -f debian/clzip/usr/share/info/dir* override_dh_builddeb: - dh_builddeb -- -Zxz -z9 + dh_builddeb -- -Zxz override_dh_strip: dh_strip --dbg-package=clzip-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 |