[python-fabio] 61/73: add fabio-viewer

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository python-fabio.

commit d3143216df293b2d3d51ba769c6c98222455cf6a
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Mon Jul 27 13:45:40 2015 +0200

    add fabio-viewer
---
 debian/changelog |  6 ++++++
 debian/control   | 26 ++++++++++++++++++++++----
 debian/rules     | 12 +++++++-----
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4ccb7d..d3d0833 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-fabio (0.2.2+dfsg-2) unstable; urgency=medium
+
+  * Add python3 modules and put the scripts into fabio-viewer
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Mon, 27 Jul 2015 10:03:05 +0200
+
 python-fabio (0.2.2+dfsg-1) unstable; urgency=medium
 
   * Imported Upstream version 0.2.2+dfsg
diff --git a/debian/control b/debian/control
index f67e43b..865dc7e 100644
--- a/debian/control
+++ b/debian/control
@@ -33,21 +33,40 @@ Build-Depends: cython,
                python3-pil-dbg,
                python3-setuptools,
                python3-six,
-               python3-sphinx (>= 1.0.7+dfsg-1~),
+               python3-sphinx,
                python3-sphinxcontrib.programoutput
 Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/python-fabio.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/python-fabio.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/python-fabio.git
 Homepage: https://github.com/kif/fabio
 X-Python-Version: >= 2.5
 X-Python3-Version: >= 3.4
 
+Package: fabio-viewer
+Architecture: all
+Section: python
+Depends: ${misc:Depends},
+         ${python:Depends},
+         python-fabio (>= ${source:Version})
+Breaks: python-fabio (<< 0.2.2+dfsg-2)
+Replaces: python-fabio (<< 0.2.2+dfsg-2)
+Description: Viewer for images produced by 2D X-ray detector
+ FabIO is an I/O library for images produced by 2D X-ray detectors and
+ written in Python. FabIO support images detectors from a dozen of
+ companies (including Mar, Dectris, ADSC, Hamamatsu, Oxford, ...), for
+ a total of 20 different file formats (like CBF, EDF, TIFF, ...) and
+ offers an unified interface to their headers (as a Python dictionary)
+ and datasets (as a numpy ndarray of integers or floats)
+ .
+ Binaries provided with python-fabio
+
 Package: python-fabio
 Architecture: any
 Section: python
 Depends: ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends},
+         fabio-viewer,
          pymca,
          python-six
 Recommends: python-imaging,
@@ -99,7 +118,7 @@ Recommends: python3-lxml,
             python3-matplotlib,
             python3-pil
 Suggests: pyfai,
-          python3-fabio-doc
+          python-fabio-doc
 Description: I/O library for images produced by 2D X-ray detector - Python3
  FabIO is an I/O library for images produced by 2D X-ray detectors and
  written in Python. FabIO support images detectors from a dozen of
@@ -146,4 +165,3 @@ Description: I/O library for images produced by 2D X-ray detector - documentatio
  and datasets (as a numpy ndarray of integers or floats)
  .
  This is the common documentation package.
-
diff --git a/debian/rules b/debian/rules
index 9d4dbad..fdc6695 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,15 +27,17 @@ override_dh_install:
 	dh_numpy3
 	dh_install
 
-	# remove the /bin part of the -dbg package which conflict with
-	# non-dbg packages
+	# move the scripts into fabio-viewer
+	dh_install -p fabio-viewer debian/python-fabio/usr/bin usr/
+	# remove all scripts installed by pybuild
+	rm -rf debian/python-fabio/usr/bin
 	rm -rf debian/python-fabio-dbg/usr/bin
 	rm -rf debian/python3-fabio/usr/bin
 	rm -rf debian/python3-fabio-dbg/usr/bin
 
 override_dh_installman:
-	dh_installman -p python-fabio doc/man/fabio_viewer.1
+	dh_installman -p fabio-viewer doc/man/fabio_viewer.1
 
-override_dh_installdocs-indep:
-	# install the documentation
+override_dh_installdocs:
 	dh_installdocs "build/html" -p python-fabio-doc
+	dh_installdocs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-fabio.git