[med-svn] [SCM] cufflinks branch, master, updated. debian/1.3.0-1-10-g60d3c10

Andreas Tille tille at debian.org
Mon May 14 06:56:05 UTC 2012


The following commit has been merged in the master branch:
commit 60d3c101cddb40182341233b47370f56c352dc3d
Author: Andreas Tille <tille at debian.org>
Date:   Mon May 14 08:55:30 2012 +0200

    Fix gcc-4.7 bug by simply following advise given by gcc - please check!

diff --git a/debian/changelog b/debian/changelog
index bb661ec..127bef7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ cufflinks (1.3.0-2) UNRELEASED; urgency=low
   [ Andreas Tille ]
   * debian/upstream: Added references as specified in tasks file
   * debian/copyright: Added Upstream-Contact e-mail
+  * debian/patches/gcc-4.7.patch: Fix gcc-4.7 build issue
+    Closes: #672744
 
- -- Charles Plessy <plessy at debian.org>  Wed, 09 May 2012 08:35:06 +0900
+ -- Andreas Tille <tille at debian.org>  Mon, 14 May 2012 08:38:03 +0200
 
 cufflinks (1.3.0-1) unstable; urgency=low
 
diff --git a/debian/patches/gcc-4.7.patch b/debian/patches/gcc-4.7.patch
new file mode 100644
index 0000000..63bfaed
--- /dev/null
+++ b/debian/patches/gcc-4.7.patch
@@ -0,0 +1,21 @@
+Author: Andreas Tille <tille at debian.org>
+Date: Mon, 14 May 2012 08:38:03 +0200
+Bug-Debian: http://bugs.debian.org/672744
+Description: Fixes FTBFS with gcc-4.7 by simply
+ following the advise given by gcc
+
+--- cufflinks-1.3.0.orig/src/lemon/bits/base_extender.h
++++ cufflinks-1.3.0/src/lemon/bits/base_extender.h
+@@ -359,10 +359,10 @@
+ 		}
+ 		
+ 		Node source(const UEdge& edge) const {
+-			return aNode(edge);
++			return this->aNode(edge);
+ 		}
+ 		Node target(const UEdge& edge) const {
+-			return bNode(edge);
++			return this->bNode(edge);
+ 		}
+ 		
+ 		void firstInc(UEdge& edge, bool& dir, const Node& node) const {
diff --git a/debian/patches/series b/debian/patches/series
index 8ceb241..a527c3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-fix_spelling.patch
 0002-bam2samtools.patch
 0003-fix_includes_path.patch
+gcc-4.7.patch

-- 
Transcript assembly, differential expression, and differential regulation for RNA-Seq.



More information about the debian-med-commit mailing list