[SCM] ktexteditor packaging branch, kubuntu_unstable, updated. ubuntu/5.15.0-0ubuntu1-2-g54baee7

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/ktexteditor.git;a=commitdiff;h=54baee7

The following commit has been merged in the kubuntu_unstable branch:
commit 54baee77dcd14ca1e44e5ea348eaa82f4ac251b5
Author: Rohan Garg <rohan at garg.io>
Date:   Mon Oct 19 16:21:58 2015 +0200

    Drop kubuntu_workaround-katehighlightingindexer-arm.diff, because KCI doesn't build arm packages on QEMU anymore, and Mobile KCI builds them on real HW.
---
 debian/changelog                                   |  6 +++++
 ...ntu_workaround-katehighlightingindexer-arm.diff | 31 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f964f58..ffbd253 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
 ktexteditor (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
 
+  [ Scarlett Clark ]
   * Vivid backport. 
 
+  [ Rohan Garg ]
+  * Drop kubuntu_workaround-katehighlightingindexer-arm.diff, because KCI
+    doesn't build arm packages on QEMU anymore, and Mobile KCI builds them
+    on real HW.
+
  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 09 Oct 2015 00:15:37 -0700
 
 ktexteditor (5.15.0-0ubuntu1) wily; urgency=medium
diff --git a/debian/patches/kubuntu_workaround-katehighlightingindexer-arm.diff b/debian/patches/kubuntu_workaround-katehighlightingindexer-arm.diff
deleted file mode 100644
index 451266a..0000000
--- a/debian/patches/kubuntu_workaround-katehighlightingindexer-arm.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Work around breaking qt apps on armhf qemu
- build fails on launchpad because armhf qemu breaks with threads and qt uses thread
-Author: Jonathan and Harald
-Origin: me
-Last-Update: 2015-06-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: ktexteditor-5.10.0+git20150604.2354+15.04/src/syntax/data/CMakeLists.txt
-===================================================================
---- ktexteditor-5.10.0+git20150604.2354+15.04.orig/src/syntax/data/CMakeLists.txt
-+++ ktexteditor-5.10.0+git20150604.2354+15.04/src/syntax/data/CMakeLists.txt
-@@ -45,11 +45,14 @@ endforeach()
- add_executable(katehighlightingindexer katehighlightingindexer.cpp)
- target_link_libraries(katehighlightingindexer Qt5::XmlPatterns
- )
--add_custom_command(OUTPUT ${INDEXFILE_OUT}
--  COMMAND katehighlightingindexer ${INDEXFILE_OUT} ${LANGUAGE_XSD} ${INDEXFILE_IN}
--  DEPENDS katehighlightingindexer.cpp ${LANGUAGE_XSD} ${ALL_HIGHLIGHTERS} ${INDEXFILE_IN})
--add_custom_target(GenerateIndexFile ALL DEPENDS ${INDEXFILE_OUT})
- 
--install(FILES ${INDEXFILE_OUT} ${LANGUAGE_XSD} ${ALL_HIGHLIGHTERS} DESTINATION ${KDE_INSTALL_DATADIR}/katepart5/syntax)
-+if(NOT "$ENV{DEB_BUILD_ARCH}" STREQUAL "armhf")
-+  add_custom_command(OUTPUT ${INDEXFILE_OUT}
-+    COMMAND katehighlightingindexer ${INDEXFILE_OUT} ${LANGUAGE_XSD} ${INDEXFILE_IN}
-+    DEPENDS katehighlightingindexer.cpp ${LANGUAGE_XSD} ${ALL_HIGHLIGHTERS} ${INDEXFILE_IN})
-+  add_custom_target(GenerateIndexFile ALL DEPENDS ${INDEXFILE_OUT})
-+endif()
-+
-+install(FILES ${LANGUAGE_XSD} ${ALL_HIGHLIGHTERS} DESTINATION ${KDE_INSTALL_DATADIR}/katepart5/syntax)
- 
- endif()
diff --git a/debian/patches/series b/debian/patches/series
index 9ecbd4d..360e81d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 katesyntaxtest_check_basename
-kubuntu_workaround-katehighlightingindexer-arm.diff

-- 
ktexteditor packaging