Move asntool and errhdr to ncbi-tools-bin. (Closes: #646970.)

* debian/{libncbi6-dev,ncbi-tools-bin}.install: move /usr/bin/asntool
  and /usr/bin/errhdr from libncbi6-dev to ncbi-tools-bin so that the
  former can properly be Multi-Arch: same.  (Closes: #646970.)
* debian/libncbi6-dev.NEWS.debian: note the above move.
* debian/control: adjust descriptions and relationships accordingly.
* debian/{libncbi6-dev,ncbi-tools-bin}.lintian-overrides: update accordingly.
* debian/rules:
  - Don't try to give libncbi6-dev manpages or menu entries.

8 files changed, 31 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 664a86de..ba0950ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
 ncbi-tools6 (6.1.20110713-3) UNRELEASED; urgency=low
 
   * NOT RELEASED YET.
-
- -- Aaron M. Ucko <ucko@debian.org>  Sat, 29 Oct 2011 19:18:49 -0400
+  * debian/{libncbi6-dev,ncbi-tools-bin}.install: move /usr/bin/asntool
+    and /usr/bin/errhdr from libncbi6-dev to ncbi-tools-bin so that the
+    former can properly be Multi-Arch: same.  (Closes: #646970.)
+  * debian/libncbi6-dev.NEWS.debian: note the above move.
+  * debian/control: adjust descriptions and relationships accordingly.
+  * debian/{libncbi6-dev,ncbi-tools-bin}.lintian-overrides: update accordingly.
+  * debian/rules:
+    - Don't try to give libncbi6-dev manpages or menu entries.
+  
+ -- Aaron M. Ucko <ucko@debian.org>  Sat, 29 Oct 2011 22:21:12 -0400
 
 ncbi-tools6 (6.1.20110713-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3e3cb2da..6db0e4cb 100644
--- a/debian/control
+++ b/debian/control
@@ -23,13 +23,13 @@ Description: NCBI libraries for biology applications
 
 Package: libncbi6-dev
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libncbi6 (= ${binary:Version})
+Depends: ${misc:Depends}, libncbi6 (= ${binary:Version})
+Recommends: ncbi-tools-bin
 Provides: ncbi-tools-dev
 Multi-Arch: same
 Description: NCBI libraries for biology applications (development files)
- This package is for developers or people who want to compile programs
- only.  In addition to development headers and libraries, it contains the
- utilities asntool and errhdr.
+ This package supplies development versions of NCBI's non-graphical C
+ libraries, along with the corresponding header files.
 
 Package: libncbi6-dbg
 Architecture: any
@@ -76,12 +76,15 @@ Architecture: any
 Section: science
 Depends: ${misc:Depends}, ${shlibs:Depends}, libncbi6 (>= ${source:Upstream-Version}), libncbi6 (<< ${source:Upstream-Version}.1)
 Suggests: blast2, ncbi-tools-x11, libvibrant6a
+Breaks: libncbi6-dev (<< 6.1.20110713-3~)
+Replaces: libncbi6-dev (<< 6.1.20110713-3~)
 Multi-Arch: foreign
 Description: NCBI libraries for biology applications (text-based utilities)
- This package includes various utilities distributed with the NCBI C SDK.
- None of the programs in this package require X; you can find the X-based
- utilities in the ncbi-tools-x11 package.  BLAST and related tools are
- in a separate package (blast2).
+ This package includes various utilities distributed with the NCBI C SDK,
+ including the development tools asntool and errhdr (formerly of
+ libncbi6-dev).  None of the programs in this package require X; you can
+ find the X-based utilities in the ncbi-tools-x11 package.  BLAST and
+ related tools are in a separate package (blast2).
 
 Package: ncbi-tools-x11
 Architecture: any
diff --git a/debian/libncbi6-dev.NEWS.debian b/debian/libncbi6-dev.NEWS.debian
new file mode 100644
index 00000000..d0736223
--- /dev/null
+++ b/debian/libncbi6-dev.NEWS.debian
@@ -0,0 +1,7 @@
+ncbi-tools6 (6.1.20110713-3) unstable; urgency=low
+
+  * The asntool and errhdr executables have moved to ncbi-tools-bin to
+    allow side-by-side installations of builds of libncbi6-dev (which
+    historically shipped them) for different architectures.
+  
+ -- Aaron M. Ucko <ucko@debian.org>  Sat, 29 Oct 2011 22:21:10 -0400
diff --git a/debian/libncbi6-dev.install b/debian/libncbi6-dev.install
index bc469fd6..35c99f11 100644
--- a/debian/libncbi6-dev.install
+++ b/debian/libncbi6-dev.install
@@ -1,5 +1,3 @@
-usr/bin/asntool
-usr/bin/errhdr
 usr/include/ncbi/PubStructAsn.h
 usr/include/ncbi/a2f*.h
 usr/include/ncbi/acc*.h
diff --git a/debian/libncbi6-dev.lintian-overrides b/debian/libncbi6-dev.lintian-overrides
deleted file mode 100644
index bf0e66aa..00000000
--- a/debian/libncbi6-dev.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libncbi6-dev: menu-icon-missing usr/share/pixmaps/asntool.xpm
-libncbi6-dev: menu-icon-missing usr/share/pixmaps/ncbilogo.xpm
diff --git a/debian/ncbi-tools-bin.install b/debian/ncbi-tools-bin.install
index e2f14ada..9d83fe41 100644
--- a/debian/ncbi-tools-bin.install
+++ b/debian/ncbi-tools-bin.install
@@ -8,10 +8,12 @@ usr/bin/asn2xml
 usr/bin/asndhuff
 usr/bin/asndisc
 usr/bin/asnmacro
+usr/bin/asntool
 usr/bin/asnval
 usr/bin/checksub
 usr/bin/cleanasn
 usr/bin/debruijn
+usr/bin/errhdr
 usr/bin/fa2htgs
 usr/bin/findspl
 usr/bin/gbseqget
diff --git a/debian/ncbi-tools-bin.lintian-overrides b/debian/ncbi-tools-bin.lintian-overrides
index e3e20c16..05098179 100644
--- a/debian/ncbi-tools-bin.lintian-overrides
+++ b/debian/ncbi-tools-bin.lintian-overrides
@@ -1 +1,2 @@
+ncbi-tools-bin: menu-icon-missing usr/share/pixmaps/asntool.xpm
 ncbi-tools-bin: menu-icon-missing usr/share/pixmaps/ncbilogo.xpm
diff --git a/debian/rules b/debian/rules
index 8956af5a..4c2035a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -200,7 +200,6 @@ override_dh_installchangelogs:
 override_dh_installmenu:
 	debian/makemenu debian/ncbi-tools-x11.install
 	debian/makemenu -v debian/ncbi-tools-bin.install
-	debian/makemenu -v debian/libncbi6-dev.install
 	debian/makemenu -v debian/blast2.install
 	dh_installmenu
 
@@ -219,7 +218,6 @@ override_dh_installman:
 	dh_link # otherwise runs too late to influence debian/installman
 	debian/installman blast2
 	debian/installman blast2 blast
-	debian/installman libncbi6-dev
 	debian/installman ncbi-tools-bin
 	debian/installman ncbi-tools-x11
 ifneq "" "$(filter ncbi-data, $(shell dh_listpackages))"