Control: tag -1 patch

Michael Tautschnig <[email protected]> (2014-06-02):
> Package: proftmb
> Version: 1.1.12-1
> Severity: serious
> Usertags: goto-cc
> 
> During a rebuild of all Debian packages in a clean sid chroot (using 
> cowbuilder
> and pbuilder) the build failed with the following error.
> 
> [...]
>    dh_auto_build -O--parallel
> make[1]: Entering directory 
> '/srv/jenkins-slave/workspace/sid-goto-cc-proftmb/proftmb-1.1.12'
> make  all-recursive
> make[2]: Entering directory 
> '/srv/jenkins-slave/workspace/sid-goto-cc-proftmb/proftmb-1.1.12'
> Making all in examples
> make[3]: Entering directory 
> '/srv/jenkins-slave/workspace/sid-goto-cc-proftmb/proftmb-1.1.12/examples'
> make[3]: Nothing to be done for 'all'.
> make[3]: Leaving directory 
> '/srv/jenkins-slave/workspace/sid-goto-cc-proftmb/proftmb-1.1.12/examples'
> Making all in src
> make[3]: Entering directory 
> '/srv/jenkins-slave/workspace/sid-goto-cc-proftmb/proftmb-1.1.12/src'
> Makefile:655: *** missing separator (did you mean TAB instead of 8 spaces?).  
> Stop.
> make[3]: Leaving directory 
> '/srv/jenkins-slave/workspace/sid-goto-cc-proftmb/proftmb-1.1.12/src'
> Makefile:310: recipe for target 'all-recursive' failed
> make[2]: *** [all-recursive] Error 1
> make[2]: Leaving directory 
> '/srv/jenkins-slave/workspace/sid-goto-cc-proftmb/proftmb-1.1.12'
> Makefile:228: recipe for target 'all' failed
> make[1]: *** [all] Error 2

The attached patch seems to do the trick.

