[SCM] qtbase packaging branch, master, updated. debian/5.1.0+dfsg-5-6-g61f4e32

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 1b07ba9d636c1b2ab36d81d7d0e4efb73f076167
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Aug 28 10:58:59 2013 -0300

    Remove Dont_check_for_the_existence_of_priv_inc_dirs.patch
    
    Applied upstream.
---
 debian/changelog                                   |    4 +-
 ..._check_for_the_existence_of_priv_inc_dirs.patch |   64 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 3 insertions(+), 66 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 28fb6f5..4bf467e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,9 @@ qtbase-opensource-src (5.1.1+dfsg-1) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
-  * Remove deppath_gnu.diff, the fix is now included upstream.
+  * Remove patches applied upstresm:
+    - deppath_gnu.diff, the fix is now included upstream.
+    - Dont_check_for_the_existence_of_priv_inc_dirs.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 28 Aug 2013 10:47:33 -0300
 
diff --git a/debian/patches/Dont_check_for_the_existence_of_priv_inc_dirs.patch b/debian/patches/Dont_check_for_the_existence_of_priv_inc_dirs.patch
deleted file mode 100644
index d751043..0000000
--- a/debian/patches/Dont_check_for_the_existence_of_priv_inc_dirs.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From ed90bd61f77549e3e896388682596017441a1172 Mon Sep 17 00:00:00 2001
-From: Stephen Kelly <stephen.kelly at kdab.com>
-Date: Thu, 18 Jul 2013 11:11:31 +0200
-Subject: [PATCH] Don't check for the existence of private include directories.
-
-Some packagers don't want to install the private headers.
-
-Check the existence of private headers only if the 'Private' component
-is specified when finding the package.
-
-Task-number: QTBUG-32466
-Change-Id: I1fdbfb25e8ce485cd051564b937f766b2733741a
----
- mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in   | 17 ++++++++++++-----
- tests/auto/cmake/test_private_includes/CMakeLists.txt |  2 +-
- 2 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 3862334..bcff316 100644
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -119,14 +119,21 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
- !!ENDIF
- 
--    foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS}
--!!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
--                 ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS}
--!!ENDIF
--                 )
-+    foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
-         _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${_dir})
-     endforeach()
- 
-+!!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-+    # Only check existence of private includes if the Private component is
-+    # specified.
-+    list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private)
-+    if (NOT _check_private STREQUAL -1)
-+        foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
-+            _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${_dir})
-+        endforeach()
-+    endif()
-+!!ENDIF
-+
-     set(Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
- 
-     set(Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -D$${MODULE_DEFINE})
-diff --git a/tests/auto/cmake/test_private_includes/CMakeLists.txt b/tests/auto/cmake/test_private_includes/CMakeLists.txt
-index f283bc2..9095836 100644
---- a/tests/auto/cmake/test_private_includes/CMakeLists.txt
-+++ b/tests/auto/cmake/test_private_includes/CMakeLists.txt
-@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
- 
- project(test_private_includes)
- 
--find_package(Qt5Gui REQUIRED)
-+find_package(Qt5Gui REQUIRED Private)
- 
- include_directories(
-   ${Qt5Gui_INCLUDE_DIRS}
--- 
-1.8.4.rc1
-
diff --git a/debian/patches/series b/debian/patches/series
index e23f5bb..63b9b5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-Dont_check_for_the_existence_of_priv_inc_dirs.patch
 sha3_64bit_BE.diff
 linux_no_perf.diff
 

-- 
qtbase packaging