[SCM] Gnuplot. Interactive plotting program branch, master, updated. debian/4.6.0-3-2-g0598904

Anton Gladky gladky.anton at gmail.com
Sun Apr 8 20:31:19 UTC 2012


The following commit has been merged in the master branch:
commit 05989046600f26c481d8b8adeab8e0d80cd8c1cc
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Apr 8 22:31:12 2012 +0200

    Enable qt-terminal. (Closes: #667760)

diff --git a/debian/control b/debian/control
index 73f1af2..a3a0811 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 8.9.10), libpng-dev, libx11-dev, libxt-dev,
  pkg-config, texinfo (>= 4.8), 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
+ libpango1.0-dev, libedit-dev (>= 2.11-20080614-2), autoconf, automake,
+ libqt4-dev (>=4:4.5)
 Homepage: http://gnuplot.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/gnuplot.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/gnuplot.git
diff --git a/debian/gnuplot-x11.install b/debian/gnuplot-x11.install
index cf9a209..522f67d 100644
--- a/debian/gnuplot-x11.install
+++ b/debian/gnuplot-x11.install
@@ -1,3 +1,4 @@
 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
diff --git a/debian/rules b/debian/rules
index 5461ed2..6178163 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ 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)
+	cd $(BUILDDIR_X11); ../../configure $(conf_opts) --enable-qt
 
 override_dh_auto_build-arch:
 	$(MAKE) -C $(BUILDDIR_NOX)/src

-- 
Gnuplot. Interactive plotting program



More information about the debian-science-commits mailing list