[med-svn] r12186 - in trunk/packages/velvet/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-09-07 12:10:51 +0000 (Fri, 07 Sep 2012)
New Revision: 12186

Modified:
   trunk/packages/velvet/trunk/debian/changelog
   trunk/packages/velvet/trunk/debian/patches/include_debians_zlib.patch
Log:
Adapt patch to new upstream version


Modified: trunk/packages/velvet/trunk/debian/changelog
===================================================================
--- trunk/packages/velvet/trunk/debian/changelog	2012-09-07 12:07:01 UTC (rev 12185)
+++ trunk/packages/velvet/trunk/debian/changelog	2012-09-07 12:10:51 UTC (rev 12186)
@@ -1,6 +1,6 @@
 velvet (1.2.07+dfsg-1) UNRELEASED; urgency=low
 
-  * New upstream version
+  * New upstream version (+adapted patch)
   * debian/watch: cope with +dfsg suffix (in addition to old ~nozlibcopy)
   * debian/get-orig-source: Enable simple changing of suffix for repackaged
     source

Modified: trunk/packages/velvet/trunk/debian/patches/include_debians_zlib.patch
===================================================================
--- trunk/packages/velvet/trunk/debian/patches/include_debians_zlib.patch	2012-09-07 12:07:01 UTC (rev 12185)
+++ trunk/packages/velvet/trunk/debian/patches/include_debians_zlib.patch	2012-09-07 12:10:51 UTC (rev 12186)
@@ -3,7 +3,7 @@
 Forwarded: no
 --- a/src/readSet.c
 +++ b/src/readSet.c
-@@ -35,7 +35,7 @@
+@@ -39,7 +39,7 @@ Copyright 2007, 2008 Daniel Zerbino (zer
  #elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
  #include "../third-party/zlib-1.2.3/Win32/include/zlib.h"
  #else
@@ -12,11 +12,9 @@
  #endif
  
  #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
-Index: velvet-1.2.03~nozlibcopy/src/binarySequences.c
-===================================================================
---- velvet-1.2.03~nozlibcopy.orig/src/binarySequences.c	2012-02-16 13:27:43.832843704 +0900
-+++ velvet-1.2.03~nozlibcopy/src/binarySequences.c	2012-02-16 13:28:04.176843708 +0900
-@@ -34,7 +34,7 @@
+--- a/src/binarySequences.c
++++ b/src/binarySequences.c
+@@ -34,7 +34,7 @@ Copyright 2011 Convey Computer Corporati
  #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
  #include "../third-party/zlib-1.2.3/Win32/include/zlib.h"
  #else