[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=448263b

The following commit has been merged in the master branch:
commit 448263b4e149ae34f2d17301b63a3929de7b07ee
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Jun 16 23:38:17 2012 +0200

    Update okteta_big_endian.diff.
---
 debian/changelog                      |    2 ++
 debian/patches/okteta_big_endian.diff |   23 ++++-------------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92692e3..a673b35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ kdesdk (4:4.8.4-0r0) UNRELEASED; urgency=low
     - Bump kde-sc-dev-latest to 4:4.8.4.
     - Bump kdepimlibs5-dev to >= 4:4.8.
     - Bump libkonq5-dev to >= 4:4.8.
+  * Update patches:
+    - update dont_export_private_classes.diff.
   * 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/okteta_big_endian.diff b/debian/patches/okteta_big_endian.diff
index 2ee0482..14a0ec9 100644
--- a/debian/patches/okteta_big_endian.diff
+++ b/debian/patches/okteta_big_endian.diff
@@ -2,13 +2,11 @@ Author: José Manuel Santamaría Lema <panfaust at gmail.com>
 Author: Alexander Richardson <alex.richardson at gmx.de>
 Description: This patch makes okteta build on big endian architectures, also
  avoids installing unnecessary files for those architectures.
- Part of this patch is already applied on upstream VCS.
-Applied-Upstream: 4.8, commit:1258090 (for okteta/program/mainwindow.cpp)
-Last-Update: 2011-12-08
+Last-Update: 2012-06-16
 
 --- a/okteta/kasten/controllers/CMakeLists.txt
 +++ b/okteta/kasten/controllers/CMakeLists.txt
-@@ -394,6 +394,15 @@ set( OKTETA_KASTEN_CONTROLLERS_SRCS
+@@ -430,6 +430,15 @@ set( OKTETA_KASTEN_CONTROLLERS_SRCS
    ${STRUCTVIEW_SRCS}
  )
  
@@ -24,7 +22,7 @@ Last-Update: 2011-12-08
  set( okteta_kastencontrollers_LIB_HDRS
    oktetakastencontrollers_export.h
    view/print/printcontroller.h
-@@ -441,10 +450,6 @@ set( okteta_kastencontrollers_LIB_HDRS
+@@ -477,10 +486,6 @@ set( okteta_kastencontrollers_LIB_HDRS
    view/stringsextract/stringsextracttoolviewfactory.h
    view/search/searchcontroller.h
    view/search/searchuserqueryable.h
@@ -35,7 +33,7 @@ Last-Update: 2011-12-08
    document/info/documentinfotoolview.h
    document/info/documentinfotool.h
    document/overwriteonly/overwriteonlycontroller.h
-@@ -481,7 +486,13 @@ install( FILES ${okteta_kastencontroller
+@@ -518,7 +523,13 @@ install( FILES ${okteta_kastencontroller
    DESTINATION ${OKTETAKASTEN_INCLUDE_INSTALL_DIR}
    COMPONENT Devel
  )
@@ -49,16 +47,3 @@ Last-Update: 2011-12-08
  
  set( elf_structure_FILES
    view/structures/examples/elf/elf.desktop
---- a/okteta/program/mainwindow.cpp
-+++ b/okteta/program/mainwindow.cpp
-@@ -43,8 +43,10 @@
- #include <bytetable/bytetabletool.h>
- #include <bookmarks/bookmarkstoolview.h>
- #include <bookmarks/bookmarkstool.h>
-+#ifndef NO_STRUCTURES_TOOL
- #include <structures/structtoolview.h>
- #include <structures/structtool.h>
-+#endif
- // Kasten tools
- #include <document/versionview/versionviewtoolview.h>
- #include <document/versionview/versionviewtool.h>

-- 
KDE SDK module packaging