summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 10:24:15 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 10:24:15 +0000
commitcea210217e21986ab5deee0cb3257439dae7af35 (patch)
tree62d6f9a319e18887aceeb2eba8f77295dc2e9927
parentMerging upstream version 1.14. (diff)
downloadlziprecover-cea210217e21986ab5deee0cb3257439dae7af35.tar.xz
lziprecover-cea210217e21986ab5deee0cb3257439dae7af35.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/0001-build.patch4
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 4536ddf..9273cf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lziprecover (1.14-1) experimental; urgency=low
+
+ * Merging upstream version 1.14.
+ * Rediffing build.patch.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch> Mon, 10 Jun 2013 13:11:25 +0200
+
lziprecover (1.14~rc3-2) experimental; urgency=low
* Adding lzip-alternative provides.
diff --git a/debian/patches/0001-build.patch b/debian/patches/0001-build.patch
index 42a9dce..6791dbf 100644
--- a/debian/patches/0001-build.patch
+++ b/debian/patches/0001-build.patch
@@ -4,7 +4,7 @@ Description: Avoid overwriting build-environment.
diff -Naurp lziprecover.orig/configure lziprecover/configure
--- lziprecover.orig/configure
+++ lziprecover/configure
-@@ -23,9 +23,9 @@ datarootdir='$(prefix)/share'
+@@ -21,9 +21,9 @@ datarootdir='$(prefix)/share'
infodir='$(datarootdir)/info'
mandir='$(datarootdir)/man'
CXX=g++
@@ -16,4 +16,4 @@ diff -Naurp lziprecover.orig/configure lziprecover/configure
+#LDFLAGS=
# checking whether we are using GNU C++.
- if [ ! -x /bin/g++ ] &&
+ ${CXX} --version > /dev/null 2>&1