[SCM] kdelibs4support packaging branch, master, updated. debian/5.26.0-1-8-g65ea926

Maximiliano Curia maxy at moszumanska.debian.org
Sat Oct 15 22:06:16 UTC 2016 

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

The following commit has been merged in the master branch:
commit 55cb7d6685db55d25794b1a0609d4c38ecd958d9
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Sat Oct 8 23:32:41 2016 +0200

    Refresh patches
---
 debian/patches/incomplete_header      | 106 ++--------------------------------
 debian/patches/install_missing_header |  22 -------
 debian/patches/renamed_header         |  72 -----------------------
 debian/patches/series                 |   2 -
 4 files changed, 4 insertions(+), 198 deletions(-)

diff --git a/debian/patches/incomplete_header b/debian/patches/incomplete_header
index ca4f32e..a1da8b8 100644
--- a/debian/patches/incomplete_header
+++ b/debian/patches/incomplete_header
@@ -4,14 +4,14 @@ Subject: incomplete_header
 
 ===================================================================
 ---
- src/includes/CMakeLists.txt | 83 ---------------------------------------------
- 1 file changed, 83 deletions(-)
+ src/includes/CMakeLists.txt | 6 ------
+ 1 file changed, 6 deletions(-)
 
 diff --git a/src/includes/CMakeLists.txt b/src/includes/CMakeLists.txt
-index b2298be..d4d8863 100644
+index 56bb100..8abef22 100644
 --- a/src/includes/CMakeLists.txt
 +++ b/src/includes/CMakeLists.txt
-@@ -467,13 +467,6 @@ if (UNIX)
+@@ -467,12 +467,6 @@ if (UNIX)
  endif ()
  
  install( FILES
@@ -20,105 +20,7 @@ index b2298be..d4d8863 100644
 -  ConversionCheck/type_toQVariant
 -DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/ConversionCheck COMPONENT Devel)
 -
