This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository proteinortho.
commit a99b730c61ff753a2caa8e13891a15485809821e Author: Andreas Tille <[email protected]> Date: Wed May 4 14:54:23 2016 +0200 New upstream version (all patches applied upstream) --- debian/changelog | 6 ++++++ debian/patches/fix_makefile.patch | 32 -------------------------------- debian/patches/fix_syntax.patch | 15 --------------- debian/patches/hardening.patch | 29 ----------------------------- debian/patches/series | 3 --- 5 files changed, 6 insertions(+), 79 deletions(-) diff --git a/debian/changelog b/debian/changelog index a6ea869..f343b3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +proteinortho (5.13+dfsg-1) UNRELEASED; urgency=medium + + * New upstream version (all patches applied upstream) + + -- Andreas Tille <[email protected]> Wed, 04 May 2016 14:53:47 +0200 + proteinortho (5.12+dfsg-1) unstable; urgency=medium * new upstream version diff --git a/debian/patches/fix_makefile.patch b/debian/patches/fix_makefile.patch deleted file mode 100644 index b46bd95..0000000 --- a/debian/patches/fix_makefile.patch +++ /dev/null @@ -1,32 +0,0 @@ -Author: Marcus Lechner <[email protected]> (upstream) -Last-Update: Thu, 17 Mar 2016 12:59:43 +0100 -Origin: https://lists.alioth.debian.org/pipermail/debian-med-packaging/2016-March/040291.html -Description: Addapt Makefile to new file layout - ---- a/Makefile -+++ b/Makefile -@@ -2,20 +2,17 @@ - INSTALLDIR=/usr/local/bin - - CPP = g++ --CPPFLAGS += -Wall -O3 -+CPPFLAGS += -Wall -O3 -Wno-unused-result - --all: proteinortho5_clustering proteinortho5_clean_edges proteinortho5_tree -+all: proteinortho5_clustering proteinortho5_tree - - proteinortho5_clustering: proteinortho5_clustering.cpp - $(CPP) $(CPPFLAGS) $(LDFLAGS) -o $@ $< - --proteinortho5_tree: proteinortho5_clustering.cpp -+proteinortho5_tree: po_tree.c - $(CPP) $(CPPFLAGS) $(LDFLAGS) -o $@ $< - --proteinortho5_clean_edges: proteinortho5_clean_edges.cpp -- $(CPP) $(CPPFLAGS) $(LDFLAGS) -o $@ $< -- --install: proteinortho5.pl proteinortho5_clustering proteinortho5_singletons.pl proteinortho5_clean_edges2.pl ffadj_mcs.py po_tree po_tree.pl -+install: proteinortho5.pl proteinortho5_clustering proteinortho5_singletons.pl proteinortho5_clean_edges2.pl ffadj_mcs.py po2tree.pl - install -v $^ $(INSTALLDIR) - - test: proteinortho5.pl proteinortho5_clustering diff --git a/debian/patches/fix_syntax.patch b/debian/patches/fix_syntax.patch deleted file mode 100644 index 645b674..0000000 --- a/debian/patches/fix_syntax.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Fix C-Syntax -Author: Andreas Tille <[email protected]> -Last-Update: Thu, 10 Mar 2016 20:20:46 +0100 - ---- a/po_tree.c -+++ b/po_tree.c -@@ -199,7 +199,7 @@ void merge (Uint* max, Uint ccs, Uint vi - baum = strcat(baum,(*pnamen)[max[1]]); - baum = strcat(baum,":"); - baum = strcat(baum,length_1); --/ baum = strcat(baum,")"); -+ baum = strcat(baum,")"); - // baum = strcat(baum,")["); - // baum = strcat(baum,anz); - // baum = strcat(baum,"]"); diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch deleted file mode 100644 index 75fe365..0000000 --- a/debian/patches/hardening.patch +++ /dev/null @@ -1,29 +0,0 @@ -Author: Andreas Tille <[email protected]> -Last-Update: Thu, 12 Nov 2015 11:36:14 +0100 -Description: Propagate hardening options - ---- a/Makefile -+++ b/Makefile -@@ -2,18 +2,18 @@ - INSTALLDIR=/usr/local/bin - - CPP = g++ --CPPFLAGS = -Wall -O3 -+CPPFLAGS += -Wall -O3 - - all: proteinortho5_clustering proteinortho5_clean_edges proteinortho5_tree - - proteinortho5_clustering: proteinortho5_clustering.cpp -- $(CPP) $(CPPFLAGS) -o $@ $< -+ $(CPP) $(CPPFLAGS) $(LDFLAGS) -o $@ $< - - proteinortho5_tree: proteinortho5_clustering.cpp -- $(CPP) $(CPPFLAGS) -o $@ $< -+ $(CPP) $(CPPFLAGS) $(LDFLAGS) -o $@ $< - - proteinortho5_clean_edges: proteinortho5_clean_edges.cpp -- $(CPP) $(CPPFLAGS) -o $@ $< -+ $(CPP) $(CPPFLAGS) $(LDFLAGS) -o $@ $< - - install: proteinortho5.pl proteinortho5_clustering proteinortho5_singletons.pl proteinortho5_clean_edges2.pl ffadj_mcs.py po_tree po_tree.pl - install -v $^ $(INSTALLDIR) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 8cc67fe..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -hardening.patch -fix_syntax.patch -fix_makefile.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/proteinortho.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
