[SCM] krecipes packaging branch, master, updated. upstream/2.0_beta2-31-g3524c95

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/krecipes.git;a=commitdiff;h=3524c95

The following commit has been merged in the master branch:
commit 3524c9588cab5910ae088d8559f6e957150a3a8b
Author: Pino Toscano <pino at debian.org>
Date:   Sun Nov 29 10:58:13 2015 +0100

    disable tests again
    
    it seems some need a full-blown session, which is not ideal to setup in
    buildds.
    
    This reverts commit 8dd0c6226f8b59107e7027f46ec3a16f45786f99 and
    commit f4b8557b726211495849d78e1fe687ce8e2304d6.
---
 debian/changelog | 3 +--
 debian/control   | 3 +--
 debian/rules     | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a906d46..aaec113 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,7 @@ krecipes (2.1.0-0r1) UNRELEASED; urgency=medium
     - use the dh sequencer in rules, using the kde addon, with parallel build,
       and in as-needed mode
     - drop the cdbs build dependency
-    - run the tests under xvfb-run: add the xvfb and xauth build dependencies
-      for this
+    - do not run the tests for now, some of them fail
   * Update the Vcs-* headers.
   * Bump Standards-Version to 3.9.6, no changes required.
   * Update watch file to look also on download.kde.org.
diff --git a/debian/control b/debian/control
index 929647c..fbf4b9c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,7 @@ Uploaders: Matthias Julius <mdeb at julius-net.net>,
  José Manuel Santamaría Lema <panfaust at gmail.com>
 Build-Depends: debhelper (>= 9), cmake, pkg-kde-tools, pkg-config,
  kdelibs5-dev, libxml2-dev, libxslt1-dev,
- libqtwebkit-dev, shared-mime-info,
- xvfb, xauth,
+ libqtwebkit-dev, shared-mime-info
 Standards-Version: 3.9.6
 Homepage: http://krecipes.sourceforge.net/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/krecipes.git
diff --git a/debian/rules b/debian/rules
index 4a10e43..113f3c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,10 +8,9 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 override_dh_strip:
 	dh_strip --dbg-package=krecipes-dbg
 
-override_dh_auto_test:
-	xvfb-run dh_auto_test
-
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]
 	@@dpatch-get-origtargz ../tarballs
+
+override_dh_auto_test:

-- 
krecipes packaging