[med-svn] [Git][med-team/kraken][master] 5 commits: Point Vcs fields to salsa.debian.org

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / kraken


Commits:
556316d3 by Andreas Tille at 2019-01-07T12:06:08Z
Point Vcs fields to salsa.debian.org

- - - - -
280fe4d4 by Andreas Tille at 2019-01-07T12:06:08Z
Standards-Version: 4.3.0

- - - - -
863875d3 by Andreas Tille at 2019-01-07T12:12:07Z
Fix Perl interpreter path

- - - - -
4146dec3 by Andreas Tille at 2019-01-07T12:15:26Z
propagate build options

- - - - -
f0e9bb63 by Andreas Tille at 2019-01-07T12:17:21Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/hardening.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,16 @@
-kraken (1.1-3) UNRELEASED; urgency=medium
+kraken (1.1-3) unstable; urgency=medium
 
+  [ Jelmer Vernooij ]
   * Trim trailing whitespace.
   * Use secure copyright file specification URI.
 
- -- Jelmer Vernooij <jelmer at debian.org>  Wed, 24 Oct 2018 21:58:35 +0000
+  [ Andreas Tille ]
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.3.0
+  * Fix Perl interpreter path
+  * propagate build options
+
+ -- Andreas Tille <tille at debian.org>  Mon, 07 Jan 2019 13:15:32 +0100
 
 kraken (1.1-2) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -5,9 +5,9 @@ Section: science
 Priority: optional
 Build-Depends: debhelper (>= 11~),
                jellyfish1
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/kraken.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/kraken.git
+Standards-Version: 4.3.0
+Vcs-Browser: https://salsa.debian.org/med-team/kraken
+Vcs-Git: https://salsa.debian.org/med-team/kraken.git
 Homepage: http://ccb.jhu.edu/software/kraken/
 
 Package: kraken


=====================================
debian/patches/hardening.patch
=====================================
@@ -0,0 +1,13 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 07 Jan 2019 13:14:41 +0100
+Description: propagate build options
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,5 +1,5 @@
+ CXX = g++
+-CXXFLAGS = -Wall -fopenmp -O3
++CXXFLAGS += -Wall -fopenmp -O3
+ PROGS = db_sort set_lcas classify make_seqid_to_taxid_map db_shrink kmer_estimator
+ 
+ .PHONY: all install clean


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 use_jellyfish1.patch
 kraken_tmp_dir.patch
 fix_reading_fasta.patch
+hardening.patch


=====================================
debian/rules
=====================================
@@ -20,3 +20,9 @@ override_dh_link:
 override_dh_auto_install:
 	dh_auto_install -- KRAKEN_DIR=$(CURDIR)/debian/$(DEB_SOURCE)/usr/lib/$(DEB_SOURCE)
 	./install_kraken.sh /usr/lib/$(DEB_SOURCE) $(DEB_SOURCE)
+
+override_dh_install:
+	dh_install
+	for pl in `grep -Rl '#![[:space:]]*/usr/bin/env[[:space:]]\+perl' debian/*/usr/*` ; do \
+	    sed -i '1s?^#![[:space:]]*/usr/bin/env[[:space:]]\+perl?#!/usr/bin/perl?' $${pl} ; \
+	done



View it on GitLab: https://salsa.debian.org/med-team/kraken/compare/1a4a832b8e7add54b28f8e3ff6d24cc2d58e6e9c...f0e9bb633f414e07079591e9d3a633e047a3e1cd

-- 
View it on GitLab: https://salsa.debian.org/med-team/kraken/compare/1a4a832b8e7add54b28f8e3ff6d24cc2d58e6e9c...f0e9bb633f414e07079591e9d3a633e047a3e1cd
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/20190107/e110038f/attachment-0001.html>