[med-svn] [Git][med-team/libucsc][master] Leave htslib in for the moment since upstream sticks to version 1.3

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libucsc


Commits:
6eba386e by Andreas Tille at 2018-12-05T08:52:34Z
Leave htslib in for the moment since upstream sticks to version 1.3

- - - - -


4 changed files:

- debian/changelog
- debian/copyright
- debian/patches/series
- debian/patches/use_debian_packaged_htslib.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-libucsc (0.0+git20180518.91029f67+dfsg-1) UNRELEASED; urgency=medium
+libucsc (0.0+git20180904.0e87e322+dfsg-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #xxxxxx)
   Does not build due to usage of htslib 1.3:


=====================================
debian/copyright
=====================================
@@ -17,7 +17,8 @@ Files-Excluded:
     src/d*
     src/f*
     src/g*
-    src/h*
+    src/hca
+    src/hg
     src/idbQuery
     src/index
     src/intronerator


=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-use_debian_packaged_htslib.patch
+# use_debian_packaged_htslib.patch


=====================================
debian/patches/use_debian_packaged_htslib.patch
=====================================
@@ -1,6 +1,7 @@
 Author: Andreas Tille <tille at debian.org>
 Last-Update: Sat, 19 May 2018 13:59:04 +0200
 Description: Use Debian packaged htslib
+ This patch is deactivated since upstream sticks to version 1.3
 
 --- a/src/inc/bamFile.h
 +++ b/src/inc/bamFile.h
@@ -31,7 +32,7 @@ Description: Use Debian packaged htslib
 -L += $(kentSrc)/htslib/libhts.a
 +L += -lhts
  
- L+=${PNGLIB} ${ZLIB} ${MLIB}
+ L+=${PNGLIB} ${MLIB} ${ZLIB}
  HG_INC+=${PNGINCL}
 --- a/src/lib/knetUdc.c
 +++ b/src/lib/knetUdc.c



View it on GitLab: https://salsa.debian.org/med-team/libucsc/commit/6eba386e173fc491d5d8c113017c8dc1ee8037ff

-- 
View it on GitLab: https://salsa.debian.org/med-team/libucsc/commit/6eba386e173fc491d5d8c113017c8dc1ee8037ff
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/20181205/9d47063f/attachment-0001.html>