debian/.gitignore

@@ -7,6 +7,7 @@ libncbi6
 libvibrant6b
 lib*-dbg
 lib*-dev
+ncbi-cn3d
 ncbi-data
 ncbi-rrna-data
 ncbi-tools-bin

debian/changelog

+ncbi-tools6 (6.1.20170106+dfsg1-5) experimental; urgency=medium
+
+  * Split Cn3D(-3.0) out into a new ncbi-cn3d binary package; update
+    debian/upstream/metadata accordingly.  (Originally done in
+    6.1.20170106-7, but reverted in 6.1.20170106+dfsg1-1 to avoid holding
+    up DFSG fixes.)
+  * Give ncbi-cn3d a binary-specific version, missed earlier.
+  * Upload to experimental to clear NEW.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Sat, 07 Sep 2019 22:07:41 -0400
+
 ncbi-tools6 (6.1.20170106+dfsg1-4) unstable; urgency=medium
 
   * debian/NEWS: Rename from ncbi-data.NEWS to work around apt-listchanges

debian/control

@@ -82,6 +82,7 @@ Depends: libncbi6 (<< ${source:Upstream-Version}.1),
          ${shlibs:Depends}
 Suggests: libvibrant6b,
           ncbi-blast+,
+          ncbi-cn3d,
           ncbi-tools-x11
 Breaks: blast2 (<< 1:2.2.26.20160908)
 Replaces: blast2 (<< 1:2.2.26.20160908)
@@ -101,14 +102,33 @@ Depends: libncbi6 (<< ${source:Upstream-Version}.1),
          libncbi6 (>= ${source:Upstream-Version}),
          libvibrant6b (<< ${source:Upstream-Version}.1),
          libvibrant6b (>= ${source:Upstream-Version}),
+         ncbi-cn3d,
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: ncbi-tools-bin
 Description: NCBI libraries for biology applications (X-based utilities)
  This package includes some X-based utilities distributed with the
- NCBI C SDK: Cn3D, Network Entrez, Sequin, ddv, and udv.  These
- programs are not part of ncbi-tools-bin because they depend on
- several additional library packages.
+ NCBI C SDK: Network Entrez, Sequin, ddv, and udv.  These programs
+ are not part of ncbi-tools-bin because they depend on several
+ additional library packages.
+
+Package: ncbi-cn3d
+Architecture: any
+Multi-Arch: foreign
+Section: science
+Depends: libncbi6 (<< ${source:Upstream-Version}.1),
+         libncbi6 (>= ${source:Upstream-Version}),
+         libvibrant6b (<< ${source:Upstream-Version}.1),
+         libvibrant6b (>= ${source:Upstream-Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Suggests: ncbi-tools-bin,
+           ncbi-tools-x11
+Breaks: ncbi-tools-x11 (<< 6.1.20170106-7~)
+Replaces: ncbi-tools-x11 (<< 6.1.20170106-7~)
+Description: 3-dimensional viewer for biological molecules
+ Cn3D is a helper application for your web browser that allows you to
+ view 3-dimensional structures from NCBI's Entrez retrieval service.
 
 Package: libvibrant6b
 Architecture: any

debian/ncbi-cn3d.install

+usr/bin/Cn3D-3.0

debian/ncbi-tools-x11.install

-usr/bin/Cn3D-3.0
 usr/bin/Psequin
 usr/bin/ddv
 usr/bin/entrez2

debian/rules

@@ -8,8 +8,14 @@ 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=%)
 
+export CN3D_VERSION=$(shell sed -ne 's/.*Version \([1-9][0-9.]*\).*/\1/p' \
+                      cn3d/cn3dwin.c | head -n1)
+export CN3D_VERSION_DATED=$(CN3D_VERSION).$(NCBI_VERSION_DATE)
+export CN3D_VERSION_FULL=$(CN3D_VERSION_DATED)-$(NCBI_VERSION_DEBREL)
+
 testversions:
 	env | fgrep NCBI_VERSION
+	env | fgrep CN3D_VERSION
 
 # Set these here, rather than using the csh hackage that passes for an
 # upstream build system.  Mostly taken from ../platform/{ppc,}linux.ncbi.mk.
@@ -187,6 +193,7 @@ override_dh_installchangelogs:
 
 override_dh_installmenu-arch:
 	chmod +x debian/makemenu
+	debian/makemenu debian/ncbi-cn3d.install
 	debian/makemenu debian/ncbi-tools-x11.install
 #	debian/makemenu -v debian/ncbi-tools-bin.install
 	dh_installmenu
@@ -206,6 +213,7 @@ override_dh_installman:
 	dh_link # otherwise runs too late to influence debian/installman
 	chmod +x debian/installman
 ifneq "" "$(filter ncbi-tools-bin, $(shell dh_listpackages))"
+	debian/installman ncbi-cn3d
 	debian/installman ncbi-tools-bin
 	debian/installman ncbi-tools-x11
 endif
@@ -217,6 +225,10 @@ endif
 override_dh_makeshlibs-arch:
 	dh_makeshlibs -V
 
+override_dh_gencontrol-arch:
+	dh_gencontrol  -pncbi-cn3d -- -v$(CN3D_VERSION_FULL)
+	dh_gencontrol  -Nncbi-cn3d
+
 override_dh_builddeb:
 	dh_builddeb -pncbi-rrna-data -- -Zxz -z7 -Sextreme
 	dh_builddeb -Nncbi-rrna-data

debian/upstream/metadata

@@ -13,14 +13,14 @@ Reference:
    PMID: 10838572
    URL: https://linkinghub.elsevier.com/retrieve/pii/S0968-0004(00)01561-9
    DOI: 10.1016/S0968-0004(00)01561-9
-   Debian-package: ncbi-tools-x11
+   Debian-package: ncbi-cn3d
 Registry:
  - Name: OMICtools
    Entry:  OMICS_05052
-   Debian-package: ncbi-tools-x11
+   Debian-package: ncbi-cn3d
  - Name: bio.tools
    Entry: cn3d
-   Debian-package: ncbi-tools-x11
+   Debian-package: ncbi-cn3d
  - Name: SciCrunch
    Entry: SCR_004861
-   Debian-package: ncbi-tools-x11
+   Debian-package: ncbi-cn3d