[SCM] KDE Base Runtime module packaging branch, master, updated. debian/16.04.0-1-10-g87f7369

Pino Toscano pino at moszumanska.debian.org
Sat Jun 18 09:32:28 UTC 2016 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=ec3836a

The following commit has been merged in the master branch:
commit ec3836a2f8445b0793d4bc4faaff85a3ea25c834
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 18 11:25:12 2016 +0200

    restore headers for patches
---
 debian/changelog                                   |  1 +
 debian/patches/add_glib_for_nm                     | 13 +-----------
 debian/patches/disable_flacky_tests                | 11 ----------
 debian/patches/disable_kwalletd_autotests          | 11 ----------
 debian/patches/disable_usr_lib_install_rpath.diff  | 15 +++++---------
 debian/patches/khelp_htdig.diff                    | 16 ---------------
 debian/patches/kubuntu_disable-gpg-backend.diff    | 24 +++++++++-------------
 .../kubuntu_drkonqi_whoopsie_integration.patch     | 20 ++++++++----------
 debian/patches/kubuntu_nodisplay_knetattach.diff   | 11 ----------
 debian/patches/kubuntu_shutup_shutup_shutup.diff   | 14 ++-----------
 .../patches/use_always_present_path_to_test.patch  | 18 ++++++++--------
 debian/patches/use_the_correct_locale.patch        | 16 +++++++--------
 12 files changed, 44 insertions(+), 126 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98052f1..bb99d56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kde-runtime (4:16.04.2-0r1) UNRELEASED; urgency=medium
   * Disable the build of khelpcenter, as it is not used from this source.
   * Wrap too long changelog lines in older entries.
   * Remove unused and outdated installgen file.
+  * Restore headers for patches.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jun 2016 09:39:41 +0200
 
diff --git a/debian/patches/add_glib_for_nm b/debian/patches/add_glib_for_nm
index c6ff9ab..f0b06c2 100644
--- a/debian/patches/add_glib_for_nm
+++ b/debian/patches/add_glib_for_nm
@@ -1,17 +1,6 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 13:53:28 +0200
-Subject: add_glib_for_nm
-
-===================================================================
----
- solid-networkstatus/kded/CMakeLists.txt | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/solid-networkstatus/kded/CMakeLists.txt b/solid-networkstatus/kded/CMakeLists.txt
-index 633c7f1..5dfcbf4 100644
 --- a/solid-networkstatus/kded/CMakeLists.txt
 +++ b/solid-networkstatus/kded/CMakeLists.txt
