[gnuplot5] 02/03: Update options.
Anton Gladky
gladk at moszumanska.debian.org
Sat Jul 12 09:42:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gnuplot5.
commit 1f6d86b06b938af46555e2040c268b29ceba370e
Author: Anton Gladky <gladk at debian.org>
Date: Sat Jul 12 11:37:31 2014 +0200
Update options.
---
debian/control | 20 ++++++++++++++++----
debian/gnuplot5-nox.install | 2 +-
debian/gnuplot5-nox.postinst | 4 ++++
debian/gnuplot5-nox.prerm | 1 +
debian/gnuplot5-qt.install | 2 +-
debian/gnuplot5-qt.postinst | 4 ++++
debian/gnuplot5-qt.prerm | 1 +
debian/gnuplot5-x11.postinst | 4 ++++
debian/gnuplot5-x11.prerm | 1 +
debian/patches/08_disable_demo_plugin.patch~ | 25 -------------------------
debian/rules | 4 ++--
11 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/debian/control b/debian/control
index 34c5f8c..c89b6fa 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,8 @@ Depends:
${misc:Depends}
Suggests:
gnuplot5-doc
+Provides:
+ gnuplot
Description: Command-line driven interactive plotting program, version 5
Gnuplot is a portable command-line driven interactive data and function
plotting utility that supports lots of output formats, including drivers
@@ -82,6 +84,12 @@ Depends:
Recommends:
fonts-liberation,
groff
+Conflicts:
+ gnuplot5-qt,
+ gnuplot5-x11
+Replaces:
+ gnuplot5-qt,
+ gnuplot5-x11
Suggests:
gnuplot5-doc
Description: Command-line driven interactive plotting program. No-X package
@@ -105,9 +113,11 @@ Depends:
Suggests:
gnuplot5-doc
Conflicts:
- gnuplot5-x11
+ gnuplot5-x11,
+ gnuplot5-nox
Replaces:
- gnuplot5-x11
+ gnuplot5-x11,
+ gnuplot5-nox
Description: Command-line driven interactive plotting program. QT-package
Gnuplot is a portable command-line driven interactive data and function
plotting utility that supports lots of output formats, including drivers
@@ -132,9 +142,11 @@ Depends:
${misc:Depends},
${shlibs:Depends}
Conflicts:
- gnuplot5-qt
+ gnuplot5-qt,
+ gnuplot5-nox
Replaces:
- gnuplot5-qt
+ gnuplot5-qt,
+ gnuplot5-nox
Suggests:
gnuplot5-doc
Description: Command-line driven interactive plotting program. X-package
diff --git a/debian/gnuplot5-nox.install b/debian/gnuplot5-nox.install
index b6be4e8..a80cde4 100644
--- a/debian/gnuplot5-nox.install
+++ b/debian/gnuplot5-nox.install
@@ -1,2 +1,2 @@
debian/tmp/NOX/usr/bin/ usr
-debian/tmp/NOX/usr/share/gnuplot5/gnuplot5-nox.gih usr/share/gnuplot
+debian/tmp/NOX/usr/share/gnuplot5/gnuplot5-nox.gih usr/share/gnuplot5
diff --git a/debian/gnuplot5-nox.postinst b/debian/gnuplot5-nox.postinst
index e2e12ee..869a14c 100644
--- a/debian/gnuplot5-nox.postinst
+++ b/debian/gnuplot5-nox.postinst
@@ -8,6 +8,10 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
/usr/share/man/man1/gnuplot5-nox.1.gz \
--slave /usr/share/gnuplot5/gnuplot.gih gnuplot5.gih \
/usr/share/gnuplot5/gnuplot5-nox.gih
+
+ update-alternatives --install /usr/bin/gnuplot5 gnuplot5 /usr/bin/gnuplot5-nox 50 \
+ --slave /usr/share/man/man1/gnuplot5.1.gz gnuplot5.1.gz \
+ /usr/share/man/man1/gnuplot5-nox.1.gz
fi
#DEBHELPER#
diff --git a/debian/gnuplot5-nox.prerm b/debian/gnuplot5-nox.prerm
index f64f253..db9de1c 100644
--- a/debian/gnuplot5-nox.prerm
+++ b/debian/gnuplot5-nox.prerm
@@ -4,6 +4,7 @@ set -e
if [ "$1" != "upgrade" ]; then
update-alternatives --remove gnuplot /usr/bin/gnuplot5-nox
+ update-alternatives --remove gnuplot5 /usr/bin/gnuplot5-nox
fi
#DEBHELPER#
diff --git a/debian/gnuplot5-qt.install b/debian/gnuplot5-qt.install
index 10ca7ec..6fe2951 100644
--- a/debian/gnuplot5-qt.install
+++ b/debian/gnuplot5-qt.install
@@ -1,3 +1,3 @@
debian/tmp/QT/usr/bin usr
debian/tmp/QT/usr/lib usr
-debian/tmp/QT/usr/share/gnuplot5/gnuplot5-qt.gih usr/share/gnuplot
+debian/tmp/QT/usr/share/gnuplot5/gnuplot5-qt.gih usr/share/gnuplot5
diff --git a/debian/gnuplot5-qt.postinst b/debian/gnuplot5-qt.postinst
index 959d508..70f7d25 100644
--- a/debian/gnuplot5-qt.postinst
+++ b/debian/gnuplot5-qt.postinst
@@ -8,6 +8,10 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
/usr/share/man/man1/gnuplot5-qt.1.gz \
--slave /usr/share/gnuplot5/gnuplot.gih gnuplot5.gih \
/usr/share/gnuplot5/gnuplot5-qt.gih
+
+ update-alternatives --install /usr/bin/gnuplot5 gnuplot5 /usr/bin/gnuplot5-qt 70 \
+ --slave /usr/share/man/man1/gnuplot5.1.gz gnuplot5.1.gz \
+ /usr/share/man/man1/gnuplot5-qt.1.gz
fi
#DEBHELPER#
diff --git a/debian/gnuplot5-qt.prerm b/debian/gnuplot5-qt.prerm
index 5c4a3b6..ca9207a 100644
--- a/debian/gnuplot5-qt.prerm
+++ b/debian/gnuplot5-qt.prerm
@@ -4,6 +4,7 @@ set -e
if [ "$1" != "upgrade" ]; then
update-alternatives --remove gnuplot /usr/bin/gnuplot5-qt
+ update-alternatives --remove gnuplot5 /usr/bin/gnuplot5-qt
fi
#DEBHELPER#
diff --git a/debian/gnuplot5-x11.postinst b/debian/gnuplot5-x11.postinst
index 6c1f511..e95dfc8 100644
--- a/debian/gnuplot5-x11.postinst
+++ b/debian/gnuplot5-x11.postinst
@@ -8,6 +8,10 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
/usr/share/man/man1/gnuplot5-x11.1.gz \
--slave /usr/share/gnuplot5/gnuplot.gih gnuplot5.gih \
/usr/share/gnuplot5/gnuplot5-x11.gih
+
+ update-alternatives --install /usr/bin/gnuplot5 gnuplot5 /usr/bin/gnuplot5-x11 60 \
+ --slave /usr/share/man/man1/gnuplot5.1.gz gnuplot5.1.gz \
+ /usr/share/man/man1/gnuplot5-x11.1.gz
fi
#DEBHELPER#
diff --git a/debian/gnuplot5-x11.prerm b/debian/gnuplot5-x11.prerm
index dbc70db..e77434c 100644
--- a/debian/gnuplot5-x11.prerm
+++ b/debian/gnuplot5-x11.prerm
@@ -4,6 +4,7 @@ set -e
if [ "$1" != "upgrade" ]; then
update-alternatives --remove gnuplot /usr/bin/gnuplot5-x11
+ update-alternatives --remove gnuplot5 /usr/bin/gnuplot5-x11
fi
#DEBHELPER#
diff --git a/debian/patches/08_disable_demo_plugin.patch~ b/debian/patches/08_disable_demo_plugin.patch~
deleted file mode 100644
index e12a379..0000000
--- a/debian/patches/08_disable_demo_plugin.patch~
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: temporarly disable demo plugin
- this patch should be removed, when a new
- version appears, where already no binaries
- in demo/plugin folder.
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-07-11
-
---- gnuplot5-5.0.0~rc+dfsg.orig/demo/Makefile.in
-+++ gnuplot5-5.0.0~rc+dfsg/demo/Makefile.in
-@@ -301,7 +301,6 @@ epslatex.ps epslatex.tex random.tmp stri
-
- BINARY_FILES = binary1 binary2 binary3
- SUBDIRS = $(PLUGIN_DIR)
--DIST_SUBDIRS = plugin
- DEMO = all.dem
- GNUPLOT = gnuplot
- GNUPLOT_X11 = `echo gnuplot_x11 | sed '$(transform)'`$(EXEEXT)
-@@ -341,7 +340,6 @@ GM1_sugar.pdb bldg.png GM1_bonds.r3d blu
- sound2.par start.par gnuplot.rot gnu-valley random-points gpdemos.tcl \
- html plugin
-
-- at BUILD_PLUGIN_TRUE@PLUGIN_DIR = plugin
- all: all-recursive
-
- .SUFFIXES:
diff --git a/debian/rules b/debian/rules
index ea65dbb..eb168f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,9 +29,9 @@ conf_opts += \
override_dh_auto_configure:
mkdir -p $(BUILDDIR_NOX)
- cd $(BUILDDIR_NOX); ./../../configure $(conf_opts) --without-x --disable-wxwidgets --disable-wxt
+ cd $(BUILDDIR_NOX); ./../../configure $(conf_opts) --with-qt=no --without-x --disable-wxwidgets --disable-wxt
mkdir -p $(BUILDDIR_X11)
- cd $(BUILDDIR_X11); ../../configure $(conf_opts) --without-qt --disable-wxt
+ cd $(BUILDDIR_X11); ../../configure $(conf_opts) --with-qt=no --disable-wxt
mkdir -p $(BUILDDIR_QT)
cd $(BUILDDIR_QT); ../../configure $(conf_opts) --enable-qt --disable-wxt
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gnuplot5.git
More information about the debian-science-commits
mailing list