[med-svn] [Git][med-team/htslib][master] No need to patch when using proper configure options

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / htslib


Commits:
e0852e39 by Andreas Tille at 2020-10-07T15:07:57+02:00
No need to patch when using proper configure options

- - - - -


4 changed files:

- debian/changelog
- debian/patches/plugins_to_lib.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+htslib (1.11-3) UNRELEASED; urgency=medium
+
+  * No need to patch when using proper configure options
+
+ -- Andreas Tille <tille at debian.org>  Wed, 07 Oct 2020 15:06:33 +0200
+
 htslib (1.11-2) unstable; urgency=medium
 
   * Enable plugins


=====================================
debian/patches/plugins_to_lib.patch
=====================================
@@ -1,6 +1,9 @@
 Author: Andreas Tille <tille at debian.org>
 Last-Update: Fri, 02 Oct 2020 11:35:21 +0200
 Description: Debian has no libexecdir - plugins should go to libdir
+FIXME: Deactivated since
+       --with-plugin-dir='$(libdir)/htslib' --with-plugin-path='/usr/local/lib/htslib:/usr/local/libexec/htslib:$(plugindir)'
+       should be sufficient
 
 --- a/configure.ac
 +++ b/configure.ac


=====================================
debian/patches/series
=====================================
@@ -6,4 +6,4 @@ fix_float_precision
 # big-endian
 cram_to_bam_export.patch
 273c5e76a1694aa2a13fd51c133abed2ef8ab4d3.patch
-plugins_to_lib.patch
+# plugins_to_lib.patch - can probably be removed


=====================================
debian/rules
=====================================
@@ -26,7 +26,7 @@ endif
 	cp -a test test_backup
 	# to help with cross building, otherwise MMAP might get turned off
 	export ac_cv_func_mmap_fixed_mapped=yes && autoconf && \
-	dh_auto_configure -- --enable-libcurl --enable-gcs --enable-s3 --enable-plugins --with-plugin-path='/usr/local/lib/htslib:$(plugindir)'
+	dh_auto_configure -- --enable-libcurl --enable-gcs --enable-s3 --enable-plugins --with-plugin-dir='$(libdir)/htslib' --with-plugin-path='/usr/local/lib/htslib:/usr/local/libexec/htslib:$(plugindir)'
 
 override_dh_auto_build-arch:
 	dh_auto_build -- \



View it on GitLab: https://salsa.debian.org/med-team/htslib/-/commit/e0852e39624770d98de33e869dbbc3c52ff08bd9

-- 
View it on GitLab: https://salsa.debian.org/med-team/htslib/-/commit/e0852e39624770d98de33e869dbbc3c52ff08bd9
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/20201007/f786e58a/attachment-0001.html>