[SCM] Gnuplot. Interactive plotting program branch, master, updated. debian/4.6.0-5-4-gd572c4e

Anton Gladky gladky.anton at gmail.com
Wed Apr 25 19:42:20 UTC 2012 

The following commit has been merged in the master branch:
commit 71fd7e3192392f5fe44b94b7398df97c6cd93d6e
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed Apr 25 21:32:26 2012 +0200

    Add gnuplot-qt binary. (Closes: #670229)

diff --git a/debian/control b/debian/control
index a3a0811..1ea3afc 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/gnuplot.git
 
 Package: gnuplot
 Architecture: all
-Depends: gnuplot-nox (>= ${source:Version}), gnuplot-x11 (>= ${source:Version}), ${misc:Depends}
-Suggests: gnuplot-doc (>= ${source:Version})
+Depends: gnuplot-nox, gnuplot-x11, ${misc:Depends}
+Suggests: gnuplot-doc
 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
@@ -35,14 +35,13 @@ Description: Command-line driven interactive plotting program
 Package: gnuplot-nox
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: gnuplot (<< 4.0.0)
 Recommends: groff, ttf-liberation
-Suggests: gnuplot-x11 (>= ${binary:Version}), gnuplot-doc (>= ${source:Version})
+Suggests: gnuplot-x11, gnuplot-doc
 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
  for many printers, (La)TeX, (x)fig, Postscript, and so on. The X11-output
- is packaged in gnuplot-x11.
+ 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,
@@ -52,8 +51,9 @@ Description: Command-line driven interactive plotting program
 
 Package: gnuplot-x11
 Architecture: any
-Depends: gnuplot-nox (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: gnuplot (<< 4.0.0)
+Depends: gnuplot-nox, ${shlibs:Depends}, ${misc:Depends}
+Suggests: gnuplot-qt
+Replaces: gnuplot-qt
 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
@@ -69,6 +69,26 @@ Description: Command-line driven interactive plotting program
  packaged separately so that low-end systems don't need X installed to use
  gnuplot.
 
+Package: gnuplot-qt
+Architecture: any
+Depends: gnuplot-nox, ${shlibs:Depends}, ${misc:Depends}
+Replaces: gnuplot-X11
+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
+ 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  QT-terminal for output (not default one).
+
 Package: gnuplot-doc
 Architecture: all
 Section: doc
diff --git a/debian/gnuplot-nox.install b/debian/gnuplot-nox.install
index b5cfe46..01c0771 100644
--- a/debian/gnuplot-nox.install
+++ b/debian/gnuplot-nox.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/share/gnuplot/gnuplot.gih
-debian/tmp/usr/share/man/man1/gnuplot.1
-debian/tmp/usr/share/gnuplot/gnuplot/
-debian/build-nox/src/gnuplot usr/bin
+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
diff --git a/debian/gnuplot-qt.install b/debian/gnuplot-qt.install
new file mode 100644
index 0000000..b9b040f
--- /dev/null
+++ b/debian/gnuplot-qt.install
@@ -0,0 +1,3 @@
+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
diff --git a/debian/gnuplot-x11.postrm b/debian/gnuplot-qt.postrm
similarity index 65%
copy from debian/gnuplot-x11.postrm
copy to debian/gnuplot-qt.postrm
index 2748ea5..e47db6d 100644
--- a/debian/gnuplot-x11.postrm
+++ b/debian/gnuplot-qt.postrm
@@ -1,9 +1,9 @@
 #!/bin/sh -e
 
 if [ "$1" = remove ] ; then
-    dpkg-divert --remove --package gnuplot-x11 --rename \
+    dpkg-divert --remove --package gnuplot-qt --rename \
         --divert /usr/bin/gnuplot-nox /usr/bin/gnuplot
-    dpkg-divert --remove --package gnuplot-x11 --rename \
+    dpkg-divert --remove --package gnuplot-qt --rename \
         --divert /usr/share/man/man1/gnuplot-nox.1.gz \
         /usr/share/man/man1/gnuplot.1.gz
 fi
diff --git a/debian/gnuplot-x11.preinst b/debian/gnuplot-qt.preinst
similarity index 68%
copy from debian/gnuplot-x11.preinst
copy to debian/gnuplot-qt.preinst
index 915702d..e59db04 100644
--- a/debian/gnuplot-x11.preinst
+++ b/debian/gnuplot-qt.preinst
@@ -1,9 +1,9 @@
 #!/bin/sh -e
 
 if [ "$1" = install ] || [ "$1" = upgrade ] ; then
-    dpkg-divert --add --package gnuplot-x11 --rename \
+    dpkg-divert --add --package gnuplot-qt --rename \
         --divert /usr/bin/gnuplot-nox /usr/bin/gnuplot
-    dpkg-divert --add --package gnuplot-x11 --rename \
+    dpkg-divert --add --package gnuplot-qt --rename \
         --divert /usr/share/man/man1/gnuplot-nox.1.gz \
         /usr/share/man/man1/gnuplot.1.gz
 fi
diff --git a/debian/gnuplot-x11.install b/debian/gnuplot-x11.install
index 522f67d..4ed2fed 100644
--- a/debian/gnuplot-x11.install
+++ b/debian/gnuplot-x11.install
@@ -1,4 +1,3 @@
-debian/tmp/usr/lib/gnuplot/gnuplot_x11
-debian/tmp/usr/lib/gnuplot/gnuplot_qt
-debian/tmp/usr/share/man/man1/gnuplot.1
-debian/tmp/usr/bin/gnuplot
+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
diff --git a/debian/rules b/debian/rules
index d3657fe..45ca11a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,7 @@ CFLAGS += -I/usr/include/lua5.1
 
 BUILDDIR_NOX = $(CURDIR)/debian/build-nox
 BUILDDIR_X11 = $(CURDIR)/debian/build-x11
+BUILDDIR_QT = $(CURDIR)/debian/build-qt
 
 conf_opts += \
 	CFLAGS="$(CFLAGS)" \
@@ -47,11 +48,14 @@ override_dh_auto_configure:
 	mkdir -p $(BUILDDIR_NOX)
 	cd $(BUILDDIR_NOX);  ./../../configure $(conf_opts) --without-x --disable-wxwidgets
 	mkdir -p $(BUILDDIR_X11)
-	cd $(BUILDDIR_X11); ../../configure $(conf_opts) --enable-qt
+	cd $(BUILDDIR_X11); ../../configure $(conf_opts) --without-qt
+	mkdir -p $(BUILDDIR_QT)
+	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)'
 
 override_dh_auto_build-indep:
 	cp -f term/PostScript/prologue.ps docs/psdoc/
@@ -65,15 +69,11 @@ override_dh_auto_build-indep:
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf debian/build-nox debian/build-x11 \
+	rm -rf $(BUILDDIR_NOX) $(BUILDDIR_X11) $(BUILDDIR_QT) \
 		config.log \
 		config.hin \
 		configure \
 		src/Makefile.in \
-		debian/gnuplot \
-		debian/gnuplot-doc \
-		debian/gnuplot-nox \
-		debian/gnuplot-x11 \
 		docs/psdoc/ps_symbols.ps \
 		docs/psdoc/ps_fontfile_doc.aux \
 		docs/psdoc/ps_fontfile_doc.dvi \
@@ -88,9 +88,12 @@ override_dh_auto_clean:
 		docs/htmldocs
 
 override_dh_auto_install:
-	$(MAKE) -C $(BUILDDIR_X11) install DESTDIR=$(CURDIR)/debian/tmp/ \
+	$(MAKE) -C $(BUILDDIR_NOX) install DESTDIR=$(CURDIR)/debian/tmp/NOX/ \
+		pkglibexecdir='$$(libexecdir)'
+	$(MAKE) -C $(BUILDDIR_X11) install DESTDIR=$(CURDIR)/debian/tmp/X11/ \
+		pkglibexecdir='$$(libexecdir)'
+	$(MAKE) -C $(BUILDDIR_QT) install DESTDIR=$(CURDIR)/debian/tmp/QT/ \
 		pkglibexecdir='$$(libexecdir)'
-	chmod u-s $(CURDIR)/debian/tmp/usr/bin/gnuplot
 
 override_dh_auto_test:
 	cp -f $(BUILDDIR_X11)/demo/binary* ./demo/

-- 
Gnuplot. Interactive plotting program

More information about the debian-science-commits mailing list