summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:29:59 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:29:59 +0000
commit83ad3d8493074c0298f959e10943aedb9fa94be8 (patch)
tree1f04d0a4eb0ff404c730393eda15d4bf721e5e57
parentMerging upstream version 1.2~pre2. (diff)
downloadzutils-83ad3d8493074c0298f959e10943aedb9fa94be8.tar.xz
zutils-83ad3d8493074c0298f959e10943aedb9fa94be8.zip
Adding debian version 1.2~pre2-1.debian/1.2_pre2-1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/0002-zupdate.patch15
-rw-r--r--debian/patches/series1
3 files changed, 23 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 5e596c5..ae405be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+zutils (1.2~pre2-1) experimental; urgency=low
+
+ * Merging upstream version 1.2~pre2.
+ * Avoid linking zupdate statically.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch> Mon, 09 Sep 2013 13:36:05 +0200
+
zutils (1.1-1) experimental; urgency=low
* Updating vcs fields.
diff --git a/debian/patches/0002-zupdate.patch b/debian/patches/0002-zupdate.patch
new file mode 100644
index 0000000..93e179f
--- /dev/null
+++ b/debian/patches/0002-zupdate.patch
@@ -0,0 +1,15 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Avoid linking zupdate statically.
+
+diff -Naurp zutils.orig/Makefile.in zutils/Makefile.in
+--- zutils.orig/Makefile.in
++++ zutils/Makefile.in
+@@ -53,7 +53,7 @@ ztest : ztest.in
+ chmod a+x ztest
+
+ zupdate : $(zupdate_objs)
+- $(CXX) $(LDFLAGS) -o $@ $(zupdate_objs)
++ $(CXX) -o $@ $(zupdate_objs)
+
+ main.o : main.cc
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DGREP=\"$(GREP)\" -c -o $@ $<
diff --git a/debian/patches/series b/debian/patches/series
index 58cf314..202a17f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-build.patch
+0002-zupdate.patch