[SCM] KDE Base Applications module packaging branch, kde4.11, updated. debian/4.10.5-1-8-g22d352c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-baseapps.git;a=commitdiff;h=51929ae

The following commit has been merged in the kde4.11 branch:
commit 51929ae03bf35b15d74e925e43f25178cd7a9a9c
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Sep 25 11:05:52 2013 +0000

    Refresh patches.
---
 debian/changelog                            |    1 +
 debian/patches/enable_debianabimanager.diff |   16 +++++++---------
 debian/patches/enable_dlrestrictions.diff   |   15 +++++++--------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 33ef9d5..272d0f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kde-baseapps (4:4.11.1-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Sep 2013 20:15:06 +0200
 
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index 023a0d5..1953ef7 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -5,14 +5,12 @@ Forwarded: not-needed
 For more information about DebianABIManager, refer to
 /usr/share/doc/pkg-kde-tools/README.DebianABIManager (pkg-kde-tools (>= 0.12)).
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,6 +53,8 @@ if ( Q_WS_X11 )
- endif ( Q_WS_X11 )
- macro_optional_add_subdirectory( doc )
+Index: kde-baseapps/CMakeLists.txt
+===================================================================
+--- kde-baseapps.orig/CMakeLists.txt	2013-09-25 10:54:47.035271854 +0000
++++ kde-baseapps/CMakeLists.txt	2013-09-25 10:56:01.880338522 +0000
+@@ -63,3 +63,4 @@
+ 
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
  
 +include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
-+
- if(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
-     macro_display_feature_log()
- endif(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
diff --git a/debian/patches/enable_dlrestrictions.diff b/debian/patches/enable_dlrestrictions.diff
index eda19df..f74a9b0 100644
--- a/debian/patches/enable_dlrestrictions.diff
+++ b/debian/patches/enable_dlrestrictions.diff
@@ -7,19 +7,18 @@ Last-Update: 2011-05-25
 Enable REJECT:OTHERSOVERSION for these libraries because their ABI is typically
 not stable and structures frequently conflict.
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,6 +55,13 @@ macro_optional_add_subdirectory( doc )
+Index: kde-baseapps/CMakeLists.txt
+===================================================================
+--- kde-baseapps.orig/CMakeLists.txt	2013-09-25 11:01:28.931521848 +0000
++++ kde-baseapps/CMakeLists.txt	2013-09-25 11:02:24.045362189 +0000
+@@ -64,3 +64,10 @@
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
  
  include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
- 
++
 +# Enable DLResctrictions
 +if (CMAKE_BUILD_TYPE STREQUAL "Debian")
 +    find_package(DLRestrictions)
 +    set(DEFAULT_DLRESTRICTIONS "REJECT:OTHERSOVERSION")
 +    kde4deb_dlrestrictions_process_libraries()
 +endif (CMAKE_BUILD_TYPE STREQUAL "Debian")
-+
- if(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
-     macro_display_feature_log()
- endif(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")

-- 
KDE Base Applications module packaging