The following commit has been merged in the master branch:
commit ac27586a7129c68aa1e35d6d7221b077656a02bd
Author: Andreas Tille <[email protected]>
Date: Mon May 21 22:11:46 2012 +0200
Upstream applied patch in new version
diff --git a/debian/changelog b/debian/changelog
index 759a590..17bdf76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ jellyfish (1.1.5-1) UNRELEASED; urgency=low
* New upstream version fixing the FTBFS with gcc-4.7 bug
Closes: #667214
+ * debian/patches/fix-unused-but-set-variable.patch: Removed
+ because applied upstream
-- Andreas Tille <[email protected]> Mon, 21 May 2012 21:56:38 +0200
diff --git a/debian/patches/fix-unused-but-set-variable.patch
b/debian/patches/fix-unused-but-set-variable.patch
deleted file mode 100644
index 7786428..0000000
--- a/debian/patches/fix-unused-but-set-variable.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- jellyfish.orig/unit_tests/test_offsets_key_value.cc
-+++ jellyfish/unit_tests/test_offsets_key_value.cc
-@@ -38,7 +38,7 @@
- uint_t lk_len = 4;
- uint_t lv_len = kv_len - lk_len;
- uint_t i = 0;
-- uint64_t *w, *pw;
-+ // uint64_t *w, *pw;
-
- // /* Still missing:
- // * - testing of value masks
-@@ -47,9 +47,9 @@
- EXPECT_EQ(lv_len, this->offsets.get_lval_len());
-
- for(i = 0; true; i++) {
-- w = this->offsets.get_word_offset(i, &it, &lit, NULL);
-+ /* w = */ this->offsets.get_word_offset(i, &it, &lit, NULL);
- if(i > 0) {
-- pw = this->offsets.get_word_offset(i-1, &pit, &lpit, NULL);
-+ /* pw = */ this->offsets.get_word_offset(i-1, &pit, &lpit, NULL);
-
- uint_t noff = pit->key.boff + kv_len;
- if(noff > 64) {
diff --git a/debian/patches/series b/debian/patches/series
index 2ed35fb..2a3700c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
man
-fix-unused-but-set-variable.patch
--
count k-mers of DNA
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
