[gnuplot] 01/04: Remove gnuplot4 binaries in favor of gnuplot5. Let gnuplot be virtual package only.
Anton Gladky
gladk at moszumanska.debian.org
Tue May 31 20:05:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gnuplot.
commit 701337bf2e71dddace67c067f11266de2fb5dcbf
Author: Anton Gladky <gladk at debian.org>
Date: Tue May 31 21:28:05 2016 +0200
Remove gnuplot4 binaries in favor of gnuplot5. Let gnuplot be virtual package only.
---
debian/control | 162 +--------------------------------------------------------
debian/rules | 85 +-----------------------------
2 files changed, 2 insertions(+), 245 deletions(-)
diff --git a/debian/control b/debian/control
index cd6a018..0172cdf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,26 +4,7 @@ Uploaders: Anton Gladky <gladk at debian.org>
Section: math
Testsuite: autopkgtest
Priority: optional
-Build-Depends: autoconf,
- automake,
- debhelper (>= 9),
- dh-autoreconf,
- libcairo2-dev,
- libedit-dev,
- libgd2-dev,
- liblua5.1-dev,
- libpango1.0-dev,
- libpng-dev,
- libqt4-dev,
- libx11-dev,
- libxt-dev,
- pkg-config,
- texinfo,
- texlive-fonts-recommended,
- texlive-latex-base,
- texlive-latex-extra,
- texlive-latex-recommended,
- zlib1g-dev
+Build-Depends: debhelper
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/gnuplot.git
Vcs-Git: git://anonscm.debian.org/debian-science/packages/gnuplot.git
@@ -33,10 +14,6 @@ Package: gnuplot
Architecture: all
Depends: gnuplot5-qt | gnuplot5-x11 | gnuplot5-nox,
${misc:Depends}
-Suggests: feedgnuplot,
- gnuplot-doc,
- libgnuplot-iostream-dev,
- python-gnuplot
Description: Command-line driven interactive plotting program
Gnuplot is a portable command-line driven interactive data and function
plotting utility that supports lots of output formats, including drivers
@@ -49,140 +26,3 @@ Description: Command-line driven interactive plotting program
.
This package is for transition and to install a full-featured gnuplot
supporting the X11-output.
-
-Package: gnuplot-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-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
- is packaged in gnuplot-x11.
- .
- Data files and self-defined functions can be manipulated by the internal
- C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
- and can work with complex numbers.
- .
- This package contains the additional documentation.
-
-Package: gnuplot-nox
-Architecture: any
-Depends: gnuplot-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: fonts-liberation,
- groff
-Suggests: gnuplot-doc
-Conflicts: gnuplot-qt,
- gnuplot-x11
-Replaces: gnuplot-qt,
- gnuplot-x11
-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
- is packaged in gnuplot-x11. The QT-output is packaged in gnuplot-qt.
- .
- Data files and self-defined functions can be manipulated by the internal
- C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
- and can work with complex numbers.
- .
- This package is for working without an X server.
-
-Package: gnuplot-qt
-Architecture: any
-Depends: gnuplot-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Suggests: gnuplot-doc
-Conflicts: gnuplot-x11,
- gnuplot-nox
-Provides: gnuplot-nox,
- gnuplot-x11
-Replaces: gnuplot-x11,
- gnuplot-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
- for many printers, (La)TeX, (x)fig, Postscript, and so on.
- .
- Data files and self-defined functions can be manipulated by the internal
- C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
- and can work with complex numbers.
- .
- This package contains the terminal driver that enables gnuplot to plot
- images interactively under X11. Most users will want this, it is however
- packaged separately so that low-end systems don't need X installed to use
- gnuplot.
- .
- The package provides gnuplot-x11 and gnuplot-nox terminals plus an
- additional QT-terminal for output (not default one).
-
-Package: gnuplot-x11
-Architecture: any
-Depends: gnuplot-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Suggests: gnuplot-doc
-Conflicts: gnuplot-qt,
- gnuplot-nox
-Provides: gnuplot-nox
-Replaces: gnuplot-qt,
- 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
- for many printers, (La)TeX, (x)fig, Postscript, and so on. The X11-output
- is packaged in gnuplot-x11.
- .
- Data files and self-defined functions can be manipulated by the internal
- C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
- and can work with complex numbers.
- .
- This package contains the terminal driver that enables gnuplot to plot
- images interactively under X11. Most users will want this, it is however
- packaged separately so that low-end systems don't need X installed to use
- gnuplot.
-
-Package: gnuplot-tex
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Breaks: gnuplot-nox (<< 4.6.5-5),
- gnuplot-qt (<< 4.6.5-5),
- gnuplot-x11 (<< 4.6.5-5)
-Description: Command-line driven interactive plotting program. Tex-files
- 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
- is packaged in gnuplot-x11.
- .
- Data files and self-defined functions can be manipulated by the internal
- C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
- and can work with complex numbers.
- .
- This package contains tex-files which are used by both gnuplot v4 and v5.
-
-Package: gnuplot-data
-Architecture: all
-Section: doc
-Depends: aglfn,
- gnuplot-tex,
- ${misc:Depends}
-Breaks: gnuplot-nox (<< 4.6.5-5),
- gnuplot-qt (<< 4.6.5-5),
- gnuplot-x11 (<< 4.6.5-5),
- gnuplot (<< 4.6.5-9)
-Replaces: gnuplot (<< 4.6.5-9)
-Description: Command-line driven interactive plotting program. Data-files
- 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
- is packaged in gnuplot-x11.
- .
- Data files and self-defined functions can be manipulated by the internal
- C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
- and can work with complex numbers.
- .
- This package contains data-files which are used by -nox, -x11 and -qt.
diff --git a/debian/rules b/debian/rules
index 6a4eff8..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,87 +1,4 @@
#!/usr/bin/make -f
%:
- dh $@ --parallel --with autoreconf
-
-export DEB_BUILD_MAINT_OPTIONS := hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-# Tell compiler where should find lua headers
-export DEB_CFLAGS_MAINT_APPEND = -I/usr/include/lua5.1
-
-BUILDDIR_NOX = $(CURDIR)/debian/build-nox
-BUILDDIR_X11 = $(CURDIR)/debian/build-x11
-BUILDDIR_QT = $(CURDIR)/debian/build-qt
-MANPNOX = $(CURDIR)/debian/gnuplot-nox/usr/share/man/man1/gnuplot4-nox.1
-
-conf_opts += \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --libexecdir=\$${prefix}/lib/gnuplot \
- --datadir=\$${prefix}/share/gnuplot \
- --with-gihdir=\$${prefix}/share/gnuplot \
- --without-lasergnu \
- --with-png \
- --with-gd \
- --without-lisp-files \
- --without-linux-vga \
- --with-readline=bsd
-
-override_dh_auto_configure:
- mkdir -p $(BUILDDIR_NOX)
- cd $(BUILDDIR_NOX); ./../../configure $(conf_opts) --without-x --disable-wxwidgets --disable-wxt
- mkdir -p $(BUILDDIR_X11)
- cd $(BUILDDIR_X11); ../../configure $(conf_opts) --without-qt --disable-wxt
- mkdir -p $(BUILDDIR_QT)
- cd $(BUILDDIR_QT); ../../configure $(conf_opts) --enable-qt --disable-wxt
-
-override_dh_auto_build:
- dh_auto_build -- -C $(BUILDDIR_NOX)/src
- dh_auto_build -- -C $(BUILDDIR_X11) pkglibexecdir='$$(libexecdir)'
- dh_auto_build -- -C $(BUILDDIR_QT) pkglibexecdir='$$(libexecdir)'
- cp -f term/PostScript/prologue.ps docs/psdoc/
- dh_auto_build -- -C $(BUILDDIR_X11)/docs ps info gpcard.ps
- dh_auto_build -- -C $(BUILDDIR_X11)/tutorial tutorial.dvi tutorial.ps
- dh_auto_build -- -C $(BUILDDIR_X11)/demo
- dh_auto_build -- -C docs/psdoc ps_fontfile_doc.ps
- mkdir -p docs/htmldocs
- $(MAKEINFO) --html --force --output=docs/htmldocs/ docs/gnuplot.texi
-
-override_dh_auto_install:
- $(MAKE) -C $(BUILDDIR_NOX) install DESTDIR=$(CURDIR)/debian/tmp/NOX/ \
- 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/
- cd demo; $(BUILDDIR_NOX)/src/gnuplot all.dem </dev/null
-
-override_dh_installinfo:
- dh_installinfo -pgnuplot-doc $(BUILDDIR_X11)/docs/gnuplot.info*
-
-override_installchangelogs:
- dh_installchangelogs -pgnuplot-doc ChangeLog
-
-override_dh_compress-indep:
- dh_compress -Xall.dem
- cd debian/gnuplot-doc/usr/share/doc/gnuplot-doc/examples/; patch -p1 < $(CURDIR)/debian/fix_examples/fix_examples.diff
-
-override_dh_installman-arch:
- dh_installman
- # Fix manpage for nox-version. (Closes: #744218)
- sed -i 's/\[X11 options\] //g' $(MANPNOX)
- sed -i 's/plotting program/plotting program (no-X version)/g' $(MANPNOX)
- sed -i '/SH\ X11\ OPTIONS/,/command line\./ d' $(MANPNOX)
+ dh $@
--
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