summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog10
-rw-r--r--debian/copyright10
-rw-r--r--debian/patches/0001-build.patch2
-rw-r--r--debian/patches/0002-zupdate.patch8
4 files changed, 20 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index f496b0f..4439d4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+zutils (1.3~pre1-1) unstable; urgency=low
+
+ * Merging upstream version 1.3~pre1.
+ * Refreshing build.patch.
+ * Refreshing zupdate.patch.
+ * Updating copyright file to reflect upstreams change from GPL-3+ to
+ GPL-2+.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch> Wed, 16 Jul 2014 22:08:37 +0200
+
zutils (1.2-2) unstable; urgency=low
* Building with dh --parallel.
diff --git a/debian/copyright b/debian/copyright
index ac5336f..70371db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,16 +5,16 @@ Source: http://download.savannah.gnu.org/releases/zutils/
Files: *
Copyright: 2010-2014 Antonio Diaz Diaz <ant_diaz@teleline.es>
-License: GPL-3+
+License: GPL-2+
Files: debian/*
Copyright: 2009-2014 Daniel Baumann <mail@daniel-baumann.ch>
-License: GPL-3+
+License: GPL-2+
-License: GPL-3+
+License: GPL-2+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
@@ -26,4 +26,4 @@ License: GPL-3+
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
The complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3 file.
+ can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/patches/0001-build.patch b/debian/patches/0001-build.patch
index 4d64ef1..5650f34 100644
--- a/debian/patches/0001-build.patch
+++ b/debian/patches/0001-build.patch
@@ -4,7 +4,7 @@ Description: Avoid overwriting build-environment.
diff -Naurp zutils.orig/configure zutils/configure
--- zutils.orig/configure
+++ zutils/configure
-@@ -22,9 +22,9 @@ infodir='$(datarootdir)/info'
+@@ -21,9 +21,9 @@ infodir='$(datarootdir)/info'
mandir='$(datarootdir)/man'
sysconfdir='$(prefix)/etc'
CXX=g++
diff --git a/debian/patches/0002-zupdate.patch b/debian/patches/0002-zupdate.patch
index d77c97c..ddfafa0 100644
--- a/debian/patches/0002-zupdate.patch
+++ b/debian/patches/0002-zupdate.patch
@@ -5,11 +5,11 @@ diff -Naurp zutils.orig/Makefile.in zutils/Makefile.in
--- zutils.orig/Makefile.in
+++ zutils/Makefile.in
@@ -49,7 +49,7 @@ ztest : $(ztest_objs)
- $(CXX) $(LDFLAGS) -o $@ $(ztest_objs)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(ztest_objs)
zupdate : $(zupdate_objs)
-- $(CXX) $(LDFLAGS) -o $@ $(zupdate_objs)
-+ $(CXX) -o $@ $(zupdate_objs)
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(zupdate_objs)
++ $(CXX) $(CXXFLAGS) -o $@ $(zupdate_objs)
rc.o : rc.cc
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -DSYSCONFDIR=\"$(sysconfdir)\" -c -o $@ $<
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -DPROGVERSION=\"$(pkgversion)\" -DSYSCONFDIR=\"$(sysconfdir)\" -c -o $@ $<