diff options
author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-08 04:37:35 +0000 |
---|---|---|
committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-08 04:37:35 +0000 |
commit | 7b3e7741dd9b0450ec924acbabefa8feb87ed82d (patch) | |
tree | 5683d6aa5fae9b23cb5d4f972f236f1a6c5ecc28 /debian/patches | |
parent | Merging upstream version 1.3~pre1. (diff) | |
download | zutils-7b3e7741dd9b0450ec924acbabefa8feb87ed82d.tar.xz zutils-7b3e7741dd9b0450ec924acbabefa8feb87ed82d.zip |
Adding debian version 1.3~pre1-1.debian/1.3_pre1-1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/0001-build.patch | 2 | ||||
-rw-r--r-- | debian/patches/0002-zupdate.patch | 8 |
2 files changed, 5 insertions, 5 deletions
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 $@ $< |