[SCM] KDE SDK module packaging branch, master, updated. debian/4.7.4-3-15-g87d65e9

[José Manuel Santamaría Lema]

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

The following commit has been merged in the master branch:
commit c3d0121ee7fcc82e206eef9190859d8ec3524d53
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sun Jun 17 00:01:42 2012 +0200

    Refresh other patches to make them apply without any offset.
---
 debian/changelog                                |    1 +
 debian/patches/append_kde.diff                  |    4 ++--
 debian/patches/dont_export_private_classes.diff |   12 ++++++------
 debian/patches/enable_debianabimanager.diff     |    2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a673b35..b27ec57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ kdesdk (4:4.8.4-0r0) UNRELEASED; urgency=low
     - Bump libkonq5-dev to >= 4:4.8.
   * Update patches:
     - update dont_export_private_classes.diff.
+    - refresh other patches to make them apply without any offset.
   * Add watch file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 24 Apr 2012 12:20:29 +0200
diff --git a/debian/patches/append_kde.diff b/debian/patches/append_kde.diff
index c484987..fea170c 100644
--- a/debian/patches/append_kde.diff
+++ b/debian/patches/append_kde.diff
@@ -5,7 +5,7 @@ Bug-Debian: http://bugs.debian.org/461095
 
 --- a/scripts/CMakeLists.txt
 +++ b/scripts/CMakeLists.txt
-@@ -42,7 +42,6 @@
+@@ -42,7 +42,6 @@ install(PROGRAMS
    cvs-clean 
    cvsblame 
    colorsvn 
@@ -13,7 +13,7 @@ Bug-Debian: http://bugs.debian.org/461095
    svnlastchange 
    svnversions 
    extractrc 
-@@ -63,4 +62,5 @@
+@@ -62,4 +61,5 @@ install(PROGRAMS
    kde_generate_export_header
    kde-systemsettings-tree.py
    DESTINATION ${BIN_INSTALL_DIR})
diff --git a/debian/patches/dont_export_private_classes.diff b/debian/patches/dont_export_private_classes.diff
index 5bface1..60bb017 100644
--- a/debian/patches/dont_export_private_classes.diff
+++ b/debian/patches/dont_export_private_classes.diff
@@ -1,13 +1,13 @@
 From: Modestas Vainius <modax at debian.org>
 Subject: Do not export private classes
-Last-Update: 2011-05-02
+Last-Update: 2012-06-16
 Forwarded: no
 Origin: vendor
 
 --- a/okteta/libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.h
 +++ b/okteta/libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.h
-@@ -36,7 +36,7 @@
- namespace Kasten
+@@ -34,7 +34,7 @@
+ namespace Kasten1
  {
  
 -class KASTENCORE_EXPORT AbstractFileSystemConnectJobPrivate : public AbstractConnectJobPrivate
@@ -17,7 +17,7 @@ Origin: vendor
      AbstractFileSystemConnectJobPrivate( AbstractFileSystemConnectJob* parent,
 --- a/okteta/libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.h
 +++ b/okteta/libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.h
-@@ -38,7 +38,7 @@ namespace Kasten
+@@ -36,7 +36,7 @@ namespace Kasten1
  class AbstractModelFileSystemSynchronizer;
  
  
@@ -28,8 +28,8 @@ Origin: vendor
      AbstractFileSystemSyncFromRemoteJobPrivate( AbstractFileSystemSyncFromRemoteJob* parent,
 --- a/okteta/libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.h
 +++ b/okteta/libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.h
-@@ -35,7 +35,7 @@
- namespace Kasten
+@@ -33,7 +33,7 @@
+ namespace Kasten1
  {
  
 -class KASTENCORE_EXPORT AbstractFileSystemSyncWithRemoteJobPrivate : public AbstractSyncWithRemoteJobPrivate
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index bf0b0db..dad489d 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
-@@ -106,3 +106,6 @@
+@@ -109,3 +109,6 @@ endif(LIBXSLT_FOUND AND LIBXML2_FOUND AN
  
  macro_optional_add_subdirectory(doc)
  macro_display_feature_log()

-- 
KDE SDK module packaging