[gnuplot] 01/04: Disable wxt-terminal. (Closes: #750045)

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository gnuplot.

commit 4d677294b51e6870e83cde58cfefa4ecea94a71c
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Jun 4 22:46:01 2014 +0200

    Disable wxt-terminal. (Closes: #750045)
---
 debian/NEWS                                        | 10 +++++++++
 debian/control                                     |  1 -
 debian/patches/08_do_not_set_qt_default_term.patch | 26 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  6 ++---
 5 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..05dc81f
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,10 @@
+
+gnuplot (4.6.5-4) unstable; urgency=medium
+
+  We stop to provide wxt-terminal because wxwidgets 3.0 is not compatible
+  with gnuplot [1], [2]. wxt-terminal will be enabled again if the bug will be fixed.
+
+  [1] https://sourceforge.net/p/gnuplot/bugs/1401
+  [2] https://bugs.debian.org/750045
+
+ -- Anton Gladky <gladk at debian.org>  Fri, 30 May 2014 07:40:33 +0200
diff --git a/debian/control b/debian/control
index 219e54e..f2cacab 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends:
  libpango1.0-dev,
  libpng-dev,
  libqt4-dev (>=4:4.5),
- libwxgtk3.0-dev,
  libx11-dev,
  libxt-dev,
  pkg-config,
diff --git a/debian/patches/08_do_not_set_qt_default_term.patch b/debian/patches/08_do_not_set_qt_default_term.patch
deleted file mode 100644
index e948773..0000000
--- a/debian/patches/08_do_not_set_qt_default_term.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Decrease the priority of qt-terminal to be set as "default"
-Author: Anton Gladky <gladky.anton at gmail.com>
-Bug-Debian: http://bugs.debian.org/668955
-Last-Update: 2012-04-16
-
---- a/src/term.c
-+++ b/src/term.c
-@@ -1774,14 +1774,14 @@
- 	    term_name = "sun";
- #endif /* SUN */
- 
--#ifdef QTTERM
-+#ifdef WXWIDGETS
- 	if (term_name == (char *) NULL)
--		term_name = "qt";
-+		term_name = "wxt";
- #endif
- 
--#ifdef WXWIDGETS
-+#ifdef QTTERM
- 	if (term_name == (char *) NULL)
--		term_name = "wxt";
-+		term_name = "qt";
- #endif
- 
- #ifdef _Windows
diff --git a/debian/patches/series b/debian/patches/series
index 932e7d9..4d8fb88 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 04_fix_libexecdir.diff
 05_default_gd_font.diff
-08_do_not_set_qt_default_term.patch
 09_force_texinfo.patch
diff --git a/debian/rules b/debian/rules
index 0938037..67a803f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,11 +30,11 @@ conf_opts += \
 
 override_dh_auto_configure:
 	mkdir -p $(BUILDDIR_NOX)
-	cd $(BUILDDIR_NOX);  ./../../configure $(conf_opts) --without-x --disable-wxwidgets
+	cd $(BUILDDIR_NOX);  ./../../configure $(conf_opts) --without-x --disable-wxwidgets --disable-wxt
 	mkdir -p $(BUILDDIR_X11)
-	cd $(BUILDDIR_X11); ../../configure $(conf_opts) --without-qt
+	cd $(BUILDDIR_X11); ../../configure $(conf_opts) --without-qt --disable-wxt
 	mkdir -p $(BUILDDIR_QT)
-	cd $(BUILDDIR_QT); ../../configure $(conf_opts)  --enable-qt
+	cd $(BUILDDIR_QT); ../../configure $(conf_opts)  --enable-qt --disable-wxt
 
 override_dh_auto_build-arch:
 	dh_auto_build -a -- -C $(BUILDDIR_NOX)/src

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gnuplot.git