summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 09:34:35 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 09:34:35 +0000
commitac51d1d04f095f838485ec643b95d19dbe16d41e (patch)
treed7b851c41aaa2802666316eac6adc0f0ea55e527
parentMerging upstream version 1.14. (diff)
downloadlzip-ac51d1d04f095f838485ec643b95d19dbe16d41e.tar.xz
lzip-ac51d1d04f095f838485ec643b95d19dbe16d41e.zip
Adding debian version 1.14-1.debian/1.14-1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/01-build.patch10
2 files changed, 12 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 22970a1..539ca41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lzip (1.14-1) unstable; urgency=low
+
+ * Merging upstream version 1.14.
+ * Rediffing build.patch.
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 10 Mar 2013 21:02:15 +0100
+
lzip (1.13-4) unstable; urgency=low
* Updating to standards version 3.9.4.
diff --git a/debian/patches/01-build.patch b/debian/patches/01-build.patch
index 0a190ad..6a72e92 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 lzip.orig/configure lzip/configure
---- lzip.orig/configure 2012-06-30 00:54:43.926501688 +0200
-+++ lzip/configure 2012-06-30 00:55:57.423296881 +0200
+--- lzip.orig/configure 2013-03-10 21:00:48.821653006 +0100
++++ lzip/configure 2013-03-10 21:05:18.874824341 +0100
@@ -23,9 +23,9 @@ datarootdir='$(prefix)/share'
infodir='$(datarootdir)/info'
mandir='$(datarootdir)/man'
- CXX=
+ CXX=g++
-CPPFLAGS=
-CXXFLAGS='-Wall -W -O2'
-LDFLAGS=
@@ -15,5 +15,5 @@ diff -Naurp lzip.orig/configure lzip/configure
+#CXXFLAGS='-Wall -W -O2'
+#LDFLAGS=
- # Loop over all args
- while [ -n "$1" ] ; do
+ # checking whether we are using GNU C++.
+ if [ ! -x /bin/g++ ] &&