Mraw,
KiBi.
diff -Nru proftmb-1.1.12/debian/changelog proftmb-1.1.12/debian/changelog
--- proftmb-1.1.12/debian/changelog	2012-10-08 18:35:07.000000000 +0200
+++ proftmb-1.1.12/debian/changelog	2014-06-02 11:26:06.000000000 +0200
@@ -1,3 +1,10 @@
+proftmb (1.1.12-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Replace 'dnl' with '#' in src/Makefile.{am,in} (Closes: #750165).
+
+ -- Cyril Brulebois <[email protected]>  Mon, 02 Jun 2014 11:25:40 +0200
+
 proftmb (1.1.12-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru proftmb-1.1.12/debian/patches/avoid-dnl-in-makefiles.diff proftmb-1.1.12/debian/patches/avoid-dnl-in-makefiles.diff
--- proftmb-1.1.12/debian/patches/avoid-dnl-in-makefiles.diff	1970-01-01 01:00:00.000000000 +0100
+++ proftmb-1.1.12/debian/patches/avoid-dnl-in-makefiles.diff	2014-06-02 11:27:17.000000000 +0200
@@ -0,0 +1,87 @@
+Description: Avoid 'dnl' in Makefiles.
+Author: Cyril Brulebois <[email protected]>
+Bug-Debian: http://bugs.debian.org/750165
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -46,26 +46,26 @@ TrainSeq.cpp \
+ Viterbi.cpp \
+ Zscore.cpp
+ 
+-dnl bin_PROGRAMS = proftmb composition accvcov hmmdisc hmm hmmstats
+-dnl bin_PROGRAMS = proftmb hmm hmmtrain
+-dnl bin_PROGRAMS = hmm hmmtrain
++# bin_PROGRAMS = proftmb composition accvcov hmmdisc hmm hmmstats
++# bin_PROGRAMS = proftmb hmm hmmtrain
++# bin_PROGRAMS = hmm hmmtrain
+ bin_PROGRAMS = proftmb
+ 
+ proftmb_SOURCES = proftmb.cpp
+-dnl hmmdisc_SOURCES =  hmmdisc.cpp 
+-dnl composition_SOURCES = composition.cpp
+-dnl accvcov_SOURCES = AccvCov.cpp
+-dnl hmm_SOURCES = hmm.cpp
+-dnl hmmtrain_SOURCES = hmmtrain.cpp
+-dnl hmmstats_SOURCES = hmmstats.cpp
++# hmmdisc_SOURCES =  hmmdisc.cpp 
++# composition_SOURCES = composition.cpp
++# accvcov_SOURCES = AccvCov.cpp
++# hmm_SOURCES = hmm.cpp
++# hmmtrain_SOURCES = hmmtrain.cpp
++# hmmstats_SOURCES = hmmstats.cpp
+ 
+ proftmb_DEPENDENCIES = libhmm.a
+-dnl hmmdisc_DEPENDENCIES = libhmm.a
+-dnl composition_DEPENDENCIES = libhmm.a
+-dnl accvcov_DEPENDENCIES = libhmm.a
+-dnl hmm_DEPENDENCIES = libhmm.a
+-dnl hmmtrain_DEPENDENCIES = libhmm.a
+-dnl hmmstats_DEPENDENCIES = libhmm.a
++# hmmdisc_DEPENDENCIES = libhmm.a
++# composition_DEPENDENCIES = libhmm.a
++# accvcov_DEPENDENCIES = libhmm.a
++# hmm_DEPENDENCIES = libhmm.a
++# hmmtrain_DEPENDENCIES = libhmm.a
++# hmmstats_DEPENDENCIES = libhmm.a
+ 
+ proftmb_LDADD = libhmm.a
+ 
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -652,21 +652,21 @@ uninstall-man: uninstall-man1
+ 	uninstall-man1
+ 
+ 
+-dnl bin_PROGRAMS = proftmb composition accvcov hmmdisc hmm hmmstats
+-dnl bin_PROGRAMS = proftmb hmm hmmtrain
+-dnl bin_PROGRAMS = hmm hmmtrain
+-dnl hmmdisc_SOURCES =  hmmdisc.cpp 
+-dnl composition_SOURCES = composition.cpp
+-dnl accvcov_SOURCES = AccvCov.cpp
+-dnl hmm_SOURCES = hmm.cpp
+-dnl hmmtrain_SOURCES = hmmtrain.cpp
+-dnl hmmstats_SOURCES = hmmstats.cpp
+-dnl hmmdisc_DEPENDENCIES = libhmm.a
+-dnl composition_DEPENDENCIES = libhmm.a
+-dnl accvcov_DEPENDENCIES = libhmm.a
+-dnl hmm_DEPENDENCIES = libhmm.a
+-dnl hmmtrain_DEPENDENCIES = libhmm.a
+-dnl hmmstats_DEPENDENCIES = libhmm.a
++# bin_PROGRAMS = proftmb composition accvcov hmmdisc hmm hmmstats
++# bin_PROGRAMS = proftmb hmm hmmtrain
++# bin_PROGRAMS = hmm hmmtrain
++# hmmdisc_SOURCES =  hmmdisc.cpp 
++# composition_SOURCES = composition.cpp
++# accvcov_SOURCES = AccvCov.cpp
++# hmm_SOURCES = hmm.cpp
++# hmmtrain_SOURCES = hmmtrain.cpp
++# hmmstats_SOURCES = hmmstats.cpp
++# hmmdisc_DEPENDENCIES = libhmm.a
++# composition_DEPENDENCIES = libhmm.a
++# accvcov_DEPENDENCIES = libhmm.a
++# hmm_DEPENDENCIES = libhmm.a
++# hmmtrain_DEPENDENCIES = libhmm.a
++# hmmstats_DEPENDENCIES = libhmm.a
+ 
+ proftmb_example.txt: proftmb_example.txt.raw
+ 	sed -e 's|__pkgdatadir__|$(pkgdatadir)|g;s|__datadir__|$(datadir)|g;s|__PACKAGE__|$(PACKAGE)|g;' < $< > $@
diff -Nru proftmb-1.1.12/debian/patches/series proftmb-1.1.12/debian/patches/series
--- proftmb-1.1.12/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ proftmb-1.1.12/debian/patches/series	2014-06-02 11:28:17.000000000 +0200
@@ -0,0 +1 @@
+avoid-dnl-in-makefiles.diff

Attachment: signature.asc
Description: Digital signature

Reply via email to