[SCM] kdelibs4support packaging branch, master, updated. debian/5.18.0-1-31-g53effb0

Maximiliano Curia maxy at moszumanska.debian.org
Fri May 27 13:44:16 UTC 2016 

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

The following commit has been merged in the master branch:
commit d5f48e806d67b8b252774d8e6d475647ddad9140
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Sun Apr 10 15:31:30 2016 +0200

    Refresh patches
---
 debian/patches/incomplete_header      | 21 +++++++---
 debian/patches/install_missing_header | 17 ++++++--
 debian/patches/renamed_header         | 78 +++++++++++++++++++++--------------
 debian/patches/standarddirs_test      | 31 +++++++++-----
 4 files changed, 95 insertions(+), 52 deletions(-)

diff --git a/debian/patches/incomplete_header b/debian/patches/incomplete_header
index d8e9134..ca4f32e 100644
--- a/debian/patches/incomplete_header
+++ b/debian/patches/incomplete_header
@@ -1,8 +1,17 @@
-Index: kdelibs4support/src/includes/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Sun, 10 Apr 2016 15:31:28 +0200
+Subject: incomplete_header
+
 ===================================================================
---- 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 @@
+---
+ src/includes/CMakeLists.txt | 83 ---------------------------------------------
+ 1 file changed, 83 deletions(-)
+
+diff --git a/src/includes/CMakeLists.txt b/src/includes/CMakeLists.txt
+index b2298be..d4d8863 100644
+--- a/src/includes/CMakeLists.txt
++++ b/src/includes/CMakeLists.txt
+@@ -467,13 +467,6 @@ if (UNIX)
  endif ()
  
  install( FILES
@@ -16,7 +25,7 @@ Index: kdelibs4support/src/includes/CMakeLists.txt
    KDNSSD/Configuration
    KDNSSD/DomainBrowser
    KDNSSD/DomainModel
-@@ -787,18 +780,13 @@
+@@ -787,18 +780,13 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/KWallet COMPONENT
  
  
  install( FILES
@@ -35,7 +44,7 @@ Index: kdelibs4support/src/includes/CMakeLists.txt
    Solid/NetworkShare
    Solid/Networking
    Solid/OpticalDisc
-@@ -854,77 +842,6 @@
+@@ -854,77 +842,6 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support/KDE/khtml COMPONENT De
  
  
  install(FILES
diff --git a/debian/patches/install_missing_header b/debian/patches/install_missing_header
index fec8f48..762cc11 100644
--- a/debian/patches/install_missing_header
+++ b/debian/patches/install_missing_header
@@ -1,8 +1,17 @@
-Index: kdelibs4support/src/CMakeLists.txt
+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
+
 ===================================================================
---- 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 @@
+---
+ 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 )
diff --git a/debian/patches/renamed_header b/debian/patches/renamed_header
index 6822b9a..5b8a19b 100644
--- a/debian/patches/renamed_header
+++ b/debian/patches/renamed_header
@@ -1,56 +1,72 @@
-Index: kdelibs4support/src/includes/KDNSSD/DomainBrowser
+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
+
 ===================================================================
---- kdelibs4support.orig/src/includes/KDNSSD/DomainBrowser	2015-01-28 15:01:22.989699401 +0100
-+++ kdelibs4support/src/includes/KDNSSD/DomainBrowser	2015-02-06 10:45:03.846381291 +0100
+---
+ 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>
-Index: kdelibs4support/src/includes/KDNSSD/DomainModel
-===================================================================
---- kdelibs4support.orig/src/includes/KDNSSD/DomainModel	2015-01-28 15:01:22.989699401 +0100
-+++ kdelibs4support/src/includes/KDNSSD/DomainModel	2015-02-06 10:45:10.302120321 +0100
+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>
-Index: kdelibs4support/src/includes/KDNSSD/PublicService
-===================================================================
---- kdelibs4support.orig/src/includes/KDNSSD/PublicService	2015-01-28 15:01:22.989699401 +0100
-+++ kdelibs4support/src/includes/KDNSSD/PublicService	2015-02-06 10:45:16.473870841 +0100
+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>
-Index: kdelibs4support/src/includes/KDNSSD/RemoteService
-===================================================================
---- kdelibs4support.orig/src/includes/KDNSSD/RemoteService	2015-01-28 15:01:22.989699401 +0100
-+++ kdelibs4support/src/includes/KDNSSD/RemoteService	2015-02-06 10:45:22.061644965 +0100
+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>
-Index: kdelibs4support/src/includes/KDNSSD/ServiceBase
-===================================================================
---- kdelibs4support.orig/src/includes/KDNSSD/ServiceBase	2015-01-28 15:01:22.989699401 +0100
-+++ kdelibs4support/src/includes/KDNSSD/ServiceBase	2015-02-06 10:45:27.317432510 +0100
+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>
-Index: kdelibs4support/src/includes/KDNSSD/ServiceBrowser
-===================================================================
---- kdelibs4support.orig/src/includes/KDNSSD/ServiceBrowser	2015-01-28 15:01:22.989699401 +0100
-+++ kdelibs4support/src/includes/KDNSSD/ServiceBrowser	2015-02-06 10:45:32.165236549 +0100
+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>
-Index: kdelibs4support/src/includes/KDNSSD/ServiceModel
-===================================================================
---- kdelibs4support.orig/src/includes/KDNSSD/ServiceModel	2015-01-28 15:01:22.989699401 +0100
-+++ kdelibs4support/src/includes/KDNSSD/ServiceModel	2015-02-06 10:45:36.885045763 +0100
+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>
-Index: kdelibs4support/src/includes/KDNSSD/ServiceTypeBrowser
-===================================================================
---- kdelibs4support.orig/src/includes/KDNSSD/ServiceTypeBrowser	2015-01-28 15:01:22.989699401 +0100
-+++ kdelibs4support/src/includes/KDNSSD/ServiceTypeBrowser	2015-02-06 10:45:41.476860154 +0100
+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/standarddirs_test b/debian/patches/standarddirs_test
index dbd11d4..0039262 100644
--- a/debian/patches/standarddirs_test
+++ b/debian/patches/standarddirs_test
@@ -1,8 +1,17 @@
-Index: kdelibs4support/autotests/kstandarddirstest.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Sun, 10 Apr 2016 15:31:28 +0200
+Subject: standarddirs_test
+
 ===================================================================
---- kdelibs4support.orig/autotests/kstandarddirstest.cpp	2015-03-24 17:03:15.013378363 +0100
-+++ kdelibs4support/autotests/kstandarddirstest.cpp	2015-03-24 17:04:03.579382230 +0100
-@@ -108,9 +108,10 @@
+---
+ autotests/kstandarddirstest.cpp | 36 +++++++++++++++++++++++++-----------
+ 1 file changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/autotests/kstandarddirstest.cpp b/autotests/kstandarddirstest.cpp
+index 3030116..3851971 100644
+--- a/autotests/kstandarddirstest.cpp
++++ b/autotests/kstandarddirstest.cpp
+@@ -108,9 +108,10 @@ void KStandarddirsTest::testResourceDirs()
  {
      const QStringList configDirs = KGlobal::dirs()->resourceDirs("config");
      Q_FOREACH (const QString &dir, configDirs) {
@@ -16,7 +25,7 @@ Index: kdelibs4support/autotests/kstandarddirstest.cpp
      }
  }
  
-@@ -172,6 +173,15 @@
+@@ -172,6 +173,15 @@ static bool oneEndsWith(const QStringList &lst, const QString &str)
      return false;
  }
  
@@ -32,7 +41,7 @@ Index: kdelibs4support/autotests/kstandarddirstest.cpp
  void KStandarddirsTest::testFindAllResources()
  {
      if (!isKdeLibs4supportInstalled()) {
-@@ -180,7 +190,8 @@
+@@ -180,7 +190,8 @@ void KStandarddirsTest::testFindAllResources()
  
      const QStringList dbusInterfaceFiles = KGlobal::dirs()->findAllResources("data", "dbus-1/interfaces/");
      QVERIFY(!dbusInterfaceFiles.isEmpty());
@@ -42,7 +51,7 @@ Index: kdelibs4support/autotests/kstandarddirstest.cpp
  
      // Create a local config file, the file will be used as expected result
      const QString localConfigFile = m_configHome + "/foorc";
-@@ -192,11 +203,12 @@
+@@ -192,11 +203,12 @@ void KStandarddirsTest::testFindAllResources()
      QVERIFY2(QFile::exists(localConfigFile), qPrintable(localConfigFile));
  
      const QStringList configFiles = KGlobal::dirs()->findAllResources("config");
@@ -56,7 +65,7 @@ Index: kdelibs4support/autotests/kstandarddirstest.cpp
      QVERIFY(!oneEndsWith(configFiles, "etc/xdg/colors/Web.colors"));     // recursive was false
  
      {
-@@ -211,10 +223,11 @@
+@@ -211,10 +223,11 @@ void KStandarddirsTest::testFindAllResources()
      {
          const QStringList configFilesRecursiveWithFilter = KGlobal::dirs()->findAllResources("config", "*rc",
                  KStandardDirs::Recursive);
@@ -69,7 +78,7 @@ Index: kdelibs4support/autotests/kstandarddirstest.cpp
          QVERIFY(oneEndsWith(configFilesRecursiveWithFilter, "etc/xdg/kdebugrc"));
          QVERIFY(!oneEndsWith(configFilesRecursiveWithFilter, "etc/xdg/colors/Web.colors"));     // didn't match the filter
      }
-@@ -222,9 +235,10 @@
+@@ -222,9 +235,10 @@ void KStandarddirsTest::testFindAllResources()
      {
          QStringList fileNames;
          const QStringList configFilesWithFilter = KGlobal::dirs()->findAllResources("config", "*rc", KStandardDirs::NoDuplicates, fileNames);
@@ -81,7 +90,7 @@ Index: kdelibs4support/autotests/kstandarddirstest.cpp
          QVERIFY(oneEndsWith(configFilesWithFilter, "kdebugrc"));     // either global (etc/xdg/) or local (XDG_HOME)
          QVERIFY(!oneEndsWith(configFilesWithFilter, "etc/xdg/ui/ui_standards.rc"));     // recursive not set
          QVERIFY(!oneEndsWith(configFilesWithFilter, "etc/xdg/accept-languages.codes"));     // didn't match the filter
-@@ -283,7 +297,7 @@
+@@ -283,7 +297,7 @@ void KStandarddirsTest::testFindResourceDir()
  {
      const QString configDir = KGlobal::dirs()->findResourceDir("config", "foorc");
      QVERIFY(!configDir.isEmpty());
@@ -90,7 +99,7 @@ Index: kdelibs4support/autotests/kstandarddirstest.cpp
  }
  
  void KStandarddirsTest::testFindExeLibExec()
-@@ -424,14 +438,14 @@
+@@ -424,14 +438,14 @@ void KStandarddirsTest::testAddResourceType()
  
  void KStandarddirsTest::testAddResourceDir()
  {

-- 
kdelibs4support packaging

More information about the pkg-kde-commits mailing list