[SCM] KDE Base Applications module packaging branch, master, updated. debian/16.08.0-1-24-g3df137c

Sat Sep 10 17:12:23 UTC 2016

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

The following commit has been merged in the master branch:
commit 1d35799244ea7fa8c3d95ad11f12cb040840193d
Merge: 7e33c0ba2b7202988a4738e6b342d7ae85d5654e 47d785c719ff4f857c8beeb08cd40c8923e6e9a8
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Thu Jul 21 11:36:58 2016 +0200

    Merge remote-tracking branch 'refs/remotes/local/master'

 debian/changelog                                 | 13 +++++++++++--
 debian/control                                   | 10 ++++------
 debian/libkonq5abi1.symbols                      |  8 +-------
 debian/patches/disable_plasma.diff               | 12 +++++++++++-
 debian/patches/enable_debianabimanager.diff      | 10 ++++++++--
 debian/patches/enable_dlrestrictions.diff        | 17 ++++++++++++-----
 debian/patches/kubuntu_disable-failing-test.diff | 19 ++++++++++++++++++-
 debian/patches/kubuntu_ignore-tests.diff         | 20 +++++++++++---------
 8 files changed, 76 insertions(+), 33 deletions(-)

diff --cc debian/changelog
index a26e4c4,fb366f0..a3478ce

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,21 +1,25 @@@
- kde-baseapps (4:16.04.3-0r1) UNRELEASED; urgency=medium
+ kde-baseapps (4:16.04.3-1~1.gbpba2cc4) UNRELEASED; urgency=medium
+ 
+   ** SNAPSHOT build @ba2cc4d4f230f4113c7088047fa32d61374dc1ab **
+ 
+   [ Maximiliano Curia ]
+   * Update symbols files with the buildds results
  
    [ Pino Toscano ]
 +  * New upstream release.
    * Remove the unused baloo-dev build dependency, as dolphin4 is already built
      without Baloo support (unmaintained in KDE 4).
 -  * start a new changelog entry for 4:16.04.2-2
 -  * remove unused baloo-dev B-D
 +  * Update the patches:
 +    - upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch:
 +      drop, backported from upstream
 +    - upstream_cmake-use-variable-for-knewstuff3-library.patch: drop,
 +      backported from upstream
  
-  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 02 Jul 2016 07:56:39 +0200
+   [ Automatic packaging ]
+   * Update build-deps and deps with the info from cmake
+   * Refresh patches
+ 
+  -- Automatic packaging <maxy+jenkins at gnuservers.com.ar>  Wed, 13 Jul 2016 05:35:25 +0200
  
  kde-baseapps (4:16.04.2-1) unstable; urgency=medium
  
diff --cc debian/patches/disable_plasma.diff
index 03f798d,9c07458..ec31dd8
--- a/debian/patches/disable_plasma.diff
+++ b/debian/patches/disable_plasma.diff
@@@ -1,17 -1,16 +1,27 @@@
 -From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
++From: Pino Toscano <pino at debian.org>
+ Date: Wed, 13 Jul 2016 05:35:22 +0200
+ Subject: disable_plasma
+ 
 +Author: Pino Toscano <pino at debian.org>
 +Description: Disable the build of Plasma-related stuff
 + Do not build stuff based on Plasma 4, since they are useless in a Plasma 5
 + desktop environment.
 + .
 + This patch needs to be dropped once a Frameworks-based kde-baseapps is
 + prepared.
 +Origin: vendor
 +Forwarded: not-needed
 +Last-Update: 2016-06-18
 +
+ ---
+  CMakeLists.txt | 2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+ 
+ diff --git a/CMakeLists.txt b/CMakeLists.txt
+ index f17762b..b5950d0 100644
  --- a/CMakeLists.txt
  +++ b/CMakeLists.txt
- @@ -42,7 +42,7 @@ add_subdirectory( kdialog )
+ @@ -44,7 +44,7 @@ add_subdirectory( kdialog )
   add_subdirectory( keditbookmarks )
   add_subdirectory( konqueror )
   add_subdirectory( kfind )
diff --cc debian/patches/enable_debianabimanager.diff
index fb58f1a,0dec78d..d1ffc54
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@@ -1,13 -1,18 +1,19 @@@
  From: Modestas Vainius <modax at debian.org>
+ Date: Wed, 13 Jul 2016 05:35:22 +0200
  Subject: Use DebianABIManager for this source package. It's Debian-specific.
- Forwarded: not-needed
  
++Forwarded: not-needed
  For more information about DebianABIManager, refer to
  /usr/share/doc/pkg-kde-tools/README.DebianABIManager (pkg-kde-tools (>= 0.12)).
+ ---
+  CMakeLists.txt | 1 +
+  1 file changed, 1 insertion(+)
  
+ diff --git a/CMakeLists.txt b/CMakeLists.txt
+ index 2aae22e..6a6c084 100644
  --- a/CMakeLists.txt
  +++ b/CMakeLists.txt
- @@ -57,3 +57,4 @@ macro_optional_add_subdirectory( doc )
+ @@ -59,3 +59,4 @@ macro_optional_add_subdirectory( doc )
   
   feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
   
diff --cc debian/patches/enable_dlrestrictions.diff
index 1989534,529941e..81a313b
--- a/debian/patches/enable_dlrestrictions.diff
+++ b/debian/patches/enable_dlrestrictions.diff
@@@ -6,10 -5,15 +5,18 @@@ Subject: Enable DLRestrictions (REJECT:
  
  Enable REJECT:OTHERSOVERSION for these libraries because their ABI is typically
  not stable and structures frequently conflict.
++Forwarded: not-needed
++Origin: vendor
++Last-Update: 2011-05-25
+ ---
+  CMakeLists.txt | 7 +++++++
+  1 file changed, 7 insertions(+)
  
+ diff --git a/CMakeLists.txt b/CMakeLists.txt
+ index 6a6c084..f17762b 100644
  --- a/CMakeLists.txt
  +++ b/CMakeLists.txt
- @@ -58,3 +58,10 @@ macro_optional_add_subdirectory( doc )
+ @@ -60,3 +60,10 @@ macro_optional_add_subdirectory( doc )
   feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
   
   include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff --cc debian/patches/kubuntu_disable-failing-test.diff
index fa68b05,1ae76c7..344cbed
--- a/debian/patches/kubuntu_disable-failing-test.diff
+++ b/debian/patches/kubuntu_disable-failing-test.diff
@@@ -1,6 -1,16 +1,23 @@@
+ From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+ Date: Wed, 13 Jul 2016 05:35:22 +0200
+ Subject: kubuntu_disable-failing-test
+ 
++Description: ignore failing tests
++ ignore tests failing due to switch to plasma 5
++Author: Jonathan Riddell
++Origin: me
++Forwarded: nope
++Last-Update: 2015-09-01
++
+ ---
+  lib/konq/tests/CMakeLists.txt | 9 ---------
+  1 file changed, 9 deletions(-)
+ 
+ diff --git a/lib/konq/tests/CMakeLists.txt b/lib/konq/tests/CMakeLists.txt
+ index 9affbf8..8adf107 100644
  --- a/lib/konq/tests/CMakeLists.txt
  +++ b/lib/konq/tests/CMakeLists.txt
- @@ -14,13 +14,4 @@ kde4_add_unit_test(konqpopupmenutest kon
+ @@ -14,13 +14,4 @@ kde4_add_unit_test(konqpopupmenutest konqpopupmenutest.cpp)
   target_link_libraries(konqpopupmenutest konq ${KDE4_KFILE_LIBS}
                        ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY})
   

-- 
KDE Base Applications module packaging

