[med-svn] [Git][med-team/sambamba][master] 3 commits: add zlib dependency in meson build

[Étienne Mollier]

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


Commits:
eccca542 by Étienne Mollier at 2020-11-10T21:06:22+01:00
add zlib dependency in meson build

- - - - -
f8880950 by Étienne Mollier at 2020-11-10T21:23:58+01:00
addapt libcurl-dev dependency

This is added per lintian warning to have consistent build environment.
Will default to libcurl4-gnutls-dev, which is one of the packages
providing libcurl-dev.

- - - - -
2ad5aba1 by Étienne Mollier at 2020-11-10T23:03:50+01:00
d/changelog: update to reflect changes

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/01_add-meson-build.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,17 @@
 sambamba (0.7.1-5) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * Respect DEB_BUILD_OPTIONS in override_dh_auto_test target (routine-
     update)
   * Remove trailing whitespace in debian/changelog (routine-update)
   * Add salsa-ci file (routine-update)
   * Set upstream metadata fields: Bug-Database, Bug-Submit.
 
+  [ Étienne Mollier ]
+  * Define zlib dependency in meson.build.  (Closes: #966914)
+  * Default to libcurl4-gnutls-dev as libcurl-dev dependency.  (Fixes
+    lintian virtual-package-depends-without-real-package-depends)
+
  -- Andreas Tille <tille at debian.org>  Mon, 03 Aug 2020 13:40:40 +0200
 
 sambamba (0.7.1-4) unstable; urgency=medium


=====================================
debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends: debhelper-compat (= 13),
                zlib1g-dev,
 # used by libhts and explicitly referenced in build instruction
                liblz4-dev,
-               libcurl-dev,
+               libcurl4-gnutls-dev | libcurl-dev,
                libssl-dev,
                libbz2-dev,
                libdeflate-dev,


=====================================
debian/patches/01_add-meson-build.patch
=====================================
@@ -11,11 +11,9 @@ Subject: [PATCH] Add Meson build definition
  create mode 100644 meson.build
  create mode 100644 meson_options.txt
 
-Index: sambamba/.gitignore
-===================================================================
 --- sambamba.orig/.gitignore
 +++ sambamba/.gitignore
-@@ -16,6 +16,7 @@ shunit*
+@@ -16,6 +16,7 @@
  /*.cram
  /*.crai
  /*.txt
@@ -23,11 +21,9 @@ Index: sambamba/.gitignore
  *.hex
  *.zcat
  *.out
-Index: sambamba/meson.build
-===================================================================
 --- /dev/null
 +++ sambamba/meson.build
-@@ -0,0 +1,154 @@
+@@ -0,0 +1,156 @@
 +# This file was created manually. It is provided as a patch in debian/patches.
 +# Please consider using the quilt patch system.
 +
@@ -123,6 +119,7 @@ Index: sambamba/meson.build
 +#
 +biod_dep   = dependency('biod', version: '>=0.1.0', static: true)
 +htslib_dep = dependency('htslib', version: '>=1.3.2', static: true)
++zlib_dep   = dependency('zlib', static: false)
 +lz4_dep    = dependency('liblz4', static: false)
 +curl_dep    = dependency('libcurl', static: false)
 +#deflate_dep    = dependency('libdeflate', static: false)
@@ -159,6 +156,7 @@ Index: sambamba/meson.build
 +     version_info_d_fname],
 +    dependencies: [biod_dep,
 +                   htslib_dep,
++                   zlib_dep,
 +#                   deflate_dep,
 +                   lz4_dep,
 +#                   bz2_dep,
@@ -182,8 +180,6 @@ Index: sambamba/meson.build
 +#
 +install_man(manpages)
 +install_data(['etc/bash_completion.d/sambamba'], install_dir: '/usr/share/bash-completion/completions')
-Index: sambamba/meson_options.txt
-===================================================================
 --- /dev/null
 +++ sambamba/meson_options.txt
 @@ -0,0 +1 @@



View it on GitLab: https://salsa.debian.org/med-team/sambamba/-/compare/ea75b6e690dd811c0335a7f9881cce91abeda1d2...2ad5aba1aeecab98ffc736533789990e4daac3d5

-- 
View it on GitLab: https://salsa.debian.org/med-team/sambamba/-/compare/ea75b6e690dd811c0335a7f9881cce91abeda1d2...2ad5aba1aeecab98ffc736533789990e4daac3d5
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/20201110/603ccb23/attachment-0001.html>