[SCM] okteta packaging branch, kde4.12, updated. debian/4.11.3-3-25-gb83d5bc
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Feb 8 18:34:54 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/okteta.git;a=commitdiff;h=c8e1d1c
The following commit has been merged in the kde4.12 branch:
commit c8e1d1cd6116bd297e84710487e61d4ca6f09a6d
Author: Maximiliano Curia <maxy at debian.org>
Date: Wed Feb 5 01:45:18 2014 +0100
Sync patches with upstream.
---
debian/changelog | 10 ++--
debian/libokteta1core1.acc | 1 -
debian/okteta-dev.install | 1 -
debian/patches/install_addressrangelist | 12 -----
debian/patches/install_config-qca2 | 12 -----
debian/patches/install_containedstring | 12 -----
debian/patches/install_coordrange | 18 -------
debian/patches/install_poddata | 12 -----
debian/patches/install_selection | 12 -----
debian/patches/okteta-fix_forwarding_to_meanwhile | 13 +++++
debian/patches/okteta-fix_wrong_include | 19 +++++++
debian/patches/okteta-install_missing_headers | 60 +++++++++++++++++++++++
debian/patches/rename_modelstreamgeneratethread | 7 ---
debian/patches/series | 10 ++--
14 files changed, 98 insertions(+), 101 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6115a51..219c52d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,14 +12,10 @@ okteta (4:4.12.2-1) UNRELEASED; urgency=medium
* Bump Standards-Version to 3.9.5, no changes needed.
* Add autopkgtests.
* Add abi-compliance-checker info.
- * New patch: rename_modelstreamgeneratethread
- * New patch: install_coordrange
* Update install files.
- * New patch: install_config-qca2
- * New patch: install_poddata
- * New patch: install_containedstring
- * New patch: install_selection
- * New patch: install_addressrangelist
+ * New upstream patch: okteta-fix_wrong_include
+ * New upstream patch: okteta-fix_forwarding_to_meanwhile
+ * New upstream patch: okteta-install_missing_headers
-- Maximiliano Curia <maxy at debian.org> Tue, 04 Feb 2014 22:19:33 +0100
diff --git a/debian/libokteta1core1.acc b/debian/libokteta1core1.acc
index ec53c71..cc64405 100644
--- a/debian/libokteta1core1.acc
+++ b/debian/libokteta1core1.acc
@@ -28,7 +28,6 @@
/usr/include/okteta1/abstractbytearraymodel.h
/usr/include/okteta1/address.h
/usr/include/okteta1/addressrange.h
- /usr/include/okteta1/addressrangelist.h
/usr/include/okteta1/arraychangemetrics.h
/usr/include/okteta1/bookmarkable.h
/usr/include/okteta1/bookmark.h
diff --git a/debian/okteta-dev.install b/debian/okteta-dev.install
index b07c94b..5d661bb 100644
--- a/debian/okteta-dev.install
+++ b/debian/okteta-dev.install
@@ -343,7 +343,6 @@ usr/include/okteta1/abstractcolumnrenderer.h
usr/include/okteta1/abstractcolumnstylist.h
usr/include/okteta1/address.h
usr/include/okteta1/addressrange.h
-usr/include/okteta1/addressrangelist.h
usr/include/okteta1/arraychangemetrics.h
usr/include/okteta1/bookmark.h
usr/include/okteta1/bookmarkable.h
diff --git a/debian/patches/install_addressrangelist b/debian/patches/install_addressrangelist
deleted file mode 100644
index 8d2d6e8..0000000
--- a/debian/patches/install_addressrangelist
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: okteta/core/CMakeLists.txt
-===================================================================
---- okteta.orig/core/CMakeLists.txt 2014-02-03 23:12:33.531835517 +0100
-+++ okteta/core/CMakeLists.txt 2014-02-04 13:31:39.960871761 +0100
-@@ -78,6 +78,7 @@
- range.h
- numberrange.h
- addressrange.h
-+ addressrangelist.h
- valuecodec.h
- wordbytearrayservice.h
- )
diff --git a/debian/patches/install_config-qca2 b/debian/patches/install_config-qca2
deleted file mode 100644
index d1b4497..0000000
--- a/debian/patches/install_config-qca2
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: okteta/kasten/controllers/CMakeLists.txt
-===================================================================
---- okteta.orig/kasten/controllers/CMakeLists.txt 2014-02-04 02:17:43.372634128 +0100
-+++ okteta/kasten/controllers/CMakeLists.txt 2014-02-04 02:18:23.993605967 +0100
-@@ -537,6 +537,7 @@
- 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/install_containedstring b/debian/patches/install_containedstring
deleted file mode 100644
index 07e759d..0000000
--- a/debian/patches/install_containedstring
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: okteta/kasten/controllers/CMakeLists.txt
-===================================================================
---- okteta.orig/kasten/controllers/CMakeLists.txt 2014-02-04 02:30:48.243401922 +0100
-+++ okteta/kasten/controllers/CMakeLists.txt 2014-02-04 12:12:25.635054878 +0100
-@@ -525,6 +525,7 @@
- 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
diff --git a/debian/patches/install_coordrange b/debian/patches/install_coordrange
deleted file mode 100644
index c55c4fa..0000000
--- a/debian/patches/install_coordrange
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: okteta/gui/CMakeLists.txt
-===================================================================
---- okteta.orig/gui/CMakeLists.txt 2014-02-04 13:24:55.123541490 +0100
-+++ okteta/gui/CMakeLists.txt 2014-02-04 13:25:10.071885970 +0100
-@@ -92,9 +92,12 @@
- abstractbytearrayview.h
- bytearraycolumnview.h
- bytearrayrowview.h
-- bytearraytablelayout.h
-+ bytearraytablelayout.h
- bytearraytableranges.h
- offsetformat.h
-+ coord.h
-+ coordrange.h
-+ coordrangelist.h
- )
-
- set( oktetagui_LIB_CCHDRS
diff --git a/debian/patches/install_poddata b/debian/patches/install_poddata
deleted file mode 100644
index 0216946..0000000
--- a/debian/patches/install_poddata
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: okteta/kasten/controllers/CMakeLists.txt
-===================================================================
---- okteta.orig/kasten/controllers/CMakeLists.txt 2014-02-04 02:18:23.993605967 +0100
-+++ okteta/kasten/controllers/CMakeLists.txt 2014-02-04 02:30:48.243401922 +0100
-@@ -490,6 +490,7 @@
- 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
diff --git a/debian/patches/install_selection b/debian/patches/install_selection
deleted file mode 100644
index ad5d7db..0000000
--- a/debian/patches/install_selection
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: okteta/gui/CMakeLists.txt
-===================================================================
---- okteta.orig/gui/CMakeLists.txt 2014-02-04 13:28:51.196982224 +0100
-+++ okteta/gui/CMakeLists.txt 2014-02-04 13:29:23.393724514 +0100
-@@ -98,6 +98,7 @@
- coord.h
- coordrange.h
- coordrangelist.h
-+ selection.h
- )
-
- set( oktetagui_LIB_CCHDRS
diff --git a/debian/patches/okteta-fix_forwarding_to_meanwhile b/debian/patches/okteta-fix_forwarding_to_meanwhile
new file mode 100644
index 0000000..dcb7efa
--- /dev/null
+++ b/debian/patches/okteta-fix_forwarding_to_meanwhile
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..f679431
--- /dev/null
+++ b/debian/patches/okteta-fix_wrong_include
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 0000000..b905c2f
--- /dev/null
+++ b/debian/patches/okteta-install_missing_headers
@@ -0,0 +1,60 @@
+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/rename_modelstreamgeneratethread b/debian/patches/rename_modelstreamgeneratethread
deleted file mode 100644
index a285fef..0000000
--- a/debian/patches/rename_modelstreamgeneratethread
+++ /dev/null
@@ -1,7 +0,0 @@
-Index: okteta/libs/kasten/includes/ModelDataGenerateThread
-===================================================================
---- okteta.orig/libs/kasten/includes/ModelDataGenerateThread 2014-02-03 23:12:36.187896484 +0100
-+++ okteta/libs/kasten/includes/ModelDataGenerateThread 2014-02-04 01:12:01.981762813 +0100
-@@ -1 +1 @@
--#include "../../kasten2/modelstreamgeneratethread.h"
-+#include "../../kasten2/modeldatageneratethread.h"
diff --git a/debian/patches/series b/debian/patches/series
index 1f837a2..4bcdc85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,4 @@
enable_debianabimanager.diff
-rename_modelstreamgeneratethread
-install_coordrange
-install_config-qca2
-install_poddata
-install_containedstring
-install_selection
-install_addressrangelist
+okteta-fix_wrong_include
+okteta-fix_forwarding_to_meanwhile
+okteta-install_missing_headers
--
okteta packaging
More information about the pkg-kde-commits
mailing list