[SCM] KDE SDK module packaging branch, master, updated. debian/4.7.2-1-2-g8e80571

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 8e80571881a8a0894dbfd0bb3a6edca07b7db693
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Dec 6 09:06:38 2011 +0100

    Fix FTBFS on big endian architectures.
---
 debian/changelog                      |    6 +++
 debian/okteta-dev.install             |    4 --
 debian/okteta.install                 |    1 -
 debian/patches/okteta_big_endian.diff |   56 +++++++++++++++++++++++++++++++++
 debian/patches/series                 |    1 +
 debian/rules                          |   10 ++++++
 6 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c11f0b3..31a10c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ kdesdk (4:4.7.4-0r0) UNRELEASED; urgency=low
   
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest to 4:4.7.4.
+  * Make this source package build properly with big endian architectures:
+    - Add okteta_big_endian.diff to disable part of okteta funcionality
+      (allegedly broken on big endian architectures).
+    - Change debian/rules and some debian/*.install to install conditionally
+      some files depending on the architecture endian-ness. These files are
+      related to the allegedly broken functionality mentioned above.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 06 Dec 2011 05:28:26 +0100
 
diff --git a/debian/okteta-dev.install b/debian/okteta-dev.install
index 1047aa8..8bb52fd 100644
--- a/debian/okteta-dev.install
+++ b/debian/okteta-dev.install
@@ -287,10 +287,6 @@ usr/include/kasten/stringsextracttool.h
 usr/include/kasten/stringsextracttoolfactory.h
 usr/include/kasten/stringsextracttoolview.h
 usr/include/kasten/stringsextracttoolviewfactory.h
-usr/include/kasten/structtool.h
-usr/include/kasten/structtoolview.h
-usr/include/kasten/structurestoolfactory.h
-usr/include/kasten/structurestoolviewfactory.h
 usr/include/kasten/switchviewcontroller.h
 usr/include/kasten/synchronizecontroller.h
 usr/include/kasten/tabbedviews.h
diff --git a/debian/okteta.install b/debian/okteta.install
index 57212c1..160dd25 100644
--- a/debian/okteta.install
+++ b/debian/okteta.install
@@ -18,7 +18,6 @@ usr/share/kde4/apps/oktetapart/oktetapartbrowserui.rc
 usr/share/kde4/apps/oktetapart/oktetapartreadonlyui.rc
 usr/share/kde4/apps/oktetapart/oktetapartreadwriteui.rc
 usr/share/kde4/config.kcfg/structviewpreferences.kcfg
-usr/share/kde4/config/okteta-structures.knsrc
 usr/share/kde4/services/kbytearrayedit.desktop
 usr/share/kde4/services/oktetapart.desktop
 usr/share/mime/packages/okteta.xml
diff --git a/debian/patches/okteta_big_endian.diff b/debian/patches/okteta_big_endian.diff
new file mode 100644
index 0000000..85e6d70
--- /dev/null
+++ b/debian/patches/okteta_big_endian.diff
@@ -0,0 +1,56 @@
+--- a/okteta/kasten/controllers/CMakeLists.txt
++++ b/okteta/kasten/controllers/CMakeLists.txt
+@@ -394,6 +394,15 @@ set( OKTETA_KASTEN_CONTROLLERS_SRCS
+   ${STRUCTVIEW_SRCS}
+ )
+ 
++if( NOT NO_STRUCTURES_TOOL )
++set( STRUCTVIEW_HDRS
++  view/structures/structtool.h
++  view/structures/structtoolview.h
++  view/structures/structurestoolfactory.h
++  view/structures/structurestoolviewfactory.h
++)
++endif( NOT NO_STRUCTURES_TOOL )
++
+ set( okteta_kastencontrollers_LIB_HDRS
+   oktetakastencontrollers_export.h
+   view/print/printcontroller.h
+@@ -441,10 +450,6 @@ set( okteta_kastencontrollers_LIB_HDRS
+   view/stringsextract/stringsextracttoolviewfactory.h
+   view/search/searchcontroller.h
+   view/search/searchuserqueryable.h
+-  view/structures/structtool.h
+-  view/structures/structtoolview.h
+-  view/structures/structurestoolfactory.h
+-  view/structures/structurestoolviewfactory.h
+   document/info/documentinfotoolview.h
+   document/info/documentinfotool.h
+   document/overwriteonly/overwriteonlycontroller.h
+@@ -481,7 +486,13 @@ install( FILES ${okteta_kastencontroller
+   DESTINATION ${OKTETAKASTEN_INCLUDE_INSTALL_DIR}
+   COMPONENT Devel
+ )
++if( NOT NO_STRUCTURES_TOOL )
++install( FILES ${STRUCTVIEW_HDRS}
++  DESTINATION ${OKTETAKASTEN_INCLUDE_INSTALL_DIR}
++  COMPONENT Devel
++)
+ install( FILES view/structures/kns/okteta-structures.knsrc  DESTINATION  ${CONFIG_INSTALL_DIR} )
++endif( NOT NO_STRUCTURES_TOOL )
+ 
+ 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>
diff --git a/debian/patches/series b/debian/patches/series
index 3bb9214..edd99e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 append_kde.diff
 enable_debianabimanager.diff
 dont_export_private_classes.diff
+okteta_big_endian.diff
diff --git a/debian/rules b/debian/rules
index 1450078..b5474ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,16 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
 .PHONY: override_dh_auto_test
 
+override_dh_install:
+	$(overridden_command)
+ifeq ($(DEB_HOST_ARCH_ENDIAN),little)
+	dh_install --autodest -pokteta-dev usr/include/kasten/structtool.h
+	dh_install --autodest -pokteta-dev usr/include/kasten/structtoolview.h
+	dh_install --autodest -pokteta-dev usr/include/kasten/structurestoolfactory.h
+	dh_install --autodest -pokteta-dev usr/include/kasten/structurestoolviewfactory.h
+	dh_install --autodest -pokteta usr/share/kde4/config/okteta-structures.knsrc
+endif
+
 override_dh_makeshlibs:
 	$(overridden_command) -- -c0
 

-- 
KDE SDK module packaging