[med-svn] [Git][med-team/ncbi-tools6][stretch] 4 commits: debian/copyright: Update authors and dates for debian/*.
Aaron M. Ucko
gitlab at salsa.debian.org
Sun Aug 4 03:45:27 BST 2019
Aaron M. Ucko pushed to branch stretch at Debian Med / ncbi-tools6
Commits:
d7eb3a2c by Aaron M. Ucko at 2019-08-04T02:44:50Z
debian/copyright: Update authors and dates for debian/*.
- - - - -
5ef8a34b by Aaron M. Ucko at 2019-08-04T02:44:50Z
debian/{copyright,watch}: Formally update to reflect repackaging.
* debian/copyright: Set Files-Excluded.
* debian/watch: Reflect usage of +dfsg1.
- - - - -
df7572e7 by Aaron M. Ucko at 2019-08-04T02:44:50Z
Omit +dfsg1 suffix from library SONAMEs.
* debian/rules: Introduce NCBI_VERSION_SHLIB, with +dfsg1 stripped off.
* make/makeshlb.unx: NCBI_VERSION -> NCBI_VERSION_SHLIB.
- - - - -
557113ec by Aaron M. Ucko at 2019-08-04T02:44:50Z
Tentatively finalize ncbi-tools6 6.1.20170106+dfsg1-0+deb9u1.
NB: Not uploading immediately; will need release team pre-approval per
Developer's Reference 5.5.1.
- - - - -
5 changed files:
- debian/changelog
- debian/copyright
- debian/rules
- debian/watch
- make/makeshlb.unx
Changes:
=====================================
debian/changelog
=====================================
@@ -1,13 +1,18 @@
-ncbi-tools6 (6.1.20170106+dfsg1-0+deb9u1) UNRELEASED; urgency=medium
+ncbi-tools6 (6.1.20170106+dfsg1-0+deb9u1) stretch; urgency=medium
* Belatedly repackage without data/UniVec.*, some portions of which
turned out to be non-free (with copyright held by Invitrogen
Corporation, which requires a license for commercial use thereof).
- (NOT RELEASED YET.)
- * debian/copyright: Cover previously overlooked third-party code
- (all DFSG-free).
-
- -- Aaron M. Ucko <ucko at debian.org> Sat, 03 Aug 2019 22:07:18 -0400
+ * debian/copyright:
+ - Cover previously overlooked third-party code (all DFSG-free).
+ - Update authors and dates for debian/*.
+ - Set Files-Excluded to reflect repackaging.
+ * debian/rules: Introduce NCBI_VERSION_SHLIB, with +dfsg1 stripped off.
+ * debian/watch: Reflect usage of +dfsg1.
+ * make/makeshlb.unx: NCBI_VERSION -> NCBI_VERSION_SHLIB.
+ * Temporarily revert ncbi-cn3d splitout to expedite the above fixes.
+
+ -- Aaron M. Ucko <ucko at debian.org> Sat, 03 Aug 2019 22:12:51 -0400
ncbi-tools6 (6.1.20170106-2) unstable; urgency=medium
=====================================
debian/copyright
=====================================
@@ -2,6 +2,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Contact: toolbox at ncbi.nlm.nih.gov
Upstream-Name: ncbi
Source: http://ftp.ncbi.nih.gov/toolbox/ncbi_tools/old/
+Files-Excluded: ncbi/data/UniVec.*
Files: *
Copyright: 1996-2017 NCBI
@@ -55,7 +56,8 @@ License: GPL-2+
Files: debian/*
Copyright: 1998-1999 Stephane Bortzmeyer <bortzmeyer at pasteur.fr>
2001 Dr. Guenter Bechly <gbechly at debian.org>
- 2001-2017 Aaron M. Ucko <ucko at debian.org>
+ 2001-2019 Aaron M. Ucko <ucko at debian.org>
+ 2012-2017 Andreas Tille <tille at debian.org>
License: public_domain
License: public_domain
=====================================
debian/rules
=====================================
@@ -6,6 +6,7 @@ export NCBI_VERSION_MAJOR=$(word 1, $(subst ., ,$(NCBI_VERSION)))
export NCBI_VERSION_MINOR=$(NCBI_VERSION:$(NCBI_VERSION_MAJOR).%=%)
export NCBI_VERSION_DATE =$(word 3, $(subst ., ,$(NCBI_VERSION)))
export NCBI_VERSION_DEBREL=$(word 2, $(subst -, ,$(NCBI_VERSION_FULL)))
+export NCBI_VERSION_SHLIB=$(NCBI_VERSION:%+dfsg1=%)
testversions:
env | fgrep NCBI_VERSION
@@ -120,23 +121,23 @@ hi = debian/ncbi-data/usr/share/icons/hicolor
override_dh_auto_install-arch:
install -d $(destlibdir)
- install -m 644 lib/* shlib/*.so.$(NCBI_VERSION) $(destlibdir)
+ install -m 644 lib/* shlib/*.so.$(NCBI_VERSION_SHLIB) $(destlibdir)
for x in ncbiacc ncbiCacc netentr; do \
- rm -f $(destlibdir)/lib$$x.so.$(NCBI_VERSION) && \
+ rm -f $(destlibdir)/lib$$x.so.$(NCBI_VERSION_SHLIB) && \
ln -s libncbiNacc.so.$(NCBI_VERSION_MAJOR) \
$(destlibdir)/lib$$x.so.$(NCBI_VERSION_MAJOR) && \
ln -s libncbiNacc.so $(destlibdir)/lib$$x.so; \
done
for x in ncbicn3d vibrant; do \
- rm -f $(destlibdir)/lib$$x.so.$(NCBI_VERSION) && \
+ rm -f $(destlibdir)/lib$$x.so.$(NCBI_VERSION_SHLIB) && \
ln -s lib$${x}OGL.so.$(NCBI_VERSION_MAJOR) \
$(destlibdir)/lib$$x.so.$(NCBI_VERSION_MAJOR) && \
ln -s lib$${x}OGL.so $(destlibdir)/lib$$x.so; \
done
rm -f $(destlibdir)/libregexp.*
cd $(destlibdir) && \
- for f in *.so.$(NCBI_VERSION); do \
- base=`basename $$f .so.$(NCBI_VERSION)` && \
+ for f in *.so.$(NCBI_VERSION_SHLIB); do \
+ base=`basename $$f .so.$(NCBI_VERSION_SHLIB)` && \
ln -s $$f $$base.so.$(NCBI_VERSION_MAJOR) && \
ln -s $$f $$base.so; \
done
=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
version=4
-opts="passive,uversionmangle=s|^|6.1.|,downloadurlmangle=s/$/ncbi.tar.gz/" \
+opts="passive,uversionmangle=s|^|6.1.|,downloadurlmangle=s/$/ncbi.tar.gz/,dversionmangle=s/\+dfsg1//,repacksuffix=+dfsg1" \
http://ftp.ncbi.nih.gov/toolbox/ncbi_tools/old/ (\d{8}[a-z]*)/
\ No newline at end of file
=====================================
make/makeshlb.unx
=====================================
@@ -20,7 +20,7 @@ SH2 = `lorder *.o | tsort` $(NCBI_OTHERLIBS)
$(SH1) $@ $(SH2)
rm -f *.o __*
-so=so.$(NCBI_VERSION_MAJOR).$(NCBI_VERSION_MINOR)
+so=so.$(NCBI_VERSION_SHLIB)
%.$(so): %.a
$(CC) -shared -Wl,-soname=$*.so.$(NCBI_VERSION_MAJOR) -o $@ \
View it on GitLab: https://salsa.debian.org/med-team/ncbi-tools6/compare/dd5198c2f5d0bfd32d21695f7b54ae3de517321e...557113ece874dea36e46af8158f89463b48b2557
--
View it on GitLab: https://salsa.debian.org/med-team/ncbi-tools6/compare/dd5198c2f5d0bfd32d21695f7b54ae3de517321e...557113ece874dea36e46af8158f89463b48b2557
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/20190804/5d30a82e/attachment-0001.html>
More information about the debian-med-commit
mailing list