[SCM] KDevelop packaging branch, master, updated. debian/4.5.1-1-6-g8844c3b

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevelop.git;a=commitdiff;h=a57d76c

The following commit has been merged in the master branch:
commit a57d76cc75026a37300a28c9917d90b8ca4d699b
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sat Apr 27 11:07:37 2013 +0200

    Remove patch okteta_optional_structures_tool
    
    BIG_ENDIAN compile switch was implemented by upstream.
---
 debian/changelog                                   |    4 ++
 .../patches/okteta_optional_structures_tool.diff   |   53 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1cea524..c496200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ kdevelop (4:4.5.0-0r0) UNRELEASED; urgency=low
 
   [ Andreas Cord-Landwehr]
   * Bump build dependency for kdevplatform-dev to 1.5.0.
+  * Remove patch for compile switch for Okteta structure tool since
+    BIG_ENDIAN compile switch implemented by upstream
+    (remove patch okteta_optional_structures_tool.diff)
+
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 25 May 2012 23:56:49 +0200
 
diff --git a/debian/patches/okteta_optional_structures_tool.diff b/debian/patches/okteta_optional_structures_tool.diff
deleted file mode 100644
index 4ccb1aa..0000000
--- a/debian/patches/okteta_optional_structures_tool.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Do not use the structures tool if not compiled in Okteta.
- Currently, the structures plugin of Okteta is compiled only on little endian
- architectures; this plugin uses it assuming it is always compiled.
- Check at cmake time whether the structures tool is available in the found
- kasten headers, and if it is not then disable the usage of the structures
- tool.
-Last-Update: 2012-03-15
-Forwarded: no
-
---- a/utils/okteta/oktetaplugin.cpp
-+++ b/utils/okteta/oktetaplugin.cpp
-@@ -43,8 +43,10 @@
- #include <bytetabletoolfactory.h>
- #include <bookmarkstoolviewfactory.h>
- #include <bookmarkstoolfactory.h>
-+#ifndef OKTETA_NO_STRUCTURES_TOOL
- #include <structurestoolviewfactory.h>
- #include <structurestoolfactory.h>
-+#endif
- // KDev
- #include <project/projectmodel.h>
- #include <interfaces/icore.h>
-@@ -94,7 +96,9 @@
-     addTool( uiController, new Kasten::ByteTableToolViewFactory(), new Kasten::ByteTableToolFactory() );
-     addTool( uiController, new Kasten::InfoToolViewFactory(), new Kasten::InfoToolFactory() );
-     addTool( uiController, new Kasten::PodDecoderToolViewFactory(), new Kasten::PodDecoderToolFactory() );
-+#ifndef OKTETA_NO_STRUCTURES_TOOL
-     addTool( uiController, new Kasten::StructuresToolViewFactory(), new Kasten::StructuresToolFactory() );
-+#endif
-     addTool( uiController, new Kasten::BookmarksToolViewFactory, new Kasten::BookmarksToolFactory() );
- 
-     KDevelop::IDocumentController* documentController = core()->documentController();
---- a/utils/okteta/CMakeLists.txt
-+++ b/utils/okteta/CMakeLists.txt
-@@ -1,5 +1,6 @@
- project( okteta )
- 
-+find_file(KASTEN_STRUCTTOOL_H structtool.h PATHS ${LIBKASTEN_INCLUDE_DIR} NO_DEFAULT_PATH)
- 
- include_directories( ${okteta_SOURCE_DIR} ${okteta_BINARY_DIR} )
- 
-@@ -7,6 +8,10 @@
-     -DKASTEN_VERSION=${LIBKASTEN_VERSION}
- )
- 
-+if(NOT KASTEN_STRUCTTOOL_H)
-+    add_definitions(-DOKTETA_NO_STRUCTURES_TOOL)
-+endif()
-+
- include_directories(
-   ${LIBKASTEN_INCLUDE_DIRS}
-   ${LIBOKTETA_INCLUDE_DIRS}
diff --git a/debian/patches/series b/debian/patches/series
index 38d171b..ae83830 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-okteta_optional_structures_tool.diff
 fix-parallel.diff

-- 
KDevelop packaging