[SCM] okteta packaging branch, master, updated. debian/4.12.4-1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit affd4f81cb3fe90473c0be5087cebedca74cc954
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Mar 1 22:29:36 2014 +0100

    Remove patches: okteta-fix_forwarding_to_meanwhile okteta-fix_wrong_include okteta-install_missing_headers
---
 debian/changelog                                  |  2 +
 debian/patches/okteta-fix_forwarding_to_meanwhile | 13 -----
 debian/patches/okteta-fix_wrong_include           | 19 -------
 debian/patches/okteta-install_missing_headers     | 60 -----------------------
 debian/patches/series                             |  3 --
 debian/rules                                      |  5 --
 6 files changed, 2 insertions(+), 100 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9077b5c..46f7307 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 okteta (4:4.12.3-1~) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove patches: okteta-fix_forwarding_to_meanwhile okteta-
+    fix_wrong_include okteta-install_missing_headers
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 28 Feb 2014 23:27:30 +0100
 
diff --git a/debian/patches/okteta-fix_forwarding_to_meanwhile b/debian/patches/okteta-fix_forwarding_to_meanwhile
deleted file mode 100644
index dcb7efa..0000000
--- a/debian/patches/okteta-fix_forwarding_to_meanwhile
+++ /dev/null
@@ -1,13 +0,0 @@
-commit 8078d3fe3e592c195537e652378c67efb3d75d4e
-Author: Friedrich W. H. Kossebau <kossebau at kde.org>
-Date:   Tue Feb 4 20:55:29 2014 +0100
-
-    Fix forwarding to meanwhile renamed modelstreamgeneratethread.h
-
-diff --git a/libs/kasten/includes/ModelDataGenerateThread b/libs/kasten/includes/ModelDataGenerateThread
-index 7768621..2295117 100644
---- a/libs/kasten/includes/ModelDataGenerateThread
-+++ b/libs/kasten/includes/ModelDataGenerateThread
-@@ -1 +1 @@
--#include "../../kasten2/modelstreamgeneratethread.h"
-+#include "../../kasten2/modeldatageneratethread.h"
diff --git a/debian/patches/okteta-fix_wrong_include b/debian/patches/okteta-fix_wrong_include
deleted file mode 100644
index f679431..0000000
--- a/debian/patches/okteta-fix_wrong_include
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 05ec362b6a5984c8664818c9d6865e6a811f9973
-Author: Friedrich W. H. Kossebau <kossebau at kde.org>
-Date:   Tue Feb 4 20:54:38 2014 +0100
-
-    Fix wrong include of addressrangelist.h (not part of installed headers)
-
-diff --git a/gui/bytearraytableranges.h b/gui/bytearraytableranges.h
-index 9f508a6..4d0f148 100644
---- a/gui/bytearraytableranges.h
-+++ b/gui/bytearraytableranges.h
-@@ -28,7 +28,7 @@
- #include "coordrangelist.h"
- #include "oktetagui_export.h"
- // Okteta core
--#include "addressrangelist.h"
-+#include "addressrange.h"
- 
- 
- namespace Okteta
diff --git a/debian/patches/okteta-install_missing_headers b/debian/patches/okteta-install_missing_headers
deleted file mode 100644
index b905c2f..0000000
--- a/debian/patches/okteta-install_missing_headers
+++ /dev/null
@@ -1,60 +0,0 @@
-commit ef71a3e15f63f8cd886b44a3c2acff3c5ed95f45
-Author: Friedrich W. H. Kossebau <kossebau at kde.org>
-Date:   Tue Feb 4 20:56:36 2014 +0100
-
-    Install missing headers (referenced from others)
-    
-    Thanks to Maximiliano Curia for hint
-
-diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
-index 9c5700a..63e40ac 100644
---- a/gui/CMakeLists.txt
-+++ b/gui/CMakeLists.txt
-@@ -82,6 +82,10 @@ set( oktetagui_LIB_HDRS
-   line.h
-   linepositionrange.h
-   linerange.h
-+  coord.h
-+  coordrange.h
-+  coordrangelist.h
-+  selection.h
-   abstractbytearraycolumnrenderer.h
-   offsetcolumnrenderer.h
-   bordercolumnrenderer.h
-@@ -92,7 +96,7 @@ set( oktetagui_LIB_HDRS
-   abstractbytearrayview.h
-   bytearraycolumnview.h
-   bytearrayrowview.h
--  bytearraytablelayout.h 
-+  bytearraytablelayout.h
-   bytearraytableranges.h
-   offsetformat.h
- )
-diff --git a/kasten/controllers/CMakeLists.txt b/kasten/controllers/CMakeLists.txt
-index 8648b9f..fc7006e 100644
---- a/kasten/controllers/CMakeLists.txt
-+++ b/kasten/controllers/CMakeLists.txt
-@@ -491,6 +491,7 @@ set( okteta_kastencontrollers_LIB_HDRS
-   view/bookmarks/bookmarkstoolfactory.h
-   view/bookmarks/bookmarkstoolviewfactory.h
-   view/overwritemode/overwritemodecontroller.h
-+  view/poddecoder/poddata.h
-   view/poddecoder/poddecodertool.h
-   view/poddecoder/poddecodertoolview.h
-   view/poddecoder/poddecodertoolfactory.h
-@@ -525,6 +526,7 @@ set( okteta_kastencontrollers_LIB_HDRS
-   view/viewstatus/viewstatuscontroller.h
-   view/viewprofiles/viewprofilecontroller.h
-   view/viewprofiles/viewprofilesmanagecontroller.h
-+  view/stringsextract/containedstring.h
-   view/stringsextract/stringsextracttool.h
-   view/stringsextract/stringsextracttoolview.h
-   view/stringsextract/stringsextracttoolfactory.h
-@@ -538,6 +540,7 @@ set( okteta_kastencontrollers_LIB_HDRS
-   document/info/documentinfotoolview.h
-   document/info/documentinfotool.h
-   document/overwriteonly/overwriteonlycontroller.h
-+  ${CMAKE_CURRENT_BINARY_DIR}/config-qca2.h
- )
- 
- kde4_add_library( ${oktetakastencontrollers_LIB}  SHARED ${OKTETA_KASTEN_CONTROLLERS_SRCS} )
diff --git a/debian/patches/series b/debian/patches/series
index 4bcdc85..ba161c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
 enable_debianabimanager.diff
-okteta-fix_wrong_include
-okteta-fix_forwarding_to_meanwhile
-okteta-install_missing_headers
diff --git a/debian/rules b/debian/rules
index 947a41d..eb4556c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,3 @@ dh = --with sodeps
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
 .PHONY: override_dh_auto_test
-
-override_dh_auto_install:
-	$(overridden_command)
-	sed -i 's/<versionable\.h>/"..\/versionable.h"/' \
-	    debian/tmp/usr/include/kasten2/okteta1/bytearraydocument.h

-- 
okteta packaging