[med-svn] [Git][med-team/tophat][master] 5 commits: Fix Makefile.am

Andreas Tille gitlab at salsa.debian.org
Sat Aug 18 08:26:51 BST 2018 

Andreas Tille pushed to branch master at Debian Med / tophat


Commits:
e4885b3b by Andreas Tille at 2018-08-18T06:46:19Z
Fix Makefile.am

- - - - -
e29e810d by Andreas Tille at 2018-08-18T06:46:41Z
debhelper 11

- - - - -
020b9edb by Andreas Tille at 2018-08-18T06:46:46Z
Point Vcs fields to salsa.debian.org

- - - - -
8389cc03 by Andreas Tille at 2018-08-18T06:46:46Z
Standards-Version: 4.2.0

- - - - -
e79b5366 by Andreas Tille at 2018-08-18T07:15:29Z
Really fix Makefile.am

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/patches/fix_makefile.am.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tophat (2.1.1+dfsg1-2) UNRELEASED; urgency=medium
+
+  * Fix Makefile.am
+    Closes: #906510
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.2.0
+
+ -- Andreas Tille <tille at debian.org>  Sat, 18 Aug 2018 08:44:34 +0200
+
 tophat (2.1.1+dfsg1-1) unstable; urgency=medium
 
   * Team upload


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Carlos Borroto <carlos.borroto at gmail.com>,
            Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
                libbam-dev,
                zlib1g-dev,
                python,
@@ -14,9 +14,9 @@ Build-Depends: debhelper (>= 10),
                libboost-thread-dev,
                help2man,
                bowtie
-Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/tophat.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/tophat.git
+Standards-Version: 4.2.0
+Vcs-Browser: https://salsa.debian.org/med-team/tophat
+Vcs-Git: https://salsa.debian.org/med-team/tophat.git
 Homepage: http://ccb.jhu.edu/software/tophat
 
 Package: tophat


