[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit a5fd41c3c16f8f46e450345ebd51712b89b37db7
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Feb 15 00:26:14 2013 +0100

    Refresh various patches to make them apply without any offset.
---
 debian/patches/enable_debianabimanager.diff      |    2 +-
 debian/patches/enable_dlrestrcitions.diff        |    2 +-
 debian/patches/kdm_vt_switching_on_kfreebsd.diff |    2 +-
 debian/patches/use_dejavu_as_default_font.diff   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index 6784cdb..adbf75e 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -9,7 +9,7 @@ For more information about DebianABIManager, refer to
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -251,3 +251,6 @@ install(EXPORT kdeworkspaceLibraryTarget
+@@ -267,3 +267,6 @@ install(EXPORT kdeworkspaceLibraryTarget
          NAMESPACE ${KDE4WORKSPACE_TARGET_PREFIX}
          DESTINATION ${_KDE4WorkspaceConfig_INSTALL_DIR}
          FILE KDE4WorkspaceLibraryTargets.cmake )
diff --git a/debian/patches/enable_dlrestrcitions.diff b/debian/patches/enable_dlrestrcitions.diff
index 32cdcfd..34f58f0 100644
--- a/debian/patches/enable_dlrestrcitions.diff
+++ b/debian/patches/enable_dlrestrcitions.diff
@@ -9,7 +9,7 @@ not stable and structures frequently conflict.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -254,3 +254,10 @@ install(EXPORT kdeworkspaceLibraryTarget
+@@ -270,3 +270,10 @@ install(EXPORT kdeworkspaceLibraryTarget
  
  # Add support for DebianABIManager
  include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff --git a/debian/patches/kdm_vt_switching_on_kfreebsd.diff b/debian/patches/kdm_vt_switching_on_kfreebsd.diff
index 3646c60..de2a130 100644
--- a/debian/patches/kdm_vt_switching_on_kfreebsd.diff
+++ b/debian/patches/kdm_vt_switching_on_kfreebsd.diff
@@ -125,7 +125,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
  #endif
 --- a/kdm/backend/client.c
 +++ b/kdm/backend/client.c
-@@ -1339,7 +1339,11 @@ startClient(volatile int *pid)
+@@ -1349,7 +1349,11 @@ startClient(volatile int *pid)
      
  # ifdef HAVE_VTS
      if (td->serverVT > 0)
diff --git a/debian/patches/use_dejavu_as_default_font.diff b/debian/patches/use_dejavu_as_default_font.diff
index a9426f2..4816ddc 100644
--- a/debian/patches/use_dejavu_as_default_font.diff
+++ b/debian/patches/use_dejavu_as_default_font.diff
@@ -1,6 +1,6 @@
 --- a/kcontrol/fonts/fonts.cpp
 +++ b/kcontrol/fonts/fonts.cpp
-@@ -523,13 +523,13 @@ KFonts::KFonts(QWidget *parent, const QV
+@@ -525,13 +525,13 @@ KFonts::KFonts(QWidget *parent, const QV
    QFont f1("Monospace", 16;
    QFont f2("Sans Serif", 16); // toolbar
  #else

-- 
KDE Base Workspace module packaging