[SCM] qtbase packaging branch, experimental, updated. debian/5.3.1+dfsg-5-12-g2b19391

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=2b19391

The following commit has been merged in the experimental branch:
commit 2b19391dab21ba605b52fb59cc89253b3c6465da
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Sep 16 09:55:54 2014 -0300

    Refresh patches.
---
 debian/changelog                           | 1 +
 debian/patches/gnukfreebsd.diff            | 8 +++++++-
 debian/patches/remove_google_adsense.patch | 6 +++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e88253..f577b8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qtbase-opensource-src (5.3.2+dfsg-1) UNRELEASED; urgency=medium
       fix.
     - Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch.
     - cmake_dont_check_existence_of_gl_filesin_qt5gui.patch.
+  * Refresh patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 07 Sep 2014 14:58:47 +0400
 
diff --git a/debian/patches/gnukfreebsd.diff b/debian/patches/gnukfreebsd.diff
index e18b88f..e7849f0 100644
--- a/debian/patches/gnukfreebsd.diff
+++ b/debian/patches/gnukfreebsd.diff
@@ -5,6 +5,12 @@ Description: Initial GNU/kFreeBSD support
 Last-Update: 2013-12-21
 Forwarded: no
 
+---
+ mkspecs/features/qt_functions.prf       |    2 
+ mkspecs/gnukfreebsd-g++/qmake.conf      |   52 ++++++++++++++++++
+ mkspecs/gnukfreebsd-g++/qplatformdefs.h |   92 ++++++++++++++++++++++++++++++++
+ 3 files changed, 146 insertions(+)
+
 --- /dev/null
 +++ b/mkspecs/gnukfreebsd-g++/qmake.conf
 @@ -0,0 +1,52 @@
@@ -157,7 +163,7 @@ Forwarded: no
 +#endif // QPLATFORMDEFS_H
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -259,6 +259,8 @@ defineTest(qtAddTargetEnv) {
+@@ -265,6 +265,8 @@ defineTest(qtAddTargetEnv) {
              deppath.name = PATH
          } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) {
              deppath.name = LD_LIBRARY_PATH
diff --git a/debian/patches/remove_google_adsense.patch b/debian/patches/remove_google_adsense.patch
index 0f37532..bbad7fb 100644
--- a/debian/patches/remove_google_adsense.patch
+++ b/debian/patches/remove_google_adsense.patch
@@ -2,6 +2,10 @@ Description: remove tracking javascript from examples
 Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 Last-Update: 2014-02-17
 
+---
+ examples/xml/htmlinfo/trolltech_com.html |   45 -------------------------------
+ 1 file changed, 45 deletions(-)
+
 --- a/examples/xml/htmlinfo/trolltech_com.html
 +++ b/examples/xml/htmlinfo/trolltech_com.html
 @@ -23,14 +23,6 @@
@@ -19,7 +23,7 @@ Last-Update: 2014-02-17
          <base href="http://trolltech.com/homepage" />
        
      
-@@ -913,43 +905,6 @@
+@@ -910,43 +902,6 @@ are here:</span>
      </div>
        
      </div>

-- 
qtbase packaging