[SCM] KDE Base Applications module packaging branch, kde4.9, updated. debian/4.8.4-2-6-g01789c6

[José Manuel Santamaría Lema]

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

The following commit has been merged in the kde4.9 branch:
commit 75df3dbb9168c0e894cce2091cf77816fe56fffb
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Jan 11 00:50:35 2013 +0100

    Update patches to make them apply without any offset.
---
 debian/changelog                            |    3 +++
 debian/patches/enable_debianabimanager.diff |    2 +-
 debian/patches/enable_dlrestrictions.diff   |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22b806b..b46db82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ kde-baseapps (4:4.9.5-0r0) UNRELEASED; urgency=low
 
   * New upstream release. 
 
+  [ José Manuel Santamaría Lema ]
+  * Update patches to make them apply without any offset.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 11 Jan 2013 00:43:45 +0100
 
 kde-baseapps (4:4.8.4-2) unstable; urgency=low
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index 38656fe..21ec0c4 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -7,7 +7,7 @@ For more information about DebianABIManager, refer to
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -42,6 +42,8 @@ if ( Q_WS_X11 )
+@@ -39,6 +39,8 @@ if ( Q_WS_X11 )
  endif ( Q_WS_X11 )
  macro_optional_add_subdirectory( doc )
  
diff --git a/debian/patches/enable_dlrestrictions.diff b/debian/patches/enable_dlrestrictions.diff
index 6e77f19..7e01a8e 100644
--- a/debian/patches/enable_dlrestrictions.diff
+++ b/debian/patches/enable_dlrestrictions.diff
@@ -9,7 +9,7 @@ not stable and structures frequently conflict.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -44,6 +44,13 @@ macro_optional_add_subdirectory( doc )
+@@ -41,6 +41,13 @@ macro_optional_add_subdirectory( doc )
  
  include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
  

-- 
KDE Base Applications module packaging