[med-svn] [muscle] 03/06: Drop cdbs in favour of dh (+makefile patch)

[Andreas Tille]

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

tille pushed a commit to branch master
in repository muscle.

commit 50deabca1f086be02b036a0632a51aa6ff00ed3a
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jan 18 20:47:32 2016 +0100

    Drop cdbs in favour of dh (+makefile patch)
---
 debian/control                |  6 +++---
 debian/muscle.install         |  2 +-
 debian/patches/makefile.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 debian/rules                  | 19 ++-----------------
 5 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/debian/control b/debian/control
index 86067d7..90c1e83 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
 Source: muscle
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <moeller at debian.org>,
-           Charles Plessy <plessy at debian.org>
+           Charles Plessy <plessy at debian.org>,
+           Andreas Tille <tille at debian.org>
 Section: science
 XS-Autobuild: no
 Priority: optional
-Build-Depends: debhelper (>= 9),
-               cdbs
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/muscle.git
 Vcs-Git: git://anonscm.debian.org/debian-med/muscle.git
diff --git a/debian/muscle.install b/debian/muscle.install
index a9d8ed5..dc6cff9 100644
--- a/debian/muscle.install
+++ b/debian/muscle.install
@@ -1 +1 @@
-muscle	/usr/bin
+src/muscle	usr/bin
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
new file mode 100644
index 0000000..c690492
--- /dev/null
+++ b/debian/patches/makefile.patch
@@ -0,0 +1,26 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sat, 05 May 2012 08:09:12 +0200
+Description: Original makefile calls script which in the end
+ is not helpful.  The variables CPPNames and ObjNames are taken
+ over from the script src/mk
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,3 +1,14 @@
+-muscle:
+-	chmod +x ./mk
+-	./mk
++all: muscle
++
++CPPNames = aligngivenpath aligngivenpathsw aligntwomsas aligntwoprofs aln alpha anchors bittraceback blosum62 blosumla clust cluster clwwt color cons diaglist diffobjscore diffpaths difftrees difftreese distcalc distfunc distpwkimura domuscle dosp dpreglist drawtree edgelist enumopts enumtostr estring fasta fasta2 fastclust fastdist fastdistjones fastdistkbit fastdistkmer fastdistmafft fastdistnuc fastscorepath2 finddiags finddiagsn glbalign glbalign352 glbaligndiag glbalignle glbaligns [...]
++
++ObjNames = aligngivenpath.o aligngivenpathsw.o aligntwomsas.o aligntwoprofs.o aln.o alpha.o anchors.o bittraceback.o blosum62.o blosumla.o clust.o cluster.o clwwt.o color.o cons.o diaglist.o diffobjscore.o diffpaths.o difftrees.o difftreese.o distcalc.o distfunc.o distpwkimura.o domuscle.o dosp.o dpreglist.o drawtree.o edgelist.o enumopts.o enumtostr.o estring.o fasta.o fasta2.o fastclust.o fastdist.o fastdistjones.o fastdistkbit.o fastdistkmer.o fastdistmafft.o fastdistnuc.o fastscorep [...]
++
++%.o: $.cpp
++	$(CXX) -c -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $(LDLIBS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
++
++muscle: $(ObjNames)
++	g++ $(LDLIBS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o muscle $(ObjNames)
++
++clean:
++	$(RM) *.o make.err make.out muscle
diff --git a/debian/patches/series b/debian/patches/series
index 9f5d123..8cc35e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_Fix_FTBFS_Hurd.patch
+makefile.patch
diff --git a/debian/rules b/debian/rules
index 6bf28ca..8001014 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile-vars.mk
-
-DEB_MAKE_BUILD_TARGET   :=
-
-CPPNames = aligngivenpath aligngivenpathsw aligntwomsas aligntwoprofs aln alpha anchors bittraceback blosum62 blosumla clust cluster clwwt color cons diaglist diffobjscore diffpaths difftrees difftreese distcalc distfunc distpwkimura domuscle dosp dpreglist drawtree edgelist enumopts enumtostr estring fasta fasta2 fastclust fastdist fastdistjones fastdistkbit fastdistkmer fastdistmafft fastdistnuc fastscorepath2 finddiags finddiagsn glbalign glbalign352 glbaligndiag glbalignle glbalignsi [...]
-
-ObjNames = aligngivenpath.o aligngivenpathsw.o aligntwomsas.o aligntwoprofs.o aln.o alpha.o anchors.o bittraceback.o blosum62.o blosumla.o clust.o cluster.o clwwt.o color.o cons.o diaglist.o diffobjscore.o diffpaths.o difftrees.o difftreese.o distcalc.o distfunc.o distpwkimura.o domuscle.o dosp.o dpreglist.o drawtree.o edgelist.o enumopts.o enumtostr.o estring.o fasta.o fasta2.o fastclust.o fastdist.o fastdistjones.o fastdistkbit.o fastdistkmer.o fastdistmafft.o fastdistnuc.o fastscorepa [...]
-
-%.o: $.cpp
-	$(CXX) -c -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $(LDLIBS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
-
-build/muscle:: $(ObjNames)
-	g++ $(LDLIBS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o muscle $(ObjNames)
-
-clean::
-	$(RM) *.o make.err make.out muscle
+%:
+	dh $@ --sourcedirectory=src --buildsystem=makefile
 
 get-orig-source:
 	uscan --verbose --force-download --repack --compression xz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/muscle.git