--
 -install( FILES
    KDNSSD/Configuration
    KDNSSD/DomainBrowser
    KDNSSD/DomainModel
-@@ -787,18 +780,13 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/KWallet COMPONENT
- 
- 
- install( FILES
--  Solid/AcAdapter
--  Solid/AudioInterface
-   Solid/Battery
-   Solid/Block
--  Solid/Button
-   Solid/Camera
-   Solid/Device
-   Solid/DeviceInterface
-   Solid/DeviceNotifier
--  Solid/DvbInterface
-   Solid/GenericInterface
--  Solid/NetworkInterface
-   Solid/NetworkShare
-   Solid/Networking
-   Solid/OpticalDisc
-@@ -854,77 +842,6 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/khtml COMPONENT De
- 
- 
- install(FILES
--  Nepomuk/File
--  Nepomuk/KRatingPainter
--  Nepomuk/KRatingWidget
--  Nepomuk/MassUpdateJob
--  Nepomuk/Resource
--  Nepomuk/ResourceManager
--  Nepomuk/Service
--  Nepomuk/Tag
--  Nepomuk/TagWidget
--  Nepomuk/Thing
--  Nepomuk/Variant
--DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/Nepomuk COMPONENT Devel)
--
--
--install(FILES
--  Nepomuk/Types/Class
--  Nepomuk/Types/Literal
--  Nepomuk/Types/Ontology
--  Nepomuk/Types/Property
--DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/Nepomuk/Types COMPONENT Devel)
--
--
--install(FILES
--  Nepomuk/Query/AndTerm
--  Nepomuk/Query/ComparisonTerm
--  Nepomuk/Query/FileQuery
--  Nepomuk/Query/GroupTerm
--  Nepomuk/Query/LiteralTerm
--  Nepomuk/Query/NegationTerm
--  Nepomuk/Query/OptionalTerm
--  Nepomuk/Query/OrTerm
--  Nepomuk/Query/Query
--  Nepomuk/Query/QueryParser
--  Nepomuk/Query/QueryServiceClient
--  Nepomuk/Query/ResourceTerm
--  Nepomuk/Query/ResourceTypeTerm
--  Nepomuk/Query/Result
--  Nepomuk/Query/SimpleTerm
--  Nepomuk/Query/StandardQuery
--  Nepomuk/Query/Term
--DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/Nepomuk/Query COMPONENT Devel)
--
--
--install(FILES
--  Nepomuk/Utils/DynamicResourceFacet
--  Nepomuk/Utils/Facet
--  Nepomuk/Utils/FacetWidget
--  Nepomuk/Utils/ProxyFacet
--  Nepomuk/Utils/ResourceModel
--  Nepomuk/Utils/SearchWidget
--  Nepomuk/Utils/SimpleFacet
--  Nepomuk/Utils/SimpleResourceModel
--DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/Nepomuk/Utils COMPONENT Devel)
--
--
--install(FILES
--  Nepomuk/Vocabulary/NCAL
--  Nepomuk/Vocabulary/NCO
--  Nepomuk/Vocabulary/NDO
--  Nepomuk/Vocabulary/NEXIF
--  Nepomuk/Vocabulary/NFO
--  Nepomuk/Vocabulary/NIE
--  Nepomuk/Vocabulary/NMM
--  Nepomuk/Vocabulary/NMO
--  Nepomuk/Vocabulary/NUAO
--  Nepomuk/Vocabulary/PIMO
--  Nepomuk/Vocabulary/TMO
--DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/Nepomuk/Vocabulary COMPONENT Devel)
--
--
--install(FILES
-   KUnitConversion/Converter
-   KUnitConversion/Unit
-   KUnitConversion/UnitCategory
diff --git a/debian/patches/install_missing_header b/debian/patches/install_missing_header
deleted file mode 100644
index 762cc11..0000000
--- a/debian/patches/install_missing_header
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Sun, 10 Apr 2016 15:31:28 +0200
-Subject: install_missing_header
-
-===================================================================
----
- src/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 245cf4c..b311595 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -522,6 +522,8 @@ install(FILES
- 
- 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 ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support COMPONENT Devel)
- 
- install( FILES kdebug.areas kdebugrc DESTINATION ${KDE_INSTALL_CONFDIR} )
- 
diff --git a/debian/patches/renamed_header b/debian/patches/renamed_header
deleted file mode 100644
index 5b8a19b..0000000
--- a/debian/patches/renamed_header
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Sun, 10 Apr 2016 15:31:28 +0200
-Subject: renamed_header
-
-===================================================================
----
- src/includes/KDNSSD/DomainBrowser      | 2 +-
- src/includes/KDNSSD/DomainModel        | 2 +-
- src/includes/KDNSSD/PublicService      | 2 +-
- src/includes/KDNSSD/RemoteService      | 2 +-
- src/includes/KDNSSD/ServiceBase        | 2 +-
- src/includes/KDNSSD/ServiceBrowser     | 2 +-
- src/includes/KDNSSD/ServiceModel       | 2 +-
- src/includes/KDNSSD/ServiceTypeBrowser | 2 +-
- 8 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/includes/KDNSSD/DomainBrowser b/src/includes/KDNSSD/DomainBrowser
-index 1f5f4e8..cfa800d 100644
---- a/src/includes/KDNSSD/DomainBrowser
-+++ b/src/includes/KDNSSD/DomainBrowser
-@@ -1 +1 @@
--#include <kdnssd/domainbrowser.h>
-+#include <dnssd/domainbrowser.h>
-diff --git a/src/includes/KDNSSD/DomainModel b/src/includes/KDNSSD/DomainModel
-index 8e87935..4fcf790 100644
---- a/src/includes/KDNSSD/DomainModel
-+++ b/src/includes/KDNSSD/DomainModel
-@@ -1 +1 @@
--#include <kdnssd/domainmodel.h>
-+#include <dnssd/domainmodel.h>
-diff --git a/src/includes/KDNSSD/PublicService b/src/includes/KDNSSD/PublicService
-index a0f79a6..fec8f12 100644
---- a/src/includes/KDNSSD/PublicService
-+++ b/src/includes/KDNSSD/PublicService
-@@ -1 +1 @@
--#include <kdnssd/publicservice.h>
-+#include <dnssd/publicservice.h>
-diff --git a/src/includes/KDNSSD/RemoteService b/src/includes/KDNSSD/RemoteService
-index 9deff8d..5ab9647 100644
---- a/src/includes/KDNSSD/RemoteService
-+++ b/src/includes/KDNSSD/RemoteService
-@@ -1 +1 @@
--#include <kdnssd/remoteservice.h>
-+#include <dnssd/remoteservice.h>
-diff --git a/src/includes/KDNSSD/ServiceBase b/src/includes/KDNSSD/ServiceBase
-index 8c803ec..80cb822 100644
---- a/src/includes/KDNSSD/ServiceBase
-+++ b/src/includes/KDNSSD/ServiceBase
-@@ -1 +1 @@
--#include <kdnssd/servicebase.h>
-+#include <dnssd/servicebase.h>
-diff --git a/src/includes/KDNSSD/ServiceBrowser b/src/includes/KDNSSD/ServiceBrowser
-index 72d85ca..8d6ebc7 100644
---- a/src/includes/KDNSSD/ServiceBrowser
-+++ b/src/includes/KDNSSD/ServiceBrowser
-@@ -1 +1 @@
--#include <kdnssd/servicebrowser.h>
-+#include <dnssd/servicebrowser.h>
-diff --git a/src/includes/KDNSSD/ServiceModel b/src/includes/KDNSSD/ServiceModel
-index 6e0265f..657e886 100644
---- a/src/includes/KDNSSD/ServiceModel
-+++ b/src/includes/KDNSSD/ServiceModel
-@@ -1 +1 @@
--#include <kdnssd/servicemodel.h>
-+#include <dnssd/servicemodel.h>
-diff --git a/src/includes/KDNSSD/ServiceTypeBrowser b/src/includes/KDNSSD/ServiceTypeBrowser
-index e012f3a..438c0b9 100644
---- a/src/includes/KDNSSD/ServiceTypeBrowser
-+++ b/src/includes/KDNSSD/ServiceTypeBrowser
-@@ -1 +1 @@
--#include <kdnssd/servicetypebrowser.h>
-+#include <dnssd/servicetypebrowser.h>
diff --git a/debian/patches/series b/debian/patches/series
index cb77110..ab1aa54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 incomplete_header
-install_missing_header
-renamed_header
 standarddirs_test

-- 
kdelibs4support packaging

More information about the pkg-kde-commits mailing list