[med-svn] [proteinortho] 01/05: Apply fix from upstream to enable building the package

Andreas Tille tille at debian.org
Thu Mar 17 20:02:29 UTC 2016


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository proteinortho.

commit b8911afe4e072d68a3cfa68eaa25c3f5a1e11266
Author: Andreas Tille <tille at debian.org>
Date:   Thu Mar 17 20:41:20 2016 +0100

    Apply fix from upstream to enable building the package
---
 debian/changelog                  |  5 +++--
 debian/patches/fix_makefile.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0e8405..fbe0968 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-proteinortho (5.12+dfsg-1) UNRELEASED; urgency=medium
+proteinortho (5.12+dfsg-1) unstable; urgency=medium
 
   * new upstream version
   * make better use of uscan options
   * cme fix dpkg-control
   * Fix C-Syntax
+  * Apply fix from upstream to enable building the package
 
- -- Andreas Tille <tille at debian.org>  Wed, 16 Mar 2016 17:57:06 +0100
+ -- Andreas Tille <tille at debian.org>  Thu, 17 Mar 2016 20:40:53 +0100
 
 proteinortho (5.11+dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/fix_makefile.patch b/debian/patches/fix_makefile.patch
new file mode 100644
index 0000000..b46bd95
--- /dev/null
+++ b/debian/patches/fix_makefile.patch
@@ -0,0 +1,32 @@
+Author: Marcus Lechner <lechner at staff.uni-marburg.de> (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/series b/debian/patches/series
index 2d5d3e3..8cc67fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 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



More information about the debian-med-commit mailing list