[med-svn] [Git][med-team/ncbi-vdb][master] 4 commits: Start ncbi-vdb 2.10.6+dfsg-5 changelog entry for more fixups.

[Aaron M. Ucko]

Aaron M. Ucko pushed to branch master at Debian Med / ncbi-vdb


Commits:
55abd166 by Aaron M. Ucko at 2020-05-26T10:25:17-04:00
Start ncbi-vdb 2.10.6+dfsg-5 changelog entry for more fixups.

- - - - -
aa5461fd by Aaron M. Ucko at 2020-05-26T10:27:48-04:00
Avoid gratuitous rebuild altogether by overriding dh_prep.

Comment out fix_parallel_build.patch (evidently insufficient) in favor
of overriding dh_prep to spare(!) debian/tmp.

- - - - -
606c3c01 by Aaron M. Ucko at 2020-05-26T10:31:31-04:00
optionally_reinstate_default_schema.patch: Fix for GCC 10.

Use plain extern rather than SRA_EXTERN to avoid likely multiple
definitions under GCC 10.

- - - - -
ff589673 by Aaron M. Ucko at 2020-05-26T10:32:22-04:00
Finalize ncbi-vdb 2.10.6+dfsg-5 for unstable.

- - - - -


4 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+ncbi-vdb (2.10.6+dfsg-5) unstable; urgency=medium
+
+  * Comment out fix_parallel_build.patch (evidently insufficient) in favor
+    of overriding dh_prep to spare(!) debian/tmp.
+  * optionally_reinstate_default_schema.patch: Use plain extern rather
+    than SRA_EXTERN to avoid likely multiple definitions under GCC 10.
+    
+ -- Aaron M. Ucko <ucko at debian.org>  Tue, 26 May 2020 10:32:22 -0400
+
 ncbi-vdb (2.10.6+dfsg-4) unstable; urgency=medium
 
   * debian/patches/fix_parallel_build.patch (new): Use unique temporary


=====================================
debian/patches/optionally_reinstate_default_schema.patch
=====================================
@@ -26,7 +26,7 @@
   */
  SRA_EXTERN rc_t CC SRAMgrMakeSRASchema ( struct SRAMgr const *self, struct VSchema **schema );
  SRA_EXTERN rc_t CC VDBManagerMakeSRASchema ( struct VDBManager const *self, struct VSchema **schema );
-+SRA_EXTERN bool SRAUseLegacyDefaultSchema;
++extern bool SRAUseLegacyDefaultSchema;
  
  
  #ifdef __cplusplus


=====================================
debian/patches/series
=====================================
@@ -14,4 +14,4 @@ i386-uint64_msbit.patch
 fix_path_mbedtls.patch
 redefine_CALL_MBEDTLS.patch
 optionally_reinstate_default_schema.patch
-fix_parallel_build.patch
+# fix_parallel_build.patch


=====================================
debian/rules
=====================================
@@ -65,6 +65,9 @@ else
 	echo "Skip testing which takes a long time"
 endif
 
+override_dh_prep:
+	dh_prep -Xdebian/tmp
+
 override_dh_auto_install:
 	dh_auto_install
 	find $(LIBINSTALLDIR) -name "*-static.a" -delete



View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/-/compare/d83e5eb9bc4c6207ec9058f6e451f58a8855631e...ff5896739e2acba4c03dd6f0985af799271872ee

-- 
View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/-/compare/d83e5eb9bc4c6207ec9058f6e451f58a8855631e...ff5896739e2acba4c03dd6f0985af799271872ee
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/20200526/6ca8fa12/attachment-0001.html>