[SCM] messagelib packaging branch, debian/sid, updated. debian/16.04.3-3

[Sandro Knauß]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/messagelib.git;a=commitdiff;h=f6aed1c

The following commit has been merged in the debian/sid branch:
commit f6aed1c2e679be6aae16634c86e75d0a9b7588bc
Author: Sandro Knauß <sknauss at kde.org>
Date:   Sat Jun 17 08:34:42 2017 +0200

    Revert "Enable autotests"
    
    This reverts commit b6e4aff0551b478af4d2b8ad9f7dee2e1b0c9443.
---
 debian/changelog                              |  1 -
 debian/control                                |  9 +--------
 debian/patches/make-tests-run-optimized.patch | 12 ------------
 debian/patches/series                         |  1 -
 debian/rules                                  |  3 ++-
 5 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e375bc3..e0cc5e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,6 @@ kf5-messagelib (4:16.04.3-3~) UNRELEASED; urgency=medium
   * Build against GpgME>=1.8.0, to get rid of gpgmepp
     - Update Build-Deps (libgpgme11-dev-, libgpgmepp-dev+).
     - Add patch remove_gpgmepp.patch, to replace KF5::Gpgme with GpgME.
-  * enable autotests
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Dec 2016 13:29:10 +0100
 
diff --git a/debian/control b/debian/control
index 56c9c87..54a68ec 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,9 @@ 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 (>= 1.8),
                debhelper (>= 9),
                extra-cmake-modules (>= 5.19.0~),
                git,
-               gnupg-agent,
-               gnupg2,
-               gpgsm,
-               libgl1-mesa-dri,
                libgpgmepp-dev,
                libgrantlee5-dev (>= 5.0~),
                libkf5akonadi-dev (>= 4:5.2.0~),
@@ -47,9 +42,7 @@ Build-Depends: cmake (>= 2.8.12~),
                libqt5webkit5-dev (>= 5.4.0~),
                pkg-kde-tools (>= 0.12),
                qtbase5-dev (>= 5.4.0~),
-               qttools5-dev (>= 5.4.0~),
-               xauth,
-               xvfb
+               qttools5-dev (>= 5.4.0~)
 Standards-Version: 3.9.8
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/messagelib.git
diff --git a/debian/patches/make-tests-run-optimized.patch b/debian/patches/make-tests-run-optimized.patch
deleted file mode 100644
index 61365b7..0000000
--- a/debian/patches/make-tests-run-optimized.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/messageviewer/autotests/util.cpp
-+++ b/messageviewer/autotests/util.cpp
-@@ -23,7 +23,8 @@
- KMime::Message::Ptr readAndParseMail(const QString &mailFile)
- {
-     QFile file(QLatin1String(MAIL_DATA_DIR) + QLatin1Char('/') + mailFile);
--    Q_ASSERT(file.open(QIODevice::ReadOnly));
-+    bool ret = file.open(QIODevice::ReadOnly);
-+    Q_ASSERT(ret);
-     const QByteArray data = KMime::CRLFtoLF(file.readAll());
-     Q_ASSERT(!data.isEmpty());
-     KMime::Message::Ptr msg(new KMime::Message);
diff --git a/debian/patches/series b/debian/patches/series
index 8797b4a..ff094f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 upstream_add_copying_files.patch
 make-it-impossible-to-override-css-settings-from-a-h.patch
 remove_gpgmepp.patch
-make-tests-run-optimized.patch
diff --git a/debian/rules b/debian/rules
index 70c5e1e..9ca54cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,4 +3,5 @@
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_auto_test:
-	- xvfb-run -- dbus-run-session -- dh_auto_test --no-parallel
+	# Disable dh_auto_test at build time
+	:

-- 
messagelib packaging