[gnuplot] 07/08: Use update-alternatives to provide usr/bin/gnuplot
Anton Gladky
gladk at moszumanska.debian.org
Tue Jun 24 22:02:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gnuplot.
commit 893f8be49382efa05fa028dfbd9bb2696552fce9
Author: Anton Gladky <gladk at debian.org>
Date: Tue Jun 24 23:46:57 2014 +0200
Use update-alternatives to provide usr/bin/gnuplot
Most of non-binary files (usr/share/gnuplot) were moved to gnuplot
binary package. Update-alternatives are used to provide usr/bin/gnuplot,
manpages and gnuplot.gih file.
Main binaries were renamed to usr/bin/gnuplot4-{nox, x11, qt}.
It should provide installing both gnuplot4 and gnuplot5 packages
simultaneously.
---
debian/control | 29 +++++++++++++-------------
debian/gnuplot-nox.install | 4 +---
debian/gnuplot-nox.postinst | 6 ++++--
debian/gnuplot-qt.install | 5 +----
debian/gnuplot-qt.links | 1 -
debian/gnuplot-qt.postinst | 4 +++-
debian/gnuplot-x11.install | 5 +----
debian/gnuplot-x11.links | 1 -
debian/gnuplot-x11.postinst | 6 ++++--
debian/{gnuplot-qt.install => gnuplot.install} | 8 +++----
debian/{gnuplot-nox.links => gnuplot.links} | 0
debian/rules | 3 +++
12 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/debian/control b/debian/control
index f54d158..f73c6d8 100644
--- a/debian/control
+++ b/debian/control
@@ -34,8 +34,13 @@ XS-Testsuite: autopkgtest
Package: gnuplot
Architecture: all
Depends:
- gnuplot-qt | gnuplot-x11 | gnuplot-nox,
+ aglfn,
+ gnuplot-qt (>= 4.6.5-5) | gnuplot-x11 (>= 4.6.5-5) | gnuplot-nox (>= 4.6.5-5),
${misc:Depends}
+Breaks:
+ gnuplot-nox (<<4.6.5-5),
+ gnuplot-qt (<<4.6.5-5),
+ gnuplot-x11 (<<4.6.5-5)
Suggests:
feedgnuplot,
gnuplot-doc,
@@ -74,12 +79,9 @@ Description: Command-line driven interactive plotting program. Doc-package
Package: gnuplot-nox
Architecture: any
Depends:
- aglfn,
+ gnuplot (>= 4.6.5-5),
${misc:Depends},
${shlibs:Depends}
-Conflicts:
- gnuplot-qt,
- gnuplot-x11
Recommends:
fonts-liberation,
groff
@@ -100,16 +102,14 @@ Description: Command-line driven interactive plotting program. No-X package
Package: gnuplot-qt
Architecture: any
Depends:
- aglfn,
+ gnuplot (>= 4.6.5-5),
${misc:Depends},
${shlibs:Depends}
-Conflicts:
- gnuplot-nox,
- gnuplot-x11
Suggests:
gnuplot-doc
-Provides:
- gnuplot-nox,
+Conflicts:
+ gnuplot-x11
+Replaces:
gnuplot-x11
Description: Command-line driven interactive plotting program. QT-package
Gnuplot is a portable command-line driven interactive data and function
@@ -131,16 +131,15 @@ Description: Command-line driven interactive plotting program. QT-package
Package: gnuplot-x11
Architecture: any
Depends:
- aglfn,
+ gnuplot (>= 4.6.5-5),
${misc:Depends},
${shlibs:Depends}
Conflicts:
- gnuplot-nox,
+ gnuplot-qt
+Replaces:
gnuplot-qt
Suggests:
gnuplot-doc
-Provides:
- gnuplot-nox
Description: Command-line driven interactive plotting program. X-package
Gnuplot is a portable command-line driven interactive data and function
plotting utility that supports lots of output formats, including drivers
diff --git a/debian/gnuplot-nox.install b/debian/gnuplot-nox.install
index d809f47..230e8d2 100644
--- a/debian/gnuplot-nox.install
+++ b/debian/gnuplot-nox.install
@@ -1,4 +1,2 @@
debian/tmp/NOX/usr/bin/ usr
-debian/tmp/NOX/usr/share/gnuplot/gnuplot.gih usr/share/gnuplot
-debian/tmp/NOX/usr/share/gnuplot/gnuplot/ usr/share/gnuplot
-debian/tmp/NOX/usr/share/texmf/tex/ usr/share/texmf/
+debian/tmp/NOX/usr/share/gnuplot/gnuplot4-nox.gih usr/share/gnuplot
diff --git a/debian/gnuplot-nox.postinst b/debian/gnuplot-nox.postinst
index aa88ff2..d190314 100644
--- a/debian/gnuplot-nox.postinst
+++ b/debian/gnuplot-nox.postinst
@@ -3,9 +3,11 @@
set -e
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
- update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot4-nox 40 \
+ update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot4-nox 20 \
--slave /usr/share/man/man1/gnuplot.1.gz gnuplot.1.gz \
- /usr/share/man/man1/gnuplot4-nox.1.gz
+ /usr/share/man/man1/gnuplot4-nox.1.gz \
+ --slave /usr/share/gnuplot/gnuplot.gih gnuplot4.gih \
+ /usr/share/gnuplot/gnuplot4-nox.gih
fi
#DEBHELPER#
diff --git a/debian/gnuplot-qt.install b/debian/gnuplot-qt.install
index 30d0242..7c940cb 100644
--- a/debian/gnuplot-qt.install
+++ b/debian/gnuplot-qt.install
@@ -1,6 +1,3 @@
debian/tmp/QT/usr/bin usr
debian/tmp/QT/usr/lib usr
-debian/tmp/QT/usr/share/gnuplot/gnuplot.gih usr/share/gnuplot
-debian/tmp/QT/usr/share/gnuplot/gnuplot/ usr/share/gnuplot
-debian/tmp/QT/usr/share/texmf/tex/ usr/share/texmf/
-pm3d/contrib/* usr/share/gnuplot/pm3d
+debian/tmp/QT/usr/share/gnuplot/gnuplot4-qt.gih usr/share/gnuplot
diff --git a/debian/gnuplot-qt.links b/debian/gnuplot-qt.links
deleted file mode 100644
index 05fca59..0000000
--- a/debian/gnuplot-qt.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/aglfn/aglfn.txt usr/share/gnuplot/gnuplot/4.6/PostScript/aglfn.txt
diff --git a/debian/gnuplot-qt.postinst b/debian/gnuplot-qt.postinst
index 570252d..972ed9b 100644
--- a/debian/gnuplot-qt.postinst
+++ b/debian/gnuplot-qt.postinst
@@ -5,7 +5,9 @@ set -e
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot4-qt 40 \
--slave /usr/share/man/man1/gnuplot.1.gz gnuplot.1.gz \
- /usr/share/man/man1/gnuplot4-qt.1.gz
+ /usr/share/man/man1/gnuplot4-qt.1.gz \
+ --slave /usr/share/gnuplot/gnuplot.gih gnuplot4.gih \
+ /usr/share/gnuplot/gnuplot4-qt.gih
fi
#DEBHELPER#
diff --git a/debian/gnuplot-x11.install b/debian/gnuplot-x11.install
index ab11167..d3fc247 100644
--- a/debian/gnuplot-x11.install
+++ b/debian/gnuplot-x11.install
@@ -1,6 +1,3 @@
debian/tmp/X11/usr/bin usr
debian/tmp/X11/usr/lib usr
-debian/tmp/X11/usr/share/gnuplot/gnuplot.gih usr/share/gnuplot
-debian/tmp/X11/usr/share/gnuplot/gnuplot/ usr/share/gnuplot
-debian/tmp/X11/usr/share/texmf/tex/ usr/share/texmf/
-pm3d/contrib/* usr/share/gnuplot/pm3d
+debian/tmp/X11/usr/share/gnuplot/gnuplot4-x11.gih usr/share/gnuplot
diff --git a/debian/gnuplot-x11.links b/debian/gnuplot-x11.links
deleted file mode 100644
index 05fca59..0000000
--- a/debian/gnuplot-x11.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/aglfn/aglfn.txt usr/share/gnuplot/gnuplot/4.6/PostScript/aglfn.txt
diff --git a/debian/gnuplot-x11.postinst b/debian/gnuplot-x11.postinst
index 07e0d7f..0a73173 100644
--- a/debian/gnuplot-x11.postinst
+++ b/debian/gnuplot-x11.postinst
@@ -3,9 +3,11 @@
set -e
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
- update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot4-x11 40 \
+ update-alternatives --install /usr/bin/gnuplot gnuplot /usr/bin/gnuplot4-x11 30 \
--slave /usr/share/man/man1/gnuplot.1.gz gnuplot.1.gz \
- /usr/share/man/man1/gnuplot4-x11.1.gz
+ /usr/share/man/man1/gnuplot4-x11.1.gz \
+ --slave /usr/share/gnuplot/gnuplot.gih gnuplot4.gih \
+ /usr/share/gnuplot/gnuplot4-x11.gih
fi
#DEBHELPER#
diff --git a/debian/gnuplot-qt.install b/debian/gnuplot.install
similarity index 57%
copy from debian/gnuplot-qt.install
copy to debian/gnuplot.install
index 30d0242..6bebd1a 100644
--- a/debian/gnuplot-qt.install
+++ b/debian/gnuplot.install
@@ -1,6 +1,4 @@
-debian/tmp/QT/usr/bin usr
-debian/tmp/QT/usr/lib usr
-debian/tmp/QT/usr/share/gnuplot/gnuplot.gih usr/share/gnuplot
-debian/tmp/QT/usr/share/gnuplot/gnuplot/ usr/share/gnuplot
-debian/tmp/QT/usr/share/texmf/tex/ usr/share/texmf/
pm3d/contrib/* usr/share/gnuplot/pm3d
+debian/tmp/QT/usr/share/texmf/tex/ usr/share/texmf/
+debian/tmp/QT/usr/share/gnuplot/gnuplot/ usr/share/gnuplot
+debian/tmp/NOX/usr/share/texmf/tex/ usr/share/texmf/
diff --git a/debian/gnuplot-nox.links b/debian/gnuplot.links
similarity index 100%
rename from debian/gnuplot-nox.links
rename to debian/gnuplot.links
diff --git a/debian/rules b/debian/rules
index 4d528ce..04755b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,14 +55,17 @@ override_dh_auto_install:
pkglibexecdir='$$(libexecdir)'
mv $(CURDIR)/debian/tmp/NOX/usr/bin/gnuplot $(CURDIR)/debian/tmp/NOX/usr/bin/gnuplot4-nox
mv $(CURDIR)/debian/tmp/NOX/usr/share/man/man1/gnuplot.1 $(CURDIR)/debian/tmp/NOX/usr/share/man/man1/gnuplot4-nox.1
+ mv $(CURDIR)/debian/tmp/NOX/usr/share/gnuplot/gnuplot.gih $(CURDIR)/debian/tmp/NOX/usr/share/gnuplot/gnuplot4-nox.gih
$(MAKE) -C $(BUILDDIR_X11) install DESTDIR=$(CURDIR)/debian/tmp/X11/ \
pkglibexecdir='$$(libexecdir)'
mv $(CURDIR)/debian/tmp/X11/usr/bin/gnuplot $(CURDIR)/debian/tmp/X11/usr/bin/gnuplot4-x11
mv $(CURDIR)/debian/tmp/X11/usr/share/man/man1/gnuplot.1 $(CURDIR)/debian/tmp/X11/usr/share/man/man1/gnuplot4-x11.1
+ mv $(CURDIR)/debian/tmp/X11/usr/share/gnuplot/gnuplot.gih $(CURDIR)/debian/tmp/X11/usr/share/gnuplot/gnuplot4-x11.gih
$(MAKE) -C $(BUILDDIR_QT) install DESTDIR=$(CURDIR)/debian/tmp/QT/ \
pkglibexecdir='$$(libexecdir)'
mv $(CURDIR)/debian/tmp/QT/usr/bin/gnuplot $(CURDIR)/debian/tmp/QT/usr/bin/gnuplot4-qt
mv $(CURDIR)/debian/tmp/QT/usr/share/man/man1/gnuplot.1 $(CURDIR)/debian/tmp/QT/usr/share/man/man1/gnuplot4-qt.1
+ mv $(CURDIR)/debian/tmp/QT/usr/share/gnuplot/gnuplot.gih $(CURDIR)/debian/tmp/QT/usr/share/gnuplot/gnuplot4-qt.gih
override_dh_auto_test:
cp -f $(BUILDDIR_X11)/demo/binary* ./demo/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gnuplot.git
More information about the debian-science-commits
mailing list