[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.12.4-1-10-g26eac5c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a730baaa31eef9a961a045fee257f48aed78d44d
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri May 16 18:32:11 2014 +0200

    New upstream patch: upstream-make_include_style_be_the_same_for_QtCore.patch (Closes: #748147)
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 +
 ...make_include_style_be_the_same_for_QtCore.patch | 22 ++++++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cc1da91..98c10c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ kde4libs (4:4.13.1-1) UNRELEASED; urgency=medium
   * Remove patch: kstringhandlertest_fix.diff, applied upstream.
   * Update symbols for 4.12.4 versions.
   * Update symbols files.
+  * New upstream patch: upstream-
+    make_include_style_be_the_same_for_QtCore.patch (Closes: #748147)
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 14 May 2014 19:42:21 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index f61e155..e3ad251 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ kde4libs_interpret_qvarianttype_as_qmetatypetype.diff
 debian_standardsdirtest.diff
 disable_bogus_test.diff
 disable_bogus_tests
+upstream-make_include_style_be_the_same_for_QtCore.patch
diff --git a/debian/patches/upstream-make_include_style_be_the_same_for_QtCore.patch b/debian/patches/upstream-make_include_style_be_the_same_for_QtCore.patch
new file mode 100644
index 0000000..c290624
--- /dev/null
+++ b/debian/patches/upstream-make_include_style_be_the_same_for_QtCore.patch
@@ -0,0 +1,22 @@
+commit 96250267bd7c22b47ca93084112c97e722b18c54
+Author: Sune Vuorela <sune at vuorela.dk>
+Date:   Fri May 16 18:26:06 2014 +0200
+
+    Make include style be the same for QtCore includes
+    
+    As a side effect, it also fixes a build for some pieces of software
+    that built in the past, but doesn't build now.
+
+diff --git a/kio/kio/global.h b/kio/kio/global.h
+index 8a46ae6..7613722 100644
+--- a/kio/kio/global.h
++++ b/kio/kio/global.h
+@@ -26,7 +26,7 @@
+ #include <QtCore/QMap>
+ #include <QtCore/QList>
+ #include <QtCore/QVariant>
+-#include <QFile>  // for QFile::Permissions
++#include <QtCore/QFile>  // for QFile::Permissions
+ 
+ #include <kiconloader.h>
+ #include <QtGui/QPixmap> // for pixmapForUrl

-- 
KDE Development Platform Libraries module packaging