=====================================
debian/patches/fix_makefile.am.patch
=====================================
--- /dev/null
+++ b/debian/patches/fix_makefile.am.patch
@@ -0,0 +1,69 @@
+Description: Fix Makefile.am
+Bug-Debian: https://bugs.debian.org/906510
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sat, 18 Aug 2018 08:44:34 +0200
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -707,31 +707,31 @@ libgc_a_SOURCES = \
+ #-- program sources
+ 
+ prep_reads_SOURCES = prep_reads.cpp
+-prep_reads_LDADD = $(top_builddir)/src/libtophat.a $(BAM_LIB)
++prep_reads_LDADD = libtophat.a $(BAM_LIB)
+ prep_reads_LDFLAGS = $(LDFLAGS) 
+ 
+ segment_juncs_SOURCES = segment_juncs.cpp
+-segment_juncs_LDADD = $(top_builddir)/src/libtophat.a $(BOOST_THREAD_LIBS) $(BOOST_SYSTEM_LIB) $(BAM_LIB)
++segment_juncs_LDADD = libtophat.a $(BOOST_THREAD_LIBS) $(BOOST_SYSTEM_LIB) $(BAM_LIB)
+ segment_juncs_LDFLAGS = $(LDFLAGS) $(BOOST_LDFLAGS)
+ 
+ long_spanning_reads_SOURCES = long_spanning_reads.cpp
+-long_spanning_reads_LDADD = $(top_builddir)/src/libtophat.a $(BOOST_THREAD_LIBS) $(BOOST_SYSTEM_LIB) $(BAM_LIB)
++long_spanning_reads_LDADD = libtophat.a $(BOOST_THREAD_LIBS) $(BOOST_SYSTEM_LIB) $(BAM_LIB)
+ long_spanning_reads_LDFLAGS = $(LDFLAGS) $(BOOST_LDFLAGS)
+ 
+ gtf_juncs_SOURCES = gtf_juncs.cpp
+-gtf_juncs_LDADD = $(top_builddir)/src/libtophat.a libgc.a $(BAM_LIB)
++gtf_juncs_LDADD = libtophat.a libgc.a $(BAM_LIB)
+ gtf_juncs_LDFLAGS = $(LDFLAGS)
+ 
+ juncs_db_SOURCES = juncs_db.cpp
+-juncs_db_LDADD = $(top_builddir)/src/libtophat.a $(BAM_LIB)
++juncs_db_LDADD = libtophat.a $(BAM_LIB)
+ juncs_db_LDFLAGS = $(LDFLAGS)
+ 
+ tophat_reports_SOURCES = tophat_reports.cpp
+-tophat_reports_LDADD = $(top_builddir)/src/libtophat.a  $(BOOST_THREAD_LIBS) $(BOOST_SYSTEM_LIB) $(BAM_LIB)
++tophat_reports_LDADD = libtophat.a  $(BOOST_THREAD_LIBS) $(BOOST_SYSTEM_LIB) $(BAM_LIB)
+ tophat_reports_LDFLAGS = $(LDFLAGS) $(BOOST_LDFLAGS)
+ 
+ fix_map_ordering_SOURCES = fix_map_ordering.cpp
+-fix_map_ordering_LDADD = $(top_builddir)/src/libtophat.a $(BAM_LIB)
++fix_map_ordering_LDADD = libtophat.a $(BAM_LIB)
+ fix_map_ordering_LDFLAGS = $(LDFLAGS)
+ 
+ bam2fastx_SOURCES = bam2fastx.cpp
+@@ -739,18 +739,18 @@ bam2fastx_LDADD = $(top_builddir)/src/li
+ bam2fastx_LDFLAGS = $(LDFLAGS)
+ 
+ bam_merge_SOURCES = bam_merge.cpp
+-bam_merge_LDADD = $(top_builddir)/src/libtophat.a $(top_builddir)/src/libgc.a $(BAM_LIB)
++bam_merge_LDADD = libtophat.a $(top_builddir)/src/libgc.a $(BAM_LIB)
+ bam_merge_LDFLAGS = $(LDFLAGS)
+ 
+ sam_juncs_SOURCES = sam_juncs.cpp
+-sam_juncs_LDADD = $(top_builddir)/src/libtophat.a $(BAM_LIB)
++sam_juncs_LDADD = libtophat.a $(BAM_LIB)
+ sam_juncs_LDFLAGS = $(LDFLAGS)
+ 
+ map2gtf_SOURCES = map2gtf.cpp
+-map2gtf_LDADD = $(top_builddir)/src/libtophat.a libgc.a $(BAM_LIB)
++map2gtf_LDADD = libtophat.a libgc.a $(BAM_LIB)
+ map2gtf_LDFLAGS = $(LDFLAGS)
+ 
+ gtf_to_fasta_SOURCES = GTFToFasta.cpp FastaTools.cpp
+-gtf_to_fasta_LDADD = $(top_builddir)/src/libtophat.a libgc.a $(BAM_LIB)
++gtf_to_fasta_LDADD =  libtophat.a libgc.a $(BAM_LIB)
+ gtf_to_fasta_LDFLAGS = $(LDFLAGS)
+ 


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fix_includes_path.patch
 fix-gcc6.patch
 remove-convenience-copy-of-samtools.patch
 fix-compatibility-with-recent-samtools.patch
+fix_makefile.am.patch



View it on GitLab: https://salsa.debian.org/med-team/tophat/compare/65cf360b391beba152797a85d77f10769bbf8999...e79b5366228e5a6c64a0bdbe88fddcc0e5375f23

-- 
View it on GitLab: https://salsa.debian.org/med-team/tophat/compare/65cf360b391beba152797a85d77f10769bbf8999...e79b5366228e5a6c64a0bdbe88fddcc0e5375f23
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180818/30f34a54/attachment-0001.html>

More information about the debian-med-commit mailing list