From 1764d9dc3ded76464e2a82f680d7accd622b9264 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 8 Nov 2015 05:30:48 +0100 Subject: Adding debian version 1.2~pre3-1. Signed-off-by: Daniel Baumann --- debian/changelog | 8 ++++++++ debian/patches/0002-zupdate.patch | 8 ++++---- debian/zutils.lintian-overrides | 4 +++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index ae405be..d507db5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +zutils (1.2~pre3-1) experimental; urgency=low + + * Merging upstream version 1.2~pre3. + * Updating lintian overrides. + * Refreshing zupdate.patch. + + -- Daniel Baumann Wed, 16 Oct 2013 16:45:47 +0200 + zutils (1.2~pre2-1) experimental; urgency=low * Merging upstream version 1.2~pre2. diff --git a/debian/patches/0002-zupdate.patch b/debian/patches/0002-zupdate.patch index 93e179f..d77c97c 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 -@@ -53,7 +53,7 @@ ztest : ztest.in - chmod a+x ztest +@@ -49,7 +49,7 @@ ztest : $(ztest_objs) + $(CXX) $(LDFLAGS) -o $@ $(ztest_objs) zupdate : $(zupdate_objs) - $(CXX) $(LDFLAGS) -o $@ $(zupdate_objs) + $(CXX) -o $@ $(zupdate_objs) - main.o : main.cc - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DGREP=\"$(GREP)\" -c -o $@ $< + rc.o : rc.cc + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -DSYSCONFDIR=\"$(sysconfdir)\" -c -o $@ $< diff --git a/debian/zutils.lintian-overrides b/debian/zutils.lintian-overrides index 2b19abb..dfcaf05 100644 --- a/debian/zutils.lintian-overrides +++ b/debian/zutils.lintian-overrides @@ -1,3 +1,5 @@ +zutils: statically-linked-binary bin/zcat zutils: statically-linked-binary bin/zcmp zutils: statically-linked-binary bin/zdiff -zutils: statically-linked-binary bin/zutils +zutils: statically-linked-binary bin/zgrep +zutils: statically-linked-binary bin/ztest -- cgit v1.2.3