[SCM] kdelibs4support packaging branch, master, updated. 91b9eb08d50fbebd9aff67a4b32671fd923134ac

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdelibs4support.git;a=commitdiff;h=0fc5971

The following commit has been merged in the master branch:
commit 0fc597170a05f7468b03e9a9ed807e94cd01e2ec
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Mar 24 10:15:22 2015 +0100

    Refresh patches.
---
 debian/changelog                      |  1 +
 debian/patches/incomplete_header      | 27 +++++++++++++--------------
 debian/patches/install_missing_header |  8 ++++----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48293cb..c95c2cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ kdelibs4support (5.8.0-1~) UNRELEASED; urgency=medium
   * Add missing -dev dependency (cmake files depend on kinit).
   * New upstream release (5.7.0).
   * New upstream release (5.8.0).
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 14 Mar 2015 10:23:53 +0100
 
diff --git a/debian/patches/incomplete_header b/debian/patches/incomplete_header
index 8ed0e25..d8e9134 100644
--- a/debian/patches/incomplete_header
+++ b/debian/patches/incomplete_header
@@ -1,7 +1,7 @@
 Index: kdelibs4support/src/includes/CMakeLists.txt
 ===================================================================
---- kdelibs4support.orig/src/includes/CMakeLists.txt	2015-01-28 15:01:22.977699871 +0100
-+++ kdelibs4support/src/includes/CMakeLists.txt	2015-02-06 17:57:54.098614498 +0100
+--- kdelibs4support.orig/src/includes/CMakeLists.txt	2015-03-24 10:13:46.717145199 +0100
++++ kdelibs4support/src/includes/CMakeLists.txt	2015-03-24 10:14:06.272360482 +0100
 @@ -467,13 +467,6 @@
  endif ()
  
@@ -9,7 +9,7 @@ Index: kdelibs4support/src/includes/CMakeLists.txt
 -  ConversionCheck/QVconvertible
 -  ConversionCheck/type_toQString
 -  ConversionCheck/type_toQVariant
--DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/ConversionCheck COMPONENT Devel)
+-DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/ConversionCheck COMPONENT Devel)
 -
 -
 -install( FILES
@@ -35,12 +35,10 @@ Index: kdelibs4support/src/includes/CMakeLists.txt
    Solid/NetworkShare
    Solid/Networking
    Solid/OpticalDisc
-@@ -852,78 +840,6 @@
-   khtml/MouseReleaseEvent
- DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/khtml COMPONENT Devel)
+@@ -854,77 +842,6 @@
  
--
--install(FILES
+ 
+ install(FILES
 -  Nepomuk/File
 -  Nepomuk/KRatingPainter
 -  Nepomuk/KRatingWidget
@@ -52,7 +50,7 @@ Index: kdelibs4support/src/includes/CMakeLists.txt
 -  Nepomuk/TagWidget
 -  Nepomuk/Thing
 -  Nepomuk/Variant
--DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Nepomuk COMPONENT Devel)
+-DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/Nepomuk COMPONENT Devel)
 -
 -
 -install(FILES
@@ -60,7 +58,7 @@ Index: kdelibs4support/src/includes/CMakeLists.txt
 -  Nepomuk/Types/Literal
 -  Nepomuk/Types/Ontology
 -  Nepomuk/Types/Property
--DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Nepomuk/Types COMPONENT Devel)
+-DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/Nepomuk/Types COMPONENT Devel)
 -
 -
 -install(FILES
@@ -81,7 +79,7 @@ Index: kdelibs4support/src/includes/CMakeLists.txt
 -  Nepomuk/Query/SimpleTerm
 -  Nepomuk/Query/StandardQuery
 -  Nepomuk/Query/Term
--DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Nepomuk/Query COMPONENT Devel)
+-DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/Nepomuk/Query COMPONENT Devel)
 -
 -
 -install(FILES
@@ -93,7 +91,7 @@ Index: kdelibs4support/src/includes/CMakeLists.txt
 -  Nepomuk/Utils/SearchWidget
 -  Nepomuk/Utils/SimpleFacet
 -  Nepomuk/Utils/SimpleResourceModel
--DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Nepomuk/Utils COMPONENT Devel)
+-DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/Nepomuk/Utils COMPONENT Devel)
 -
 -
 -install(FILES
@@ -108,9 +106,10 @@ Index: kdelibs4support/src/includes/CMakeLists.txt
 -  Nepomuk/Vocabulary/NUAO
 -  Nepomuk/Vocabulary/PIMO
 -  Nepomuk/Vocabulary/TMO
--DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Nepomuk/Vocabulary COMPONENT Devel)
+-DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/Nepomuk/Vocabulary COMPONENT Devel)
 -
 -
- install(FILES
+-install(FILES
    KUnitConversion/Converter
    KUnitConversion/Unit
+   KUnitConversion/UnitCategory
diff --git a/debian/patches/install_missing_header b/debian/patches/install_missing_header
index 8a237bd..fec8f48 100644
--- a/debian/patches/install_missing_header
+++ b/debian/patches/install_missing_header
@@ -1,13 +1,13 @@
 Index: kdelibs4support/src/CMakeLists.txt
 ===================================================================
---- kdelibs4support.orig/src/CMakeLists.txt	2015-01-28 15:01:22.977699871 +0100
-+++ kdelibs4support/src/CMakeLists.txt	2015-02-06 10:27:52.564091423 +0100
+--- kdelibs4support.orig/src/CMakeLists.txt	2015-03-24 10:08:23.838101510 +0100
++++ kdelibs4support/src/CMakeLists.txt	2015-03-24 10:09:55.066440802 +0100
 @@ -523,6 +523,8 @@
  
  configure_file(kssl/ksslconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kssl/ksslconfig.h )
  set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/kssl/ksslconfig.h )
 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kssl/ksslconfig.h
-+  DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KDELibs4Support COMPONENT Devel)
++  DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support COMPONENT Devel)
  
- install( FILES kdebug.areas kdebugrc DESTINATION ${CONFIG_INSTALL_DIR} )
+ install( FILES kdebug.areas kdebugrc DESTINATION ${KDE_INSTALL_CONFDIR} )
  

-- 
kdelibs4support packaging