[SCM] KDE PIM module packaging branch, master, updated. debian/4.13.3-2-8-g1ba1a0d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim.git;a=commitdiff;h=7386e53

The following commit has been merged in the master branch:
commit 7386e538e2a1f80654d82911e519ae145f347e49
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Aug 24 20:08:31 2014 +0200

    Refresh patches.
---
 debian/changelog                                            |  1 +
 debian/patches/disable_has_focus_tests_failed_in_xvfb.patch | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b46ff5..c838e6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kdepim (4:4.14.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update build dependencies.
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 24 Aug 2014 20:04:09 +0200
 
diff --git a/debian/patches/disable_has_focus_tests_failed_in_xvfb.patch b/debian/patches/disable_has_focus_tests_failed_in_xvfb.patch
index a0ae942..f51c8f6 100644
--- a/debian/patches/disable_has_focus_tests_failed_in_xvfb.patch
+++ b/debian/patches/disable_has_focus_tests_failed_in_xvfb.patch
@@ -1,8 +1,8 @@
 Index: kdepim/messageviewer/tests/todoedittest.cpp
 ===================================================================
---- kdepim.orig/messageviewer/tests/todoedittest.cpp	2014-05-22 13:33:09.498114548 +0200
-+++ kdepim/messageviewer/tests/todoedittest.cpp	2014-05-22 13:36:09.263177735 +0200
-@@ -301,7 +301,7 @@
+--- kdepim.orig/messageviewer/tests/todoedittest.cpp	2014-08-24 20:07:37.326307657 +0200
++++ kdepim/messageviewer/tests/todoedittest.cpp	2014-08-24 20:07:37.322307818 +0200
+@@ -308,7 +308,7 @@
      QTest::qWaitForWindowShown(&edit);
      QLineEdit *noteedit = qFindChild<QLineEdit *>(&edit, QLatin1String("noteedit"));
      noteedit->setFocus();
@@ -11,7 +11,7 @@ Index: kdepim/messageviewer/tests/todoedittest.cpp
      QTest::keyPress(&edit, Qt::Key_Escape);
      QCOMPARE(edit.isVisible(), false);
  }
-@@ -347,11 +347,11 @@
+@@ -368,11 +368,11 @@
      msg->subject(true)->fromUnicodeString(subject, "us-ascii");
      edit.setMessage(msg);
      QLineEdit *noteedit = qFindChild<QLineEdit *>(&edit, QLatin1String("noteedit"));
@@ -26,7 +26,7 @@ Index: kdepim/messageviewer/tests/todoedittest.cpp
  }
  
  
-@@ -388,7 +388,7 @@
+@@ -409,7 +409,7 @@
      msg->subject(true)->fromUnicodeString(subject, "us-ascii");
      edit.setMessage(msg);
      QLineEdit *noteedit = qFindChild<QLineEdit *>(&edit, QLatin1String("noteedit"));
@@ -34,4 +34,4 @@ Index: kdepim/messageviewer/tests/todoedittest.cpp
 +    // QCOMPARE(noteedit->hasFocus(), true);
  }
  
- QTEST_KDEMAIN( TodoEditTest, GUI )
+ void TodoEditTest::shouldShowMessageWidget()

-- 
KDE PIM module packaging