[SCM] qttools packaging branch, master, updated. debian/5.9.2-3-2-g8cc4d7c
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Mon Nov 6 19:31:25 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qttools.git;a=commitdiff;h=8cc4d7c
The following commit has been merged in the master branch:
commit 8cc4d7c4bd70ecc29396538cb1513858626a9148
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Mon Nov 6 16:31:04 2017 -0300
Do not override dh_auto_configure anymore.
---
debian/changelog | 3 +++
debian/control | 2 +-
debian/rules | 5 -----
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 720bb1a..41436cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
qttools-opensource-src (5.9.2-4) UNRELEASED; urgency=medium
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Do not override dh_auto_configure anymore.
+ Require debhelper >= 10.9.2~ (Closes: #880937).
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 06 Nov 2017 16:27:47 -0300
diff --git a/debian/control b/debian/control
index 5886385..7704671 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
Felix Geyer <fgeyer at debian.org>,
Timo Jyrinki <timo at debian.org>,
Dmitry Shachnev <mitya57 at debian.org>
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 10.9.2~),
libqt5opengl5-dev (>= 5.9.2+dfsg~),
libqt5sql5-sqlite (>= 5.9.2+dfsg~),
libqt5webkit5-dev (>= 5.9.2~) [!alpha !m68k !sh4],
diff --git a/debian/rules b/debian/rules
index cb2cad1..8423d97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,11 +16,6 @@ no_qwebview_archs := alpha sh4 m68k
%:
dh $@ --with pkgkde_symbolshelper
-# We override qmake until https://bugreports.qt.io/browse/QTBUG-30735
-# gets solved (FTBFS with -nocache).
-override_dh_auto_configure:
- qmake
-
override_dh_auto_clean:
dh_auto_clean
rm -fv .qmake.cache
--
qttools packaging
More information about the pkg-kde-commits
mailing list