[SCM] kmime packaging branch, master, updated. debian/15.08.2-1-36-g65f21eb

Maximiliano Curia maxy at moszumanska.debian.org
Fri May 6 17:58:51 UTC 2016


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

The following commit has been merged in the master branch:
commit c7dca9be022e4f8372dfbcd3343ef240e8019c70
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Thu Apr 21 00:55:15 2016 +0200

    Refresh patches
---
 debian/patches/disable_failing_tests | 17 +++++++++++++----
 debian/patches/missing_headers       | 15 ++++++++++++---
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/debian/patches/disable_failing_tests b/debian/patches/disable_failing_tests
index bbf0894..2b7b7eb 100644
--- a/debian/patches/disable_failing_tests
+++ b/debian/patches/disable_failing_tests
@@ -1,8 +1,17 @@
-Index: kmime/autotests/dateformattertest.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 21 Apr 2016 00:55:13 +0200
+Subject: disable_failing_tests
+
 ===================================================================
---- kmime.orig/autotests/dateformattertest.cpp	2015-09-07 23:12:04.590831316 +0200
-+++ kmime/autotests/dateformattertest.cpp	2015-09-08 13:07:39.582519365 +0200
-@@ -37,10 +37,10 @@
+---
+ autotests/dateformattertest.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/autotests/dateformattertest.cpp b/autotests/dateformattertest.cpp
+index c3e352f..25d054b 100644
+--- a/autotests/dateformattertest.cpp
++++ b/autotests/dateformattertest.cpp
+@@ -37,10 +37,10 @@ private Q_SLOTS:
  
          auto dt = QDateTime::currentDateTime();
          dt.setTime(QTime(12, 34, 56));
diff --git a/debian/patches/missing_headers b/debian/patches/missing_headers
index cea31cd..f6924de 100644
--- a/debian/patches/missing_headers
+++ b/debian/patches/missing_headers
@@ -1,7 +1,16 @@
-Index: kmime/includes/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 21 Apr 2016 00:55:13 +0200
+Subject: missing_headers
+
 ===================================================================
---- kmime.orig/includes/CMakeLists.txt	2016-01-27 21:16:26.741764242 +0100
-+++ kmime/includes/CMakeLists.txt	2016-01-27 21:16:47.012937970 +0100
+---
+ includes/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
+index 6d3eeff..dd30706 100644
+--- a/includes/CMakeLists.txt
++++ b/includes/CMakeLists.txt
 @@ -1,7 +1,6 @@
  # The KMime headers names are prepended with kmime_ to avoid name clashes.
  # We can't use ecm_generate_headers if the CamelCase header doesn't match the filename

-- 
kmime packaging



More information about the pkg-kde-commits mailing list