[SCM] qtimageformats packaging branch, experimental, updated. debian/5.3.2-2-12-g26a822c

Dmitry Shachnev mitya57 at moszumanska.debian.org
Wed Dec 24 18:24:45 UTC 2014


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

The following commit has been merged in the experimental branch:
commit 26a822c58d1b55331a90593858600c9c8fd6097f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Dec 24 21:22:31 2014 +0300

    Revert "Re-enable build time tests."
    
    Still do not pass on some architectures, need some work and love.
    
    This reverts commit b5ecf5e324ab25f06a15ec9ea42c419a4963e185.
---
 debian/changelog | 1 -
 debian/rules     | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d946c58..7a99610 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,6 @@ qtimageformats-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
   * Drop fix_libmng_test.patch, applied upstream.
   * Build-depend on qtbase 5.4.0.
   * Update debian/copyright.
-  * Re-enable build time tests.
   * Update Vcs-Browser field to point to cgit interface.
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Add myself to Uploaders.
diff --git a/debian/rules b/debian/rules
index df32812..f7e2e3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ export QT_SELECT := qt5
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	qmake QT_BUILD_PARTS+=tests
+	qmake #QT_BUILD_PARTS+=tests
 
 override_dh_auto_install:
 	dh_auto_install
@@ -20,5 +20,5 @@ override_dh_auto_install:
 	# Remove the development stuff of the installed plugins
 	rm -rfv $(CURDIR)/debian/qt5-image-formats-plugins/usr/lib/*/cmake/
 
-override_dh_auto_test:
-	xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins
+#override_dh_auto_test:
+#	xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins

-- 
qtimageformats packaging



More information about the pkg-kde-commits mailing list