[SCM] qtsensors packaging branch, experimental, updated. debian/5.2.1+dfsg-2-4-geb893bd

Dmitry Shachnev mitya57-guest at moszumanska.debian.org
Fri Feb 28 14:32:38 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtsensors.git;a=commitdiff;h=eb893bd

The following commit has been merged in the experimental branch:
commit eb893bd0fcdd2c33851034cbd21e6de12f7b0699
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Feb 28 18:28:15 2014 +0400

    Revert "Only run tests if nocheck has not been passed as argument."
    
    dh_auto_test already takes care of DEB_BUILD_OPTIONS=nocheck:
    
        if (get_buildoption("nocheck") || ...) {
            exit 0;
        }
    
    This reverts commit 05bdc639b9f17cc6d7865c3537c84e757def8a75.
---
 debian/changelog | 3 ---
 debian/rules     | 2 --
 2 files changed, 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 148d0f0..831ef46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,6 @@ qtsensors-opensource-src (5.2.1+dfsg-3) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Use dh_auto_test to run the tests.
 
-  [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Only run tests if nocheck has not been passed as argument.
-
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 27 Feb 2014 15:12:39 +0400
 
 qtsensors-opensource-src (5.2.1+dfsg-2) experimental; urgency=medium
diff --git a/debian/rules b/debian/rules
index 7f45608..307da60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,9 +32,7 @@ override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
 
 override_dh_auto_test:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
-endif
 
 override_dh_auto_install-arch:
 	dh_auto_install

-- 
qtsensors packaging



More information about the pkg-kde-commits mailing list