[med-svn] [Git][med-team/stacks][master] 4 commits: d/control: explicitly build-depend on automake.

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / stacks


Commits:
9480ef56 by Étienne Mollier at 2025-02-16T10:47:12+01:00
d/control: explicitly build-depend on automake.

- - - - -
c3432000 by Étienne Mollier at 2025-02-16T10:47:32+01:00
d/rules: reinforce the fetch the TAP driver for any automake version.

Unfortunately this change is not sufficient to put upstream's super
secret test suite on tracks, so it is still disabled for the moment.

Closes: #1095396

- - - - -
82d2b234 by Étienne Mollier at 2025-02-16T10:53:56+01:00
use_debian_packaged_htslib.patch: normalise Last-Update timestamp.

- - - - -
c29a3700 by Étienne Mollier at 2025-02-16T10:54:42+01:00
d/changelog: ready for upload to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/use_debian_packaged_htslib.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,20 @@
-stacks (2.68+dfsg-2) UNRELEASED; urgency=medium
+stacks (2.68+dfsg-2) unstable; urgency=medium
 
+  * Team upload.
+
+  [ Andreas Tille ]
   * Remove Tim Booth <tbooth at ceh.ac.uk> since address is bouncing
     (Thank you for your work on this package, Tim)
 
- -- Andreas Tille <tille at debian.org>  Mon, 16 Sep 2024 12:49:01 +0200
+  [ Étienne Mollier ]
+  * d/control: explicitly build-depend on automake.
+  * d/rules: reinforce the fetch the TAP driver for any automake version.
+    Unfortunately this change is not sufficient to put upstream's super
+    secret test suite on tracks, so it is still disabled for the moment.
+    (Closes: #1095396)
+  * use_debian_packaged_htslib.patch: normalise Last-Update timestamp.
+
+ -- Étienne Mollier <emollier at debian.org>  Sun, 16 Feb 2025 10:54:31 +0100
 
 stacks (2.68+dfsg-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -4,6 +4,7 @@ Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
+               automake,
                zlib1g-dev,
                libbam-dev,
                libsparsehash-dev,


=====================================
debian/patches/use_debian_packaged_htslib.patch
=====================================
@@ -1,6 +1,6 @@
 Description: Use Debian packaged version of htslib
 Author: Andreas Tille <tille at debian.org>
-Last-Update: Sun, 18 Feb 2018 17:00:11 +0100
+Last-Update: 2018-02-18
 
 --- a/Makefile.am
 +++ b/Makefile.am


=====================================
debian/rules
=====================================
@@ -38,12 +38,14 @@ override_dh_link:
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	if [ -e /usr/share/automake-1.16/tap-driver.sh ] ; then \
-	    ln -s /usr/share/automake-1.16/tap-driver.sh tests/tap-driver.sh ; \
-	else \
-	    echo "Make sure /usr/share/automake-*/tap-driver.sh exists and is linked" ; \
-	    false ; \
-	fi
+	set -e \
+	; TAP_DRIVER=$$( ls -d1 /usr/share/automake-*/tap-driver.sh \
+	                 | tail -n-1 ) \
+	; if [ -e "$$TAP_DRIVER" ] \
+	; then ln -s "$$TAP_DRIVER" tests/tap-driver.sh \
+	; else echo "Make sure /usr/share/automake-*/tap-driver.sh exists and is linked" \
+	;      false \
+	; fi
 	# dh_auto_test
 	rm tests/tap-driver.sh
 	# FIXME: Does not work even after this trick.  See



View it on GitLab: https://salsa.debian.org/med-team/stacks/-/compare/c3fe4c79256c86b791be8cc175d74985592cb3b6...c29a37004598386d9f997a31566921da9e8eef3d

-- 
View it on GitLab: https://salsa.debian.org/med-team/stacks/-/compare/c3fe4c79256c86b791be8cc175d74985592cb3b6...c29a37004598386d9f997a31566921da9e8eef3d
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/20250216/cdf4cdeb/attachment-0001.htm>