This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository abyss.
commit 060eeff640f07ed50128c90ff120d488e2701a5f Author: Andreas Tille <[email protected]> Date: Mon Sep 15 16:03:54 2014 +0200 Patch applied upstream --- debian/changelog | 2 +- debian/patches/abyss-pe | 10 +++++----- debian/patches/gcc4.8.patch | 32 -------------------------------- debian/patches/series | 1 - 4 files changed, 6 insertions(+), 39 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3ed104..0196ac4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ abyss (1.5.2-1) UNRELEASED; urgency=medium - * New upstream version + * New upstream version (remove applied patches) * d/watch: Moved to github -- Andreas Tille <[email protected]> Mon, 15 Sep 2014 14:53:24 +0200 diff --git a/debian/patches/abyss-pe b/debian/patches/abyss-pe index 1e90fa1..eb0d912 100644 --- a/debian/patches/abyss-pe +++ b/debian/patches/abyss-pe @@ -1,8 +1,8 @@ ---- abyss-1.3.3.orig/bin/abyss-pe 2012-03-13 16:24:07.000000000 -0700 -+++ abyss-1.3.3/bin/abyss-pe 2012-03-13 16:24:46.000000000 -0700 -@@ -2,6 +2,8 @@ - # Run the ABySS assembler. - # Written by Shaun Jackman <[email protected]>. +--- a/bin/abyss-pe ++++ b/bin/abyss-pe +@@ -3,6 +3,8 @@ + # Written by Shaun Jackman <[email protected]> and + # Anthony Raymond <[email protected]>. +PATH:=/usr/lib/abyss:${PATH} + diff --git a/debian/patches/gcc4.8.patch b/debian/patches/gcc4.8.patch index 1f0efa6..1b8283d 100644 --- a/debian/patches/gcc4.8.patch +++ b/debian/patches/gcc4.8.patch @@ -1,38 +1,6 @@ Description: -Werror=unused-local-typedefs Author: Dmitrijs Ledkovs <[email protected]> ---- a/Graph/ContigGraphAlgorithms.h -+++ b/Graph/ContigGraphAlgorithms.h -@@ -199,7 +199,6 @@ - template<typename Graph, typename OutIt, typename Predicate> - OutIt assemble_if(Graph& g, OutIt out, Predicate pred0) - { -- typedef typename Graph::vertex_descriptor vertex_descriptor; - typedef typename Graph::vertex_iterator vertex_iterator; - // pred(e) = !isPalindrome(e) && pred0(e) - binary_compose<std::logical_and<bool>, ---- a/Graph/SAMIO.h -+++ b/Graph/SAMIO.h -@@ -23,8 +23,6 @@ - vertex_property_type; - typedef typename graph_traits<Graph>::edge_iterator - edge_iterator; -- typedef typename edge_property<Graph>::type -- edge_property_type; - - out << "@HD\tVN:1.0\n" - "@PG\tID:" << program << "\tVN:" VERSION "\t" ---- a/Graph/DotIO.h -+++ b/Graph/DotIO.h -@@ -33,8 +33,6 @@ - typename graph_traits<Graph>::vertex_descriptor u, - const EdgeProp*) - { -- typedef typename graph_traits<Graph>::vertex_descriptor -- vertex_descriptor; - typedef typename graph_traits<Graph>::out_edge_iterator - out_edge_iterator; - typedef typename edge_property<Graph>::type edge_property_type; --- a/Map/overlap.cc +++ b/Map/overlap.cc @@ -272,7 +272,6 @@ diff --git a/debian/patches/series b/debian/patches/series index 321fafb..f09fd48 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ abyss-pe -gcc4.8.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/abyss.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
