[gnuplot5] 04/05: Do not build-depend on qt5-default. (Closes: #769235)

Anton Gladky gladk at moszumanska.debian.org
Tue Nov 18 19:00:40 UTC 2014


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

gladk pushed a commit to branch master
in repository gnuplot5.

commit 87708976d76c75880118302f0b1d3baa86e20849
Author: Mattia Rizzolo <mattia at mapreri.org>
Date:   Tue Nov 18 19:17:05 2014 +0100

    Do not build-depend on qt5-default. (Closes: #769235)
    
    Use QT_SELECT=qt5 in debian/rules instead.
---
 debian/control                  | 1 -
 debian/rules                    | 3 +++
 debian/source.lintian-overrides | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 36e2e9b..6620d20 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends:
  liblua5.1-dev,
  libpango1.0-dev,
  libpng-dev,
- qt5-default,
  qtbase5-dev,
  qtbase5-dev-tools,
  qttools5-dev-tools,
diff --git a/debian/rules b/debian/rules
index eb168f7..c1eb84f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ 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
 
+# Force the use of qt5
+export QT_SELECT=qt5
+
 BUILDDIR_NOX = $(CURDIR)/debian/build-nox
 BUILDDIR_X11 = $(CURDIR)/debian/build-x11
 BUILDDIR_QT = $(CURDIR)/debian/build-qt
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 723ff8b..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# without qt5-default package FTBFSs, even if all necessary BD are installed
-gnuplot5 source: build-depends-on-metapackage build-depends: qt5-default

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



More information about the debian-science-commits mailing list