[plplot] 02/03: Move plserver program to plplot-tcl-bin package and /usr/bin

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository plplot.

commit bdcbe11a608634df5bfdb5ac8851ab474f6edb52
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Sep 25 10:42:13 2017 +0200

    Move plserver program to plplot-tcl-bin package and /usr/bin
---
 debian/control                 | 5 +++--
 debian/plplot-tcl-bin.install  | 1 +
 debian/plplot-tcl-bin.manpages | 2 ++
 debian/plplot-tcl.install      | 3 ---
 debian/rules                   | 2 --
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 788566d..003223a 100644
--- a/debian/control
+++ b/debian/control
@@ -315,6 +315,7 @@ Depends: iwidgets4,
          ${misc:Depends},
          ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
+Recommends: plplot-tcl-bin
 Description: Tcl/Tk support for PLplot, a plotting library
  PLplot is relatively small, portable, freely distributable, and is rich
  enough to satisfy most users.  It has a wide range of plot types including
@@ -341,8 +342,8 @@ Description: Tcl/Tk tools for PLplot, a plotting library
  handful of function calls is typically required.  For more advanced use,
  virtually all aspects of plotting are configurable.
  .
- This package contains the pltcl program for interactive use of the Tcl/Tk
- support for PLplot.
+ This package contains the pltcl and plserver programs for interactive
+ use of the Tcl/Tk support for PLplot.
 
 Package: plplot-tcl-dev
 Architecture: any
diff --git a/debian/plplot-tcl-bin.install b/debian/plplot-tcl-bin.install
index b75642c..4da93a8 100644
--- a/debian/plplot-tcl-bin.install
+++ b/debian/plplot-tcl-bin.install
@@ -1 +1,2 @@
 usr/bin/pltcl
+usr/bin/plserver
diff --git a/debian/plplot-tcl-bin.manpages b/debian/plplot-tcl-bin.manpages
new file mode 100644
index 0000000..52d9df9
--- /dev/null
+++ b/debian/plplot-tcl-bin.manpages
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/plserver.1
+debian/tmp/usr/share/man/man1/pltcl.1
diff --git a/debian/plplot-tcl.install b/debian/plplot-tcl.install
index a043e34..4c683d1 100644
--- a/debian/plplot-tcl.install
+++ b/debian/plplot-tcl.install
@@ -1,7 +1,4 @@
 usr/lib/*/lib*tcl*.so.*
 usr/lib/*/plplot*/drivers/*tk*
-usr/lib/*/plplot/bin/plserver
-usr/share/man/man1/plserver.1
-usr/share/man/man1/pltcl.1
 usr/share/plplot*/pkgIndex.tcl
 usr/share/plplot*/tcl
diff --git a/debian/rules b/debian/rules
index b99db76..37cf461 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,8 +45,6 @@ endif
 
 override_dh_auto_install:
 	dh_auto_install
-	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/plplot/bin
-	mv debian/tmp/usr/bin/plserver debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/plplot/bin/plserver
 	# Dirty hack: Make shared lib executable to force its detection
 	# by dh_strip and dh_shlibdeps.
 	# This will be reverted later, in override_dh_shlibdeps.

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