[med-svn] [SCM] jellyfish branch, master, updated. upstream/1.1.2-5-gc853c3a

[Andreas Tille]

The following commit has been merged in the master branch:
commit c853c3a8798bf2957da6738014099f1c8d56b4bf
Author: Andreas Tille <tille at debian.org>
Date:   Sat Mar 31 00:32:44 2012 +0200

    Remove patch which was applied upstream

diff --git a/debian/changelog b/debian/changelog
index 8b62812..988e45f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jellyfish (1.1.4-1) UNRELEASED; urgency=low
 
   * New upstream version
+  * debian/patches/ptrdiff_t: Removed because applied upstream
 
  -- Andreas Tille <tille at debian.org>  Sat, 31 Mar 2012 00:25:12 +0200
 
diff --git a/debian/patches/ptrdiff_t b/debian/patches/ptrdiff_t
deleted file mode 100644
index def13d1..0000000
--- a/debian/patches/ptrdiff_t
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: jellyfish/jellyfish/seq_qual_parser.cc
-===================================================================
---- jellyfish.orig/jellyfish/seq_qual_parser.cc	2011-10-10 13:08:53.000000000 -0700
-+++ jellyfish/jellyfish/seq_qual_parser.cc	2011-10-10 13:09:07.000000000 -0700
-@@ -15,6 +15,7 @@
- */
- 
- #include <jellyfish/seq_qual_parser.hpp>
-+#include <cstddef> // for ptrdiff_t
- 
- jellyfish::seq_qual_parser *
- jellyfish::seq_qual_parser::new_parser(const char *path) {
diff --git a/debian/patches/series b/debian/patches/series
index 0b77b7b..8e9cfaf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 man
-ptrdiff_t
 cmdline

-- 
count k-mers of DNA