-@@ -16,6 +16,12 @@ set_package_properties(NetworkManager PROPERTIES DESCRIPTION "The NetworkManager
+@@ -16,6 +16,12 @@ set_package_properties(NetworkManager PR
                        )
  
  if(NETWORKMANAGER_FOUND)
diff --git a/debian/patches/disable_flacky_tests b/debian/patches/disable_flacky_tests
index a1af66d..6edc8ea 100644
--- a/debian/patches/disable_flacky_tests
+++ b/debian/patches/disable_flacky_tests
@@ -1,14 +1,3 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 13:53:28 +0200
-Subject: disable_flacky_tests
-
-===================================================================
----
- kurifilter-plugins/tests/kurifiltertest.cpp | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/kurifilter-plugins/tests/kurifiltertest.cpp b/kurifilter-plugins/tests/kurifiltertest.cpp
-index 32f968c..13c8e36 100644
 --- a/kurifilter-plugins/tests/kurifiltertest.cpp
 +++ b/kurifilter-plugins/tests/kurifiltertest.cpp
 @@ -256,7 +256,7 @@ void KUriFilterTest::shortUris()
diff --git a/debian/patches/disable_kwalletd_autotests b/debian/patches/disable_kwalletd_autotests
index 968f6de..3eb71f1 100644
--- a/debian/patches/disable_kwalletd_autotests
+++ b/debian/patches/disable_kwalletd_autotests
@@ -1,14 +1,3 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 13:53:28 +0200
-Subject: disable_kwalletd_autotests
-
-===================================================================
----
- kwalletd/autotests/CMakeLists.txt | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/kwalletd/autotests/CMakeLists.txt b/kwalletd/autotests/CMakeLists.txt
-index 5ffbba4..dae2e6e 100644
 --- a/kwalletd/autotests/CMakeLists.txt
 +++ b/kwalletd/autotests/CMakeLists.txt
 @@ -1,11 +1,11 @@
diff --git a/debian/patches/disable_usr_lib_install_rpath.diff b/debian/patches/disable_usr_lib_install_rpath.diff
index 59a161f..02613ee 100644
--- a/debian/patches/disable_usr_lib_install_rpath.diff
+++ b/debian/patches/disable_usr_lib_install_rpath.diff
@@ -1,14 +1,9 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 13:53:28 +0200
-Subject: Do not set install RPATH to /usr/lib by default /usr/lib RPATH is
- disallowed on Debian systems and is a bad practise in general
+Author: George Kiagiadakis <gkiagiad at csd.uoc.gr>
+Subject: Do not set install RPATH to /usr/lib by default
+ /usr/lib RPATH is disallowed on Debian systems and is a bad practise in
+ general
+Forwarded: not-needed
 
----
- phonon/platform_kde/CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/phonon/platform_kde/CMakeLists.txt b/phonon/platform_kde/CMakeLists.txt
-index f41a4dc..3d3df10 100644
 --- a/phonon/platform_kde/CMakeLists.txt
 +++ b/phonon/platform_kde/CMakeLists.txt
 @@ -19,10 +19,8 @@ endif(ALSA_FOUND)
diff --git a/debian/patches/khelp_htdig.diff b/debian/patches/khelp_htdig.diff
index beb7085..92a24aa 100644
--- a/debian/patches/khelp_htdig.diff
+++ b/debian/patches/khelp_htdig.diff
@@ -1,15 +1,3 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 13:53:28 +0200
-Subject: khelp_htdig
-
----
- khelpcenter/searchhandlers/khc_docbookdig.pl.cmake | 2 +-
- khelpcenter/searchhandlers/khc_htdig.pl.cmake      | 2 +-
- khelpcenter/searchhandlers/khc_htsearch.pl         | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake b/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
-index 3b424c4..7fa6671 100755
 --- a/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
 +++ b/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
 @@ -26,7 +26,7 @@ use strict;
@@ -21,8 +9,6 @@ index 3b424c4..7fa6671 100755
  my $htdigbin = "/usr/bin";
  my $kdeprefix = "@CMAKE_INSTALL_PREFIX@";
  chomp $kdeprefix;
-diff --git a/khelpcenter/searchhandlers/khc_htdig.pl.cmake b/khelpcenter/searchhandlers/khc_htdig.pl.cmake
-index 511adc8..7270b16 100755
 --- a/khelpcenter/searchhandlers/khc_htdig.pl.cmake
 +++ b/khelpcenter/searchhandlers/khc_htdig.pl.cmake
 @@ -26,7 +26,7 @@ use strict;
@@ -34,8 +20,6 @@ index 511adc8..7270b16 100755
  my $htdigbin = "/usr/bin";
  my $kdeprefix = "@CMAKE_INSTALL_PREFIX@";
  chomp $kdeprefix;
-diff --git a/khelpcenter/searchhandlers/khc_htsearch.pl b/khelpcenter/searchhandlers/khc_htsearch.pl
-index 5dc3f5f..aa1f872 100755
 --- a/khelpcenter/searchhandlers/khc_htsearch.pl
 +++ b/khelpcenter/searchhandlers/khc_htsearch.pl
 @@ -8,7 +8,7 @@ use Getopt::Long;
diff --git a/debian/patches/kubuntu_disable-gpg-backend.diff b/debian/patches/kubuntu_disable-gpg-backend.diff
index 412c4f4..0152db2 100644
--- a/debian/patches/kubuntu_disable-gpg-backend.diff
+++ b/debian/patches/kubuntu_disable-gpg-backend.diff
@@ -1,13 +1,8 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 13:53:28 +0200
-Subject: kubuntu_disable-gpg-backend
+Description: disable kwallet gpg backend as it is not working perfectly
+Forwarded: no
+Author: Alex Fiestas <afiestas at kde.org>
+Reviewed-by: Harald Sitter <apachelogger at kubuntu.org>
 
----
- kwalletd/CMakeLists.txt | 46 +++++++++++++++++++++++-----------------------
- 1 file changed, 23 insertions(+), 23 deletions(-)
-
-diff --git a/kwalletd/CMakeLists.txt b/kwalletd/CMakeLists.txt
-index 73aec82..4d73d5c 100644
 --- a/kwalletd/CMakeLists.txt
 +++ b/kwalletd/CMakeLists.txt
 @@ -1,15 +1,15 @@
@@ -17,15 +12,16 @@ index 73aec82..4d73d5c 100644
 -find_package(Gpgme)  # Called by FindQGpgme, but since we call some gpgme
 -                     # functions ourselves we need to link against it directly.
 -find_package(QGpgme) # provided by kdepimlibs
-+# find_package(Gpgme)  # Called by FindQGpgme, but since we call some gpgme
-+#                      # functions ourselves we need to link against it directly.
-+# find_package(QGpgme) # provided by kdepimlibs
- 
+-
 -if (GPGME_FOUND AND QGPGME_FOUND)
 -    add_definitions(-DHAVE_QGPGME)
 -    include_directories(${GPGME_INCLUDES} ${QGPGME_INCLUDE_DIR})
 -    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 -endif(GPGME_FOUND AND QGPGME_FOUND)
++# find_package(Gpgme)  # Called by FindQGpgme, but since we call some gpgme
++#                      # functions ourselves we need to link against it directly.
++# find_package(QGpgme) # provided by kdepimlibs
++
 +# if (GPGME_FOUND AND QGPGME_FOUND)
 +#     add_definitions(-DHAVE_QGPGME)
 +#     include_directories(${GPGME_INCLUDES} ${QGPGME_INCLUDE_DIR})
@@ -65,7 +61,7 @@ index 73aec82..4d73d5c 100644
  
  find_file(kwallet_xml org.kde.KWallet.xml HINTS ${KDE4_DBUS_INTERFACES_DIR} )
  
-@@ -57,9 +57,9 @@ qt4_add_dbus_adaptor( kwalletd_KDEINIT_SRCS ${kwallet_xml} kwalletd.h KWalletD )
+@@ -57,9 +57,9 @@ qt4_add_dbus_adaptor( kwalletd_KDEINIT_S
  kde4_add_kdeinit_executable( kwalletd NOGUI ${kwalletd_KDEINIT_SRCS} )
  
  target_link_libraries(kdeinit_kwalletd ${KDE4_KDEUI_LIBS} kwalletbackend )
diff --git a/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch b/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch
index 1940af7..d43d76e 100644
--- a/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch
+++ b/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch
@@ -1,16 +1,14 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 13:53:28 +0200
-Subject: kubuntu_drkonqi_whoopsie_integration
+Description: automatic crash report integration
+ integraes drkonqi with whoopsie/kubuntu-notification-helper/apport to allow
+ automatic crash reporting to errors.ubuntu.com. this is achieved by
+ adding a checkbox to drkonqi that will create a marker file (*.drkonqi-accept)
+ if the user wishes to automatically submit the crash report to us.
+Origin: vendor
+Forwarded: no
 
----
- drkonqi/drkonqidialog.cpp | 31 +++++++++++++++++++++++++++++++
- 1 file changed, 31 insertions(+)
-
-diff --git a/drkonqi/drkonqidialog.cpp b/drkonqi/drkonqidialog.cpp
-index 0ea3931..17dedb8 100644
 --- a/drkonqi/drkonqidialog.cpp
 +++ b/drkonqi/drkonqidialog.cpp
-@@ -41,6 +41,8 @@ static const char ABOUT_BUG_REPORTING_URL[] = "#aboutbugreporting";
+@@ -41,6 +41,8 @@ static const char ABOUT_BUG_REPORTING_UR
  static const char DRKONQI_REPORT_BUG_URL[] =
      KDE_BUGZILLA_URL "enter_bug.cgi?product=drkonqi&format=guided";
  
@@ -19,7 +17,7 @@ index 0ea3931..17dedb8 100644
  DrKonqiDialog::DrKonqiDialog(QWidget * parent) :
          KDialog(parent),
          m_aboutBugReportingDialog(0),
-@@ -75,6 +77,25 @@ DrKonqiDialog::DrKonqiDialog(QWidget * parent) :
+@@ -75,6 +77,25 @@ DrKonqiDialog::DrKonqiDialog(QWidget * p
  
  DrKonqiDialog::~DrKonqiDialog()
  {
diff --git a/debian/patches/kubuntu_nodisplay_knetattach.diff b/debian/patches/kubuntu_nodisplay_knetattach.diff
index dbb724f..6860a81 100644
--- a/debian/patches/kubuntu_nodisplay_knetattach.diff
+++ b/debian/patches/kubuntu_nodisplay_knetattach.diff
@@ -1,14 +1,3 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 13:53:28 +0200
-Subject: kubuntu_nodisplay_knetattach
-
-===================================================================
----
- knetattach/knetattach.desktop | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/knetattach/knetattach.desktop b/knetattach/knetattach.desktop
-index 88b5585..f61827f 100755
 --- a/knetattach/knetattach.desktop
 +++ b/knetattach/knetattach.desktop
 @@ -186,3 +186,4 @@ X-KDE-StartupNotify=true
diff --git a/debian/patches/kubuntu_shutup_shutup_shutup.diff b/debian/patches/kubuntu_shutup_shutup_shutup.diff
index 90ca0f3..6438716 100644
--- a/debian/patches/kubuntu_shutup_shutup_shutup.diff
+++ b/debian/patches/kubuntu_shutup_shutup_shutup.diff
@@ -1,16 +1,6 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 13:53:28 +0200
-Subject: kubuntu_shutup_shutup_shutup
-
----
- attica/kdeplugin/kdeplatformdependent.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/attica/kdeplugin/kdeplatformdependent.cpp b/attica/kdeplugin/kdeplatformdependent.cpp
-index d0041b8..fde029c 100644
 --- a/attica/kdeplugin/kdeplatformdependent.cpp
 +++ b/attica/kdeplugin/kdeplatformdependent.cpp
-@@ -221,7 +221,7 @@ QList<QUrl> KdePlatformDependent::getDefaultProviderFiles() const
+@@ -221,7 +221,7 @@ QList<QUrl> KdePlatformDependent::getDef
      foreach (const QString& pathString, pathStrings) {
          paths.append(QUrl(pathString));
      }
@@ -19,7 +9,7 @@ index d0041b8..fde029c 100644
      return paths;
  }
  
-@@ -234,7 +234,7 @@ void KdePlatformDependent::addDefaultProviderFile(const QUrl& url)
+@@ -234,7 +234,7 @@ void KdePlatformDependent::addDefaultPro
          pathStrings.append(urlString);
          group.writeEntry("providerFiles", pathStrings);
          group.sync();
diff --git a/debian/patches/use_always_present_path_to_test.patch b/debian/patches/use_always_present_path_to_test.patch
index 20cc1ff..5896a9b 100644
--- a/debian/patches/use_always_present_path_to_test.patch
+++ b/debian/patches/use_always_present_path_to_test.patch
@@ -1,13 +1,13 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 13:53:28 +0200
-Subject: use_always_present_path_to_test
+Description: use a path that's always there
+ Or at least in Debian ;)
+ .
+ To try to use /etc/cups/ it will require to install cups first. But to be
+ able to achieve the same result one can simply use /etc/crond.d, which
+ is present both in Debian and Red Hat almost always (if not always).
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: https://bugs.kde.org/show_bug.cgi?id=330107
+Last-Update: 2014-01-17
 
----
- kioslave/trash/tests/testtrash.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kioslave/trash/tests/testtrash.cpp b/kioslave/trash/tests/testtrash.cpp
-index f99f0f0..bb4e87f 100644
 --- a/kioslave/trash/tests/testtrash.cpp
 +++ b/kioslave/trash/tests/testtrash.cpp
 @@ -894,8 +894,8 @@ void TestTrash::moveDirectoryFromTrash()
diff --git a/debian/patches/use_the_correct_locale.patch b/debian/patches/use_the_correct_locale.patch
index b9310b6..598b9db 100644
--- a/debian/patches/use_the_correct_locale.patch
+++ b/debian/patches/use_the_correct_locale.patch
@@ -1,13 +1,11 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 13:53:28 +0200
-Subject: use_the_correct_locale
+Description: Use the correct locale.
+ The test was expecting a specific locale. Everything seems to indicate
+ that any UTF-8 enabled locale would work for this testcases, so use
+ C.UTF-8 and avoid to have to depend on all locales.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: https://bugs.kde.org/show_bug.cgi?id=329983
+Last-Update: 2014-01-14
 
----
- kioslave/trash/tests/testtrash.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kioslave/trash/tests/testtrash.cpp b/kioslave/trash/tests/testtrash.cpp
-index bccb0e5..f99f0f0 100644
 --- a/kioslave/trash/tests/testtrash.cpp
 +++ b/kioslave/trash/tests/testtrash.cpp
 @@ -58,7 +58,7 @@ int initLocale()

-- 
KDE Base Runtime module packaging

More information about the pkg-kde-commits mailing list