[SCM] baloo packaging branch, master, updated. debian/5.13.0-1-4-g777413e
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Sep 9 07:33:41 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/baloo.git;a=commitdiff;h=cd4927f
The following commit has been merged in the master branch:
commit cd4927f4b438194027481f80cf99959ad9a12cf3
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Sep 9 00:49:15 2015 +0200
Release to unstable.
---
debian/changelog | 3 ++-
debian/control | 5 +----
debian/rules | 4 ++--
debian/tests/control | 6 +++---
debian/tests/testsuite | 3 ++-
5 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1cec121..75c3a89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
baloo-kf5 (5.13.0-2~) UNRELEASED; urgency=medium
- *
+ * Move auto test to autopkgtests.
+ * Release to unstable.
-- Maximiliano Curia <maxy at debian.org> Wed, 09 Sep 2015 00:45:27 +0200
diff --git a/debian/control b/debian/control
index ace3685..7284a78 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.12),
- dbus-x11,
debhelper (>= 9),
extra-cmake-modules (>= 5.13.0~),
kio-dev (>= 5.13.0~),
@@ -20,9 +19,7 @@ Build-Depends: cmake (>= 2.8.12),
libxapian-dev,
pkg-kde-tools (>= 0.15.18~),
qtbase5-dev (>= 5.4),
- qtdeclarative5-dev (>= 5.4),
- xauth,
- xvfb
+ qtdeclarative5-dev (>= 5.4)
Standards-Version: 3.9.6
Homepage: https://projects.kde.org/projects/frameworks/baloo
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/baloo.git
diff --git a/debian/rules b/debian/rules
index acd207b..93aa71c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,8 @@ override_dh_strip:
$(overridden_command) --dbg-package=baloo-kf5-dbg
override_dh_auto_test:
- HOME=$$(mktemp -d) xvfb-run -a --server-args="-screen 0 1024x768x24" \
- dbus-launch --exit-with-session dh_auto_test
+ # Disable auto tests at build time
+ :
BINARY_VERSION_NO_EPOCH := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(\([[:digit:]]\+\):\)\?//')
diff --git a/debian/tests/control b/debian/tests/control
index d9b40f1..c2abe22 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
-# Tests: testsuite
-# Depends: @, @builddeps@, build-essential
-# Restrictions: build-needed
+Tests: testsuite
+Depends: @, @builddeps@, build-essential, dbus-x11, xauth, xvfb
+Restrictions: build-needed
Tests: acc
Depends: @, dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index dabe645..4b3d84a 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,3 +1,4 @@
#!/bin/sh
-dh_auto_test
+HOME=$(mktemp -d) xvfb-run -a --server-args="-screen 0 1024x768x24" \
+ dbus-launch --exit-with-session dh_auto_test
--
baloo packaging
More information about the pkg-kde-commits
mailing list