7 files changed, 22 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog
index 2e73725b..c02e6a32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,18 @@
+taurus (4.6.1+dfsg-1) unstable; urgency=medium
+
+  [ Carlos Pascual ]
+  * New upstream version 4.6.1
+  * Standards-Version bump to 4.4.0 (nothing to do)
+  * Use debhelper-compat instead of debian/compat.
+  * d/changelog: Remove trailing whitespaces.
+  * Rename taurus script to taurus-py2 in taurus-python
+  * Add man page for taurus script
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Tue, 27 Aug 2019 21:04:54 +0200
+
 taurus (4.5.0+dfsg-2) unstable; urgency=medium
 
-  * Add python3-taurus package 
+  * Add python3-taurus package
 
  -- Carlos Pascual <cpascual@cells.es>  Tue, 05 Feb 2019 16:15:03 +0100
 
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec635144..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 294605b8..54e9549f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,11 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.
 Uploaders: Picca Frédéric-Emmanuel <picca@debian.org>, Carlos Pascual <cpascual@cells.es>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper-compat (= 9),
                dh-python,
                graphviz,
                python-all,
+               python-click,
 	       python-enum34,
                python-future,
                python-guiqwt,
@@ -24,6 +25,7 @@ Build-Depends: debhelper (>= 9),
                python-spyder,
                python-tango,
                python3-all,
+               python3-click,
                python3-future,
                python3-guiqwt,
                python3-h5py,
@@ -45,7 +47,7 @@ Build-Depends: debhelper (>= 9),
                symlinks,
                xauth,
                xvfb
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/science-team/taurus
 Vcs-Git: https://salsa.debian.org/science-team/taurus.git
 Homepage: http://www.taurus-scada.org
@@ -55,6 +57,7 @@ Architecture: all
 Section: python
 Depends: ${misc:Depends},
          ${python:Depends},
+         python-click,
          python-enum34,
          python-future,
          python-guiqwt,
@@ -86,6 +89,7 @@ Architecture: all
 Section: python
 Depends: ${misc:Depends},
          ${python3:Depends},
+         python3-click,
          python3-future,
          python3-guiqwt,
          python3-h5py,
diff --git a/debian/python-taurus.links b/debian/python-taurus.links
new file mode 100644
index 00000000..57176d35
--- /dev/null
+++ b/debian/python-taurus.links
@@ -0,0 +1 @@
+usr/share/python-taurus/scripts/taurus usr/bin/taurus-py2
diff --git a/debian/python3-taurus.links b/debian/python3-taurus.links
deleted file mode 100644
index b0e56fc3..00000000
--- a/debian/python3-taurus.links
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/share/python3-taurus/scripts/taurusconfigbrowser usr/bin/taurusconfigbrowser3
-usr/share/python3-taurus/scripts/tauruscurve usr/bin/tauruscurve3
-usr/share/python3-taurus/scripts/taurusdemo usr/bin/taurusdemo3
-usr/share/python3-taurus/scripts/taurusdesigner usr/bin/taurusdesigner3
-usr/share/python3-taurus/scripts/taurusdevicepanel usr/bin/taurusdevicepanel3
-usr/share/python3-taurus/scripts/taurusform usr/bin/taurusform3
-usr/share/python3-taurus/scripts/taurusgui usr/bin/taurusgui3
-usr/share/python3-taurus/scripts/taurusiconcatalog usr/bin/taurusiconcatalog3
-usr/share/python3-taurus/scripts/taurusimage usr/bin/taurusimage3
-usr/share/python3-taurus/scripts/tauruspanel usr/bin/tauruspanel3
-usr/share/python3-taurus/scripts/taurustestsuite usr/bin/taurustestsuite3
-usr/share/python3-taurus/scripts/taurustrend1d usr/bin/taurustrend1d3
-usr/share/python3-taurus/scripts/taurustrend2d usr/bin/taurustrend2d3
diff --git a/debian/python3-taurus.manpages b/debian/python3-taurus.manpages
new file mode 100644
index 00000000..ddf17ba6
--- /dev/null
+++ b/debian/python3-taurus.manpages
@@ -0,0 +1 @@
+doc/man/taurus.1
diff --git a/debian/rules b/debian/rules
index 97adbf97..82071432 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export PYBUILD_NAME=taurus
 export PYBUILD_AFTER_INSTALL=dh_numpy
 export PYBUILD_DISABLE=test
-export PYBUILD_INSTALL_ARGS_python3=--install-scripts=/usr/share/python3-taurus/scripts/
+export PYBUILD_INSTALL_ARGS_python2=--install-scripts=/usr/share/python-taurus/scripts/
 
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild