[SCM] qtquickcontrols packaging branch, master, updated. debian/5.2.1-2-3-g0bf5a65
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Wed Mar 26 11:20:12 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtquickcontrols.git;a=commitdiff;h=0bf5a65
The following commit has been merged in the master branch:
commit 0bf5a65232711d7264baf218080711db6a30b285
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Wed Mar 26 08:18:33 2014 -0300
Revert "Run tests during build."
This reverts commit 975c45d5fced6a7418cdbc127c0828fda02686d9.
Currently tests are failing and we need to get the transition done, so let's go
back to not having test *just for now*.
---
debian/changelog | 2 --
debian/control | 4 +---
debian/rules | 5 +----
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9cbab0a..933d829 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,5 @@
qtquickcontrols-opensource-src (5.2.1-3) UNRELEASED; urgency=medium
- [ Dmitry Shachnev ]
- * Run tests during build.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 02 Mar 2014 15:20:28 +0400
diff --git a/debian/control b/debian/control
index ff3e478..8aeaed6 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,7 @@ Build-Depends: debhelper (>= 9),
dpkg-dev (>= 1.16.1),
pkg-kde-tools,
qtbase5-private-dev (>= 5.2.1+dfsg~),
- qtdeclarative5-private-dev (>= 5.2.1~),
- xauth,
- xvfb
+ qtdeclarative5-private-dev (>= 5.2.1~)
Build-Depends-Indep: libqt5sql5-sqlite (>= 5.2.1+dfsg~),
qttools5-dev-tools (>= 5.2.1~)
Standards-Version: 3.9.5
diff --git a/debian/rules b/debian/rules
index 805227f..65b86df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,10 +16,7 @@ override_dh_auto_clean:
rm -rf doc src/controls/controls.qrc
override_dh_auto_configure:
- qmake QT_BUILD_PARTS+=tests
-
-override_dh_auto_test:
- xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins
+ qmake
override_dh_auto_build-indep:
dh_auto_build -Smakefile -- docs
--
qtquickcontrols packaging
More information about the pkg-kde-commits
mailing list