Adding debian version 1.2-1.debian/1.2-1

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

6 files changed, 21 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 259efee..3b7a409 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+lunzip (1.2-1) unstable; urgency=low
+
+  * Merging upstream version 1.2.
+  * Updating years in copyright file.
+  * Dropping dpkg-source compression levels.
+  * Rediffing build.patch.
+  * Prefixing patches with four-digit numbers.
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Tue, 19 Feb 2013 17:20:03 +0100
+
 lunzip (1.1-3) unstable; urgency=low
 
   * Adding dpkg-source local options.
diff --git a/debian/copyright b/debian/copyright
index a3ab2fc..fd14b29 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: 2010-2012 Daniel Baumann <daniel.baumann@progress-technologies.net>
+Copyright: 2010-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/0001-build.patch
index 19aad72..a3a630b 100644
--- a/debian/patches/01-build.patch
+++ b/debian/patches/0001-build.patch
@@ -1,13 +1,13 @@
 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
+diff -Naurp lunzip.orig/configure lunzip/configure
+--- lunzip.orig/configure
++++ lunzip/configure
 @@ -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/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 424bcb5..5f3d9a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,4 +10,4 @@ override_dh_strip:
 	dh_strip --dbg-package=lunzip-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