[med-svn] [mash] 03/05: new upstream version

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

satta pushed a commit to branch master
in repository mash.

commit 61ceab5101e212ff40727b836ee77f096013004b
Author: Sascha Steinbiss <satta at debian.org>
Date:   Sun Oct 1 11:01:16 2017 +0100

    new upstream version
---
 debian/changelog                                    | 7 +++++++
 debian/patches/drop_memcpy_wrapper.patch            | 4 ++--
 debian/patches/hardening.patch                      | 2 +-
 debian/patches/link_dynamically_against_capnp.patch | 2 +-
 debian/patches/parallel.patch                       | 6 +++---
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 503439c..e5cb782 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mash (2.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Refresh patches.
+
+ -- Sascha Steinbiss <satta at debian.org>  Sun, 01 Oct 2017 10:26:28 +0100
+
 mash (1.1.1-2) unstable; urgency=medium
 
   * Fix parallel building FTBFS. Thanks to Adrian Bunk for the patch.
diff --git a/debian/patches/drop_memcpy_wrapper.patch b/debian/patches/drop_memcpy_wrapper.patch
index 176c4a2..f78f94e 100644
--- a/debian/patches/drop_memcpy_wrapper.patch
+++ b/debian/patches/drop_memcpy_wrapper.patch
@@ -13,7 +13,7 @@ Author: Sascha Steinbiss <satta at debian.org>
  endif
  
  SOURCES=\
-@@ -34,8 +31,8 @@
+@@ -35,8 +32,8 @@
  
  all : mash libmash.a
  
@@ -24,7 +24,7 @@ Author: Sascha Steinbiss <satta at debian.org>
  
  libmash.a : $(OBJECTS)
  	ar -cr libmash.a $(OBJECTS)
-@@ -49,9 +46,6 @@
+@@ -50,9 +47,6 @@
  %.o : %.c++
  	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
  
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index 5167c0b..f946b93 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -3,7 +3,7 @@ Description: add hardening support
 Author: Sascha Steinbiss <satta at debian.org>
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -35,7 +35,7 @@
+@@ -36,7 +36,7 @@
  all : mash libmash.a
  
  mash : libmash.a src/mash/memcpyWrap.o
diff --git a/debian/patches/link_dynamically_against_capnp.patch b/debian/patches/link_dynamically_against_capnp.patch
index ce0c6fb..15b9bb7 100644
--- a/debian/patches/link_dynamically_against_capnp.patch
+++ b/debian/patches/link_dynamically_against_capnp.patch
@@ -2,7 +2,7 @@ Description: link dynamically against libcapnp and friends
 Author: Sascha Steinbiss <satta at debian.org>
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -31,8 +31,8 @@
+@@ -32,8 +32,8 @@
  
  all : mash libmash.a
  
diff --git a/debian/patches/parallel.patch b/debian/patches/parallel.patch
index 9cffb05..ff2f187 100644
--- a/debian/patches/parallel.patch
+++ b/debian/patches/parallel.patch
@@ -5,9 +5,9 @@ Description: Fix parallel build failures
  Fix the Makefile to only run "capnp compile" once.
 Author: Adrian Bunk <bunk at debian.org>
 
---- mash-1.1.1.orig/Makefile.in
-+++ mash-1.1.1/Makefile.in
-@@ -46,7 +46,9 @@ libmash.a : $(OBJECTS)
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -47,7 +47,9 @@
  %.o : %.c++
  	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mash.git