summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/0001-build.patch8
2 files changed, 12 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 91269c1..f8f6fe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lzip (1.15~pre3-1) experimental; urgency=low
+
+ * Merging upstream version 1.15~pre3.
+ * Rediffing build.patch.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch> Wed, 17 Jul 2013 18:46:09 +0200
+
lzip (1.15~pre2-4) experimental; urgency=low
* Adding vcs fields.
diff --git a/debian/patches/0001-build.patch b/debian/patches/0001-build.patch
index ceb9848..8914a48 100644
--- a/debian/patches/0001-build.patch
+++ b/debian/patches/0001-build.patch
@@ -4,16 +4,18 @@ Description: Avoid overwriting build-environment.
diff -Naurp lzip.orig/configure lzip/configure
--- lzip.orig/configure
+++ lzip/configure
-@@ -23,9 +23,9 @@ datarootdir='$(prefix)/share'
+@@ -20,10 +20,10 @@ bindir='$(exec_prefix)/bin'
+ datarootdir='$(prefix)/share'
infodir='$(datarootdir)/info'
mandir='$(datarootdir)/man'
- CXX=g++
+-CXX=g++
-CPPFLAGS=
-CXXFLAGS='-Wall -W -O2'
-LDFLAGS=
++#CXX=g++
+#CPPFLAGS=
+#CXXFLAGS='-Wall -W -O2'
+#LDFLAGS=
# checking whether we are using GNU C++.
- if [ ! -x /bin/g++ ] &&
+ ${CXX} --version > /dev/null 2>&1