[med-svn] [subread] 04/05: Refresh and remove applied patches

[Alex Mestiashvili]

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

malex-guest pushed a commit to branch master
in repository subread.

commit 8fb55bbec0ff04c76271905c580bed938f8ebaef
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Sun Aug 28 08:42:54 2016 +0200

    Refresh and remove applied patches
---
 debian/patches/fix_ftbfs_kfreebsd.patch |  4 ++--
 debian/patches/series                   |  1 -
 debian/patches/syntax_err.patch         | 13 -------------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/debian/patches/fix_ftbfs_kfreebsd.patch b/debian/patches/fix_ftbfs_kfreebsd.patch
index 86c85cb..2b79fb4 100644
--- a/debian/patches/fix_ftbfs_kfreebsd.patch
+++ b/debian/patches/fix_ftbfs_kfreebsd.patch
@@ -2,7 +2,7 @@ Subject: Fix ftbfs on kfreebsd
 From: Alex Mestiashvili <alex at biotec.tu-dresden.de>
 --- subread.orig/src/HelperFunctions.c
 +++ subread/src/HelperFunctions.c
-@@ -769,6 +769,9 @@
+@@ -770,6 +770,9 @@
  #ifdef FREEBSD
  	return 1;
  #else
@@ -12,7 +12,7 @@ From: Alex Mestiashvili <alex at biotec.tu-dresden.de>
  #ifdef MACOS
      int         mib[6], x1, ret = 1;
  	size_t		len;
-@@ -857,6 +860,7 @@
+@@ -860,6 +863,7 @@
  	return 1;
  #endif
  #endif
diff --git a/debian/patches/series b/debian/patches/series
index df5d681..f9b8b21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix_ftbfs_kfreebsd.patch
 arch_specific_flags.patch
-syntax_err.patch
diff --git a/debian/patches/syntax_err.patch b/debian/patches/syntax_err.patch
deleted file mode 100644
index d92a48a..0000000
--- a/debian/patches/syntax_err.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: spelling-error-in-binary featureCounts s/requried/required/
-Origin: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
---- subread.orig/src/readSummary.c
-+++ subread/src/readSummary.c
-@@ -3511,7 +3511,7 @@
- 	SUBREADputs("  --largestOverlap    Assign reads to a meta-feature/feature that has the ");
- 	SUBREADputs("                      largest number of overlapping bases.");
- 	SUBREADputs("");
--	SUBREADputs("  --minOverlap <int>  Specify minimum number of overlapping bases requried ");
-+	SUBREADputs("  --minOverlap <int>  Specify minimum number of overlapping bases required ");
- 	SUBREADputs("                      between a read and a meta-feature/feature that the read ");
- 	SUBREADputs("                      is assigned to. 1 by default.");
- 	SUBREADputs("");

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