summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:40:53 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:40:53 +0000
commitc842dfb14f1c72f0438a6f9b5439130e372396b9 (patch)
tree700733959c1fac88f6b0131a810e76f5bac53f67
parentMerging upstream version 1.4~pre2. (diff)
downloadzutils-c842dfb14f1c72f0438a6f9b5439130e372396b9.tar.xz
zutils-c842dfb14f1c72f0438a6f9b5439130e372396b9.zip
Adding debian version 1.4~pre2-1.debian/1.4_pre2-1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rw-r--r--debian/changelog8
-rw-r--r--debian/copyright4
-rw-r--r--debian/patches/0002-zupdate.patch8
3 files changed, 14 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 5edea6f..f251551 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+zutils (1.4~pre2-1) experimental; urgency=low
+
+ * Merging upstream version 1.4~pre2.
+ * Refreshing zupdate.patch.
+ * Updating years in copyright file.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch> Fri, 01 May 2015 19:33:30 +0200
+
zutils (1.3-4) unstable; urgency=low
* Using libc0.1-dev for Built-Using on kfreebsd (Closes: #769563).
diff --git a/debian/copyright b/debian/copyright
index 70371db..06becaa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,11 +4,11 @@ Upstream-Contact: zutils-bug@nongnu.org
Source: http://download.savannah.gnu.org/releases/zutils/
Files: *
-Copyright: 2010-2014 Antonio Diaz Diaz <ant_diaz@teleline.es>
+Copyright: 2010-2015 Antonio Diaz Diaz <ant_diaz@teleline.es>
License: GPL-2+
Files: debian/*
-Copyright: 2009-2014 Daniel Baumann <mail@daniel-baumann.ch>
+Copyright: 2009-2015 Daniel Baumann <mail@daniel-baumann.ch>
License: GPL-2+
License: GPL-2+
diff --git a/debian/patches/0002-zupdate.patch b/debian/patches/0002-zupdate.patch
index ddfafa0..f434707 100644
--- a/debian/patches/0002-zupdate.patch
+++ b/debian/patches/0002-zupdate.patch
@@ -4,12 +4,12 @@ Description: Avoid linking zupdate statically.
diff -Naurp zutils.orig/Makefile.in zutils/Makefile.in
--- zutils.orig/Makefile.in
+++ zutils/Makefile.in
-@@ -49,7 +49,7 @@ ztest : $(ztest_objs)
- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(ztest_objs)
+@@ -51,7 +51,7 @@ ztest : $(ztest_objs)
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(ztest_objs)
zupdate : $(zupdate_objs)
-- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(zupdate_objs)
+- $(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(zupdate_objs)
+ $(CXX) $(CXXFLAGS) -o $@ $(zupdate_objs)
rc.o : rc.cc
- $(CXX) $(CXXFLAGS) $(CPPFLAGS) -DPROGVERSION=\"$(pkgversion)\" -DSYSCONFDIR=\"$(sysconfdir)\" -c -o $@ $<
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -DSYSCONFDIR=\"$(sysconfdir)\" -c -o $@ $<