[SCM] Gnuplot. Interactive plotting program branch, master, updated. debian/4.6.0-5-6-g87bfee8
Anton Gladky
gladky.anton at gmail.com
Thu Apr 26 17:30:56 UTC 2012
The following commit has been merged in the master branch:
commit 3a12b41728f920ff33a1dd465e79981e5fbc5656
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Thu Apr 26 19:27:18 2012 +0200
Remove *.postrm and *.preinst.
diff --git a/debian/control b/debian/control
index c44909b..16675f2 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,10 @@ Uploaders: Bradley Smith <bradsmith at debian.org>, Anton Gladky <gladky.anton at gmai
Standards-Version: 3.9.3
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 8.9.10), libpng-dev, libx11-dev, libxt-dev,
- pkg-config, texinfo (>= 4.8), texlive-latex-base, texlive-latex-recommended,
+ pkg-config, texinfo, texlive-latex-base, texlive-latex-recommended,
texlive-latex-extra, liblua5.1-dev,
- zlib1g-dev, libgd2-noxpm-dev, quilt, libwxgtk2.8-dev, libcairo2-dev,
- libpango1.0-dev, libedit-dev (>= 2.11-20080614-2), autoconf, automake,
+ zlib1g-dev, libgd2-noxpm-dev, libwxgtk2.8-dev, libcairo2-dev,
+ libpango1.0-dev, libedit-dev, autoconf, automake,
libqt4-dev (>=4:4.5)
Homepage: http://gnuplot.sourceforge.net/
Vcs-Git: git://git.debian.org/git/debian-science/packages/gnuplot.git
@@ -17,7 +17,8 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/gnuplot.git
Package: gnuplot
Architecture: all
-Depends: gnuplot-nox, gnuplot-x11, ${misc:Depends}
+Depends: ${misc:Depends}
+Recommends: gnuplot-nox | gnuplot-x11 | gnuplot-qt
Suggests: gnuplot-doc
Description: Command-line driven interactive plotting program
Gnuplot is a portable command-line driven interactive data and function
@@ -34,10 +35,10 @@ Description: Command-line driven interactive plotting program
Package: gnuplot-nox
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnuplot
Recommends: groff, fonts-liberation
-Suggests: gnuplot-x11, gnuplot-doc
-Description: Command-line driven interactive plotting program
+Suggests: gnuplot-qt, gnuplot-doc
+Description: Command-line driven interactive plotting program. No-X package
Gnuplot is a portable command-line driven interactive data and function
plotting utility that supports lots of output formats, including drivers
for many printers, (La)TeX, (x)fig, Postscript, and so on. The X11-output
@@ -51,10 +52,10 @@ Description: Command-line driven interactive plotting program
Package: gnuplot-x11
Architecture: any
-Depends: gnuplot-nox, ${shlibs:Depends}, ${misc:Depends}
-Suggests: gnuplot-qt
-Replaces: gnuplot-qt
-Description: Command-line driven interactive plotting program
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnuplot
+Replaces: gnuplot-qt, gnuplot-nox
+Suggests: gnuplot-qt, gnuplot-doc
+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
for many printers, (La)TeX, (x)fig, Postscript, and so on. The X11-output
@@ -71,9 +72,10 @@ Description: Command-line driven interactive plotting program
Package: gnuplot-qt
Architecture: any
-Depends: gnuplot-nox, ${shlibs:Depends}, ${misc:Depends}
-Replaces: gnuplot-X11
-Description: Command-line driven interactive plotting program
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnuplot
+Replaces: gnuplot-x11, gnuplot-nox
+Suggests: gnuplot-doc
+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
for many printers, (La)TeX, (x)fig, Postscript, and so on.
@@ -93,7 +95,7 @@ Package: gnuplot-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Description: Command-line driven interactive plotting program
+Description: Command-line driven interactive plotting program. Doc-package
Gnuplot is a portable command-line driven interactive data and function
plotting utility that supports lots of output formats, including drivers
for many printers, (La)TeX, (x)fig, Postscript, and so on. The X11-output
diff --git a/debian/gnuplot-doc.doc-base b/debian/gnuplot-doc.doc-base.gnuplot-html
similarity index 80%
rename from debian/gnuplot-doc.doc-base
rename to debian/gnuplot-doc.doc-base.gnuplot-html
index 540b214..b03795d 100644
--- a/debian/gnuplot-doc.doc-base
+++ b/debian/gnuplot-doc.doc-base.gnuplot-html
@@ -1,5 +1,5 @@
-Document: gnuplot
-Title: Gnuplot Documentation
+Document: gnuplot-html
+Title: Gnuplot HTML Documentation
Author: Various
Abstract: This documentation describes the gnuplot plotting system
Section: Science/Mathematics
diff --git a/debian/gnuplot-doc.doc-base.gnuplot-pdf b/debian/gnuplot-doc.doc-base.gnuplot-pdf
new file mode 100644
index 0000000..3dbb703
--- /dev/null
+++ b/debian/gnuplot-doc.doc-base.gnuplot-pdf
@@ -0,0 +1,8 @@
+Document: gnuplot-pdf
+Title: FAQ
+Author: Various
+Abstract: Frequently Asked Question
+Section: Science/Mathematics
+
+Format: PDF
+Files: /usr/share/doc/gnuplot-doc/FAQ.pdf.gz
diff --git a/debian/gnuplot-doc.docs b/debian/gnuplot-doc.docs
index 4c318b7..728c9ab 100644
--- a/debian/gnuplot-doc.docs
+++ b/debian/gnuplot-doc.docs
@@ -7,3 +7,4 @@ docs/psdoc/ps_symbols.gpi
docs/psdoc/ps_file.doc
docs/psdoc/ps_fontfile_doc.ps
docs/htmldocs
+FAQ.pdf
diff --git a/debian/gnuplot-doc.install b/debian/gnuplot-doc.install
new file mode 100644
index 0000000..304a8c9
--- /dev/null
+++ b/debian/gnuplot-doc.install
@@ -0,0 +1,3 @@
+debian/tmp/NOX/usr/share/gnuplot/gnuplot.gih usr/share/gnuplot
+debian/tmp/NOX/usr/share/gnuplot/gnuplot/ usr/share/gnuplot/gnuplot
+pm3d/contrib/* usr/share/gnuplot/pm3d
diff --git a/debian/gnuplot-nox.docs b/debian/gnuplot-nox.docs
deleted file mode 100644
index db1bbb9..0000000
--- a/debian/gnuplot-nox.docs
+++ /dev/null
@@ -1,5 +0,0 @@
-BUGS
-FAQ.pdf
-NEWS
-README
-README.1ST
diff --git a/debian/gnuplot-nox.install b/debian/gnuplot-nox.install
index 01c0771..e84c689 100644
--- a/debian/gnuplot-nox.install
+++ b/debian/gnuplot-nox.install
@@ -1,5 +1 @@
-debian/tmp/NOX/usr/share/gnuplot/gnuplot.gih usr/share/gnuplot
-debian/tmp/NOX/usr/share/man/man1/gnuplot.1 usr/share/man/man1
-debian/tmp/NOX/usr/share/gnuplot/gnuplot/ usr/share/gnuplot/gnuplot
-debian/tmp/NOX/usr/bin/ usr/bin
-pm3d/contrib/* usr/share/gnuplot/pm3d
+debian/tmp/NOX/usr/bin/ usr
diff --git a/debian/gnuplot-qt.install b/debian/gnuplot-qt.install
index b9b040f..5e8191b 100644
--- a/debian/gnuplot-qt.install
+++ b/debian/gnuplot-qt.install
@@ -1,3 +1,2 @@
-debian/tmp/QT/usr/lib/gnuplot/ usr/lib/gnuplot
-debian/tmp/QT/usr/share/man/man1/gnuplot.1 usr/share/man/man1
-debian/tmp/QT/usr/bin/gnuplot usr/bin
+debian/tmp/QT/usr/lib usr
+debian/tmp/QT/usr/bin usr
diff --git a/debian/gnuplot-nox.menu b/debian/gnuplot-qt.menu
similarity index 94%
copy from debian/gnuplot-nox.menu
copy to debian/gnuplot-qt.menu
index 43dfb91..8beb926 100644
--- a/debian/gnuplot-nox.menu
+++ b/debian/gnuplot-qt.menu
@@ -1,4 +1,4 @@
-?package(gnuplot-nox):\
+?package(gnuplot-qt):\
needs="text"\
section="Applications/Science/Mathematics"\
title="Gnuplot"\
diff --git a/debian/gnuplot-qt.postrm b/debian/gnuplot-qt.postrm
deleted file mode 100644
index e47db6d..0000000
--- a/debian/gnuplot-qt.postrm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = remove ] ; then
- dpkg-divert --remove --package gnuplot-qt --rename \
- --divert /usr/bin/gnuplot-nox /usr/bin/gnuplot
- dpkg-divert --remove --package gnuplot-qt --rename \
- --divert /usr/share/man/man1/gnuplot-nox.1.gz \
- /usr/share/man/man1/gnuplot.1.gz
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/gnuplot-qt.preinst b/debian/gnuplot-qt.preinst
deleted file mode 100644
index e59db04..0000000
--- a/debian/gnuplot-qt.preinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = install ] || [ "$1" = upgrade ] ; then
- dpkg-divert --add --package gnuplot-qt --rename \
- --divert /usr/bin/gnuplot-nox /usr/bin/gnuplot
- dpkg-divert --add --package gnuplot-qt --rename \
- --divert /usr/share/man/man1/gnuplot-nox.1.gz \
- /usr/share/man/man1/gnuplot.1.gz
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/gnuplot-x11.install b/debian/gnuplot-x11.install
index 4ed2fed..901a0a6 100644
--- a/debian/gnuplot-x11.install
+++ b/debian/gnuplot-x11.install
@@ -1,3 +1,2 @@
-debian/tmp/X11/usr/lib/gnuplot/ usr/lib/gnuplot
-debian/tmp/X11/usr/share/man/man1/gnuplot.1 usr/share/man/man1
-debian/tmp/X11/usr/bin/gnuplot usr/bin
+debian/tmp/X11/usr/lib usr
+debian/tmp/X11/usr/bin usr
diff --git a/debian/gnuplot-nox.menu b/debian/gnuplot-x11.menu
similarity index 94%
copy from debian/gnuplot-nox.menu
copy to debian/gnuplot-x11.menu
index 43dfb91..91dc391 100644
--- a/debian/gnuplot-nox.menu
+++ b/debian/gnuplot-x11.menu
@@ -1,4 +1,4 @@
-?package(gnuplot-nox):\
+?package(gnuplot-x11):\
needs="text"\
section="Applications/Science/Mathematics"\
title="Gnuplot"\
diff --git a/debian/gnuplot-x11.postrm b/debian/gnuplot-x11.postrm
deleted file mode 100644
index 2748ea5..0000000
--- a/debian/gnuplot-x11.postrm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = remove ] ; then
- dpkg-divert --remove --package gnuplot-x11 --rename \
- --divert /usr/bin/gnuplot-nox /usr/bin/gnuplot
- dpkg-divert --remove --package gnuplot-x11 --rename \
- --divert /usr/share/man/man1/gnuplot-nox.1.gz \
- /usr/share/man/man1/gnuplot.1.gz
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/gnuplot-x11.preinst b/debian/gnuplot-x11.preinst
deleted file mode 100644
index 915702d..0000000
--- a/debian/gnuplot-x11.preinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = install ] || [ "$1" = upgrade ] ; then
- dpkg-divert --add --package gnuplot-x11 --rename \
- --divert /usr/bin/gnuplot-nox /usr/bin/gnuplot
- dpkg-divert --add --package gnuplot-x11 --rename \
- --divert /usr/share/man/man1/gnuplot-nox.1.gz \
- /usr/share/man/man1/gnuplot.1.gz
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/gnuplot-nox.README.Debian b/debian/gnuplot.README.Debian
similarity index 100%
rename from debian/gnuplot-nox.README.Debian
rename to debian/gnuplot.README.Debian
diff --git a/debian/gnuplot.docs b/debian/gnuplot.docs
index db1bbb9..785f73b 100644
--- a/debian/gnuplot.docs
+++ b/debian/gnuplot.docs
@@ -1,5 +1,4 @@
BUGS
-FAQ.pdf
NEWS
README
README.1ST
diff --git a/debian/gnuplot.info b/debian/gnuplot.info
new file mode 100644
index 0000000..f611454
--- /dev/null
+++ b/debian/gnuplot.info
@@ -0,0 +1 @@
+debian/tmp/NOX/usr/share/info/
diff --git a/debian/gnuplot.manpages b/debian/gnuplot.manpages
new file mode 100644
index 0000000..44d2dd4
--- /dev/null
+++ b/debian/gnuplot.manpages
@@ -0,0 +1 @@
+debian/tmp/QT/usr/share/man/man1/gnuplot.1
diff --git a/debian/rules b/debian/rules
index 45ca11a..498cb4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --parallel
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -53,16 +53,16 @@ override_dh_auto_configure:
cd $(BUILDDIR_QT); ../../configure $(conf_opts) --enable-qt
override_dh_auto_build-arch:
- $(MAKE) -C $(BUILDDIR_NOX)/src
- $(MAKE) -C $(BUILDDIR_X11) pkglibexecdir='$$(libexecdir)'
- $(MAKE) -C $(BUILDDIR_QT) pkglibexecdir='$$(libexecdir)'
+ dh_auto_build -a -- -C $(BUILDDIR_NOX)/src
+ dh_auto_build -a -- -C $(BUILDDIR_X11) pkglibexecdir='$$(libexecdir)'
+ dh_auto_build -a -- -C $(BUILDDIR_QT) pkglibexecdir='$$(libexecdir)'
override_dh_auto_build-indep:
cp -f term/PostScript/prologue.ps docs/psdoc/
- $(MAKE) -C $(BUILDDIR_X11)/docs ps info gpcard.ps
- $(MAKE) -C $(BUILDDIR_X11)/tutorial tutorial.dvi tutorial.ps
- $(MAKE) -C $(BUILDDIR_X11)/demo
- $(MAKE) -C docs/psdoc ps_fontfile_doc.ps
+ dh_auto_build -i -- -C $(BUILDDIR_X11)/docs ps info gpcard.ps
+ dh_auto_build -i -- -C $(BUILDDIR_X11)/tutorial tutorial.dvi tutorial.ps
+ dh_auto_build -i -- -C $(BUILDDIR_X11)/demo
+ dh_auto_build -i -- -C docs/psdoc ps_fontfile_doc.ps
mkdir -p docs/htmldocs
$(MAKEINFO) --html --output=docs/htmldocs/ docs/gnuplot.texi
--
Gnuplot. Interactive plotting program
More information about the debian-science-commits
mailing list