[med-svn] [Git][med-team/kraken2][master] Adapt from kraken to kraken2

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / kraken2


Commits:
27b63b35 by Andreas Tille at 2019-03-14T08:54:00Z
Adapt from kraken to kraken2

- - - - -


4 changed files:

- debian/dirs
- + debian/patches/fix_install.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/dirs
=====================================
@@ -1,2 +1,2 @@
 usr/bin
-usr/lib/kraken
+usr/lib/kraken2


=====================================
debian/patches/fix_install.patch
=====================================
@@ -0,0 +1,16 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 13 Mar 2019 15:46:40 +0100
+Description: The temporary dir where to move the files for packaging is
+ different from the final location.  Hardcode the final location here.
+
+--- a/install_kraken2.sh
++++ b/install_kraken2.sh
+@@ -31,7 +31,7 @@ for file in scripts/*
+ do
+   perl -pl -e 'BEGIN { while (@ARGV) { $_ = shift; ($k,$v) = split /=/, $_, 2; $H{$k} = $v } }'\
+            -e 's/#####=(\w+)=#####/$H{$1}/g' \
+-           "KRAKEN2_DIR=$KRAKEN2_DIR" "VERSION=$VERSION" \
++           "KRAKEN2_DIR=/usr/lib/kraken2" "VERSION=$VERSION" \
+            < "$file" > "$KRAKEN2_DIR/$(basename $file)"
+   if [ -x "$file" ]
+   then


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+fix_install.patch


=====================================
debian/rules
=====================================
@@ -2,24 +2,25 @@
 
 # DH_VERBOSE := 1
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
 include /usr/share/dpkg/default.mk
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export KRAKEN2_DIR=$(CURDIR)/debian/$(DEB_SOURCE)/usr/lib/$(DEB_SOURCE)
+
 %:
 	dh $@  --sourcedirectory=src
 
 override_dh_link:
 	dh_link
-	for file in $(CURDIR)/debian/$(DEB_SOURCE)/usr/lib/$(DEB_SOURCE)/kraken* ; do \
+	for file in $(KRAKEN2_DIR)/* ; do \
 	    if ! echo $${file} | grep -q '\.pm$$' ; then \
 		ln -s ../lib/$(DEB_SOURCE)/`basename $${file}` $(CURDIR)/debian/$(DEB_SOURCE)/usr/bin/`basename $${file}` ; \
 	    fi \
 	done
 
 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)
+	dh_auto_install -- KRAKEN2_DIR=$(KRAKEN2_DIR)
+	./install_kraken2.sh $(KRAKEN2_DIR)
 
 override_dh_install:
 	dh_install



View it on GitLab: https://salsa.debian.org/med-team/kraken2/commit/27b63b3565c65ff17fd5d0c257394afd10c51421

-- 
View it on GitLab: https://salsa.debian.org/med-team/kraken2/commit/27b63b3565c65ff17fd5d0c257394afd10c51421
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/20190314/e94076b2/attachment-0001.html>