diff -Nru kate4-4.14.3/debian/changelog kate4-4.14.3/debian/changelog --- kate4-4.14.3/debian/changelog 2017-08-20 09:56:41.000000000 +0000 +++ kate4-4.14.3/debian/changelog 2017-12-02 23:05:34.000000000 +0000 @@ -1,9 +1,17 @@ -kate4 (4:4.14.3-4ubuntu2) artful; urgency=medium +kate4 (4:4.14.3-4ubuntu4) bionic; urgency=medium - * Try reverting to previous ubuntu packaging, with exception of the - patch to fix building with GCC7 + * Skip tests on problem architectures. kate4 is to be removed soon in + Bionic anyway - -- Rik Mills Sun, 20 Aug 2017 10:56:41 +0100 + -- Rik Mills Sat, 02 Dec 2017 23:05:34 +0000 + +kate4 (4:4.14.3-4ubuntu3) bionic; urgency=medium + + * Resync back with debian changes; remaining changes + - debian/patches: Add upstream_fix_ftbfs_gcc7.patch + - Add 'shared-mime-info' to testuite depends + + -- Rik Mills Sat, 02 Dec 2017 20:16:37 +0000 kate4 (4:4.14.3-4ubuntu1) artful; urgency=medium diff -Nru kate4-4.14.3/debian/control kate4-4.14.3/debian/control --- kate4-4.14.3/debian/control 2014-12-05 14:04:51.000000000 +0000 +++ kate4-4.14.3/debian/control 2016-06-19 05:48:30.000000000 +0000 @@ -9,21 +9,12 @@ debhelper (>= 9), kde-sc-dev-latest (>= 4:4.12), kdelibs5-dev (>= 4:4.14.2), - libkactivities-dev, - libpython2.7-dev, - libqjson-dev, - libqt4-opengl-dev, - libqtwebkit-dev, pkg-config, - pkg-kde-tools (>= 0.12), - python-kde4-dev (>= 4:4.9.80), - python-qt4-dev, - python-sip-dev -Standards-Version: 3.9.6 -XS-Testsuite: autopkgtest + pkg-kde-tools (>= 0.12) +Standards-Version: 3.9.8 Homepage: http://kate-editor.org/ -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-applications/kate.git -Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/kate.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-sc/kate.git +Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-sc/kate.git Package: katepart Architecture: any @@ -64,15 +55,3 @@ instead. . This package is a part of KDE 4 Base applications module. - -Package: libkateinterfaces4 -Architecture: any -Section: libs -Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: kate (<< 4:4.6.90) -Replaces: kate (<< 4:4.6.90) -Description: plugin interface for the kate editor - This library contains the code used by kate plugins that provide a better - integration into the app like tool views - . - This package is part of the KDE 4 Base applications module diff -Nru kate4-4.14.3/debian/kate-data.install kate4-4.14.3/debian/kate-data.install --- kate4-4.14.3/debian/kate-data.install 2014-12-05 14:42:58.000000000 +0000 +++ kate4-4.14.3/debian/kate-data.install 2016-06-19 05:10:08.000000000 +0000 @@ -1,33 +1,8 @@ -usr/lib/python2.7/dist-packages/PyKate4/__init__.py -usr/share/doc/kde/HTML/*/kate/* -usr/share/kde4/apps/kate/icons/ -usr/share/kde4/apps/kate/kateui.rc -usr/share/kde4/apps/kate/pate/ -usr/share/kde4/apps/kate/plugins/ -usr/share/kde4/apps/kate/tips usr/share/kde4/apps/katepart/ -usr/share/kde4/apps/katexmltools/ -usr/share/kde4/apps/kconf_update/kate-2.4.upd usr/share/kde4/apps/ktexteditor_exporter/ktexteditor_exporterui.rc usr/share/kde4/apps/ktexteditor_iconinserter/ktexteditor_iconinserterui.rc usr/share/kde4/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc usr/share/kde4/config/katemoderc -usr/share/kde4/config/katerc usr/share/kde4/config/kateschemarc usr/share/kde4/config/katesyntaxhighlightingrc usr/share/kde4/config/ktexteditor_codesnippets_core.knsrc -usr/share/kde4/services/katepate_block.desktop -usr/share/kde4/services/katepate_color_tools.desktop -usr/share/kde4/services/katepate_commentar.desktop -usr/share/kde4/services/katepate_format.desktop -usr/share/kde4/services/katepate_gid.desktop -usr/share/kde4/services/katepate_python_autocomplete.desktop -usr/share/kde4/services/katepate_python_autocomplete_jedi.desktop -usr/share/kde4/services/katepate_python_console_classic.desktop -usr/share/kde4/services/katepate_python_console_ipython.desktop -usr/share/kde4/services/katepate_python_utils.desktop -usr/share/kde4/services/katepate_try_open_file.desktop -usr/share/kde4/services/katepate_xml_pretty.desktop -usr/share/kde4/services/katesnippetsplugin.desktop -usr/share/kde4/services/pate.desktop -usr/share/kde4/servicetypes/katepythonplugin.desktop diff -Nru kate4-4.14.3/debian/kate-dbg.substvars kate4-4.14.3/debian/kate-dbg.substvars --- kate4-4.14.3/debian/kate-dbg.substvars 2014-12-05 14:44:34.000000000 +0000 +++ kate4-4.14.3/debian/kate-dbg.substvars 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -allLibraries=,libkatepartinterfaces4 (= 4:4.14.3-0ubuntu4) ,libkateinterfaces4 (= 4:4.14.3-0ubuntu4) diff -Nru kate4-4.14.3/debian/kate.install kate4-4.14.3/debian/kate.install --- kate4-4.14.3/debian/kate.install 2014-11-27 20:13:12.000000000 +0000 +++ kate4-4.14.3/debian/kate.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -usr/bin/kate -usr/lib/kde4/kate_kttsd.so -usr/lib/kde4/katebacktracebrowserplugin.so -usr/lib/kde4/katebuildplugin.so -usr/lib/kde4/katecloseexceptplugin.so -usr/lib/kde4/katectagsplugin.so -usr/lib/kde4/katefilebrowserplugin.so -usr/lib/kde4/katefiletemplates.so -usr/lib/kde4/katefiletreeplugin.so -usr/lib/kde4/kategdbplugin.so -usr/lib/kde4/katekonsoleplugin.so -usr/lib/kde4/katemailfilesplugin.so -usr/lib/kde4/kateopenheaderplugin.so -usr/lib/kde4/katepateplugin.so -usr/lib/kde4/kateprojectplugin.so -usr/lib/kde4/kateprojectplugin.so -usr/lib/kde4/katereplicodeplugin.so -usr/lib/kde4/katesearchplugin.so -usr/lib/kde4/katesnippetsplugin.so -usr/lib/kde4/katesqlplugin.so -usr/lib/kde4/katesymbolviewerplugin.so -usr/lib/kde4/katetabbarextensionplugin.so -usr/lib/kde4/katetabifyplugin.so -usr/lib/kde4/katetextfilterplugin.so -usr/lib/kde4/katexmlcheckplugin.so -usr/lib/kde4/katexmltoolsplugin.so -usr/lib/kde4/ktexteditor_lumen.so -usr/lib/kde4/plasma_applet_katesession.so -usr/lib/libkdeinit4_kate.so -usr/lib/python2.7/dist-packages/PyKate4/kate.so -usr/share/applications/kde4/kate.desktop -usr/share/kde4/services/kate_kttsd.desktop -usr/share/kde4/services/katebacktracebrowserplugin.desktop -usr/share/kde4/services/katebuildplugin.desktop -usr/share/kde4/services/katecloseexceptplugin.desktop -usr/share/kde4/services/katectagsplugin.desktop -usr/share/kde4/services/katefilebrowserplugin.desktop -usr/share/kde4/services/katefiletemplates.desktop -usr/share/kde4/services/katefiletreeplugin.desktop -usr/share/kde4/services/kategdbplugin.desktop -usr/share/kde4/services/katekonsoleplugin.desktop -usr/share/kde4/services/katemailfilesplugin.desktop -usr/share/kde4/services/kateopenheader.desktop -usr/share/kde4/services/kateprojectplugin.desktop -usr/share/kde4/services/katereplicodeplugin.desktop -usr/share/kde4/services/katesearch.desktop -usr/share/kde4/services/katesql.desktop -usr/share/kde4/services/katesymbolviewer.desktop -usr/share/kde4/services/katetabbarextension.desktop -usr/share/kde4/services/katetabifyplugin.desktop -usr/share/kde4/services/katetextfilter.desktop -usr/share/kde4/services/katexmlcheck.desktop -usr/share/kde4/services/katexmltools.desktop -usr/share/kde4/services/ktexteditor_lumen.desktop -usr/share/kde4/services/plasma-applet-katesession.desktop -usr/share/kde4/servicetypes/kateplugin.desktop diff -Nru kate4-4.14.3/debian/kate.lintian-overrides kate4-4.14.3/debian/kate.lintian-overrides --- kate4-4.14.3/debian/kate.lintian-overrides 2014-11-27 20:13:12.000000000 +0000 +++ kate4-4.14.3/debian/kate.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -kate: hardening-no-fortify-functions usr/lib/kde4/katectagsplugin.so diff -Nru kate4-4.14.3/debian/kwrite.install kate4-4.14.3/debian/kwrite.install --- kate4-4.14.3/debian/kwrite.install 2014-11-27 20:13:12.000000000 +0000 +++ kate4-4.14.3/debian/kwrite.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -usr/bin/kwrite -usr/lib/libkdeinit4_kwrite.so -usr/share/applications/kde4/kwrite.desktop -usr/share/doc/kde/HTML/en/kwrite/common -usr/share/doc/kde/HTML/en/kwrite/configuring.docbook -usr/share/doc/kde/HTML/en/kwrite/fundamentals.docbook -usr/share/doc/kde/HTML/en/kwrite/index.cache.bz2 -usr/share/doc/kde/HTML/en/kwrite/index.docbook -usr/share/doc/kde/HTML/en/kwrite/menus.docbook -usr/share/kde4/apps/kwrite/kwriteui.rc diff -Nru kate4-4.14.3/debian/libkateinterfaces4.install kate4-4.14.3/debian/libkateinterfaces4.install --- kate4-4.14.3/debian/libkateinterfaces4.install 2014-11-27 20:13:12.000000000 +0000 +++ kate4-4.14.3/debian/libkateinterfaces4.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/libkateinterfaces.so.4 -usr/lib/libkateinterfaces.so.4.* diff -Nru kate4-4.14.3/debian/not-installed kate4-4.14.3/debian/not-installed --- kate4-4.14.3/debian/not-installed 2014-11-27 20:13:12.000000000 +0000 +++ kate4-4.14.3/debian/not-installed 2016-06-19 05:44:42.000000000 +0000 @@ -1,6 +1,3 @@ -# moved my pkg-kde-tools -./usr/lib/libkdeinit4_kate.so -./usr/lib/libkdeinit4_kwrite.so - -# compressed manpage -./usr/share/man/man1/kate.1 +./usr/lib/kde4/ktexteditor_lumen.so +./usr/share/icons/hicolor/scalable/apps/ktexteditorautobrace.svgz +./usr/share/kde4/services/ktexteditor_lumen.desktop diff -Nru kate4-4.14.3/debian/patches/cmake-optional.diff kate4-4.14.3/debian/patches/cmake-optional.diff --- kate4-4.14.3/debian/patches/cmake-optional.diff 1970-01-01 00:00:00.000000000 +0000 +++ kate4-4.14.3/debian/patches/cmake-optional.diff 2016-06-19 05:03:37.000000000 +0000 @@ -0,0 +1,18 @@ +Author: Pino Toscano +Description: Allow disabling the build of some addons +Forwarded: not-needed +Origin: vendor +Last-Update: 2016-06-19 + +--- a/addons/CMakeLists.txt ++++ b/addons/CMakeLists.txt +@@ -2,7 +2,7 @@ + add_subdirectory (ktexteditor) + + # Kate plugins +-add_subdirectory (kate) ++macro_optional_add_subdirectory (kate) + + # Plasma applets +-add_subdirectory (plasma) ++macro_optional_add_subdirectory (plasma) diff -Nru kate4-4.14.3/debian/patches/cmake-policy.diff kate4-4.14.3/debian/patches/cmake-policy.diff --- kate4-4.14.3/debian/patches/cmake-policy.diff 1970-01-01 00:00:00.000000000 +0000 +++ kate4-4.14.3/debian/patches/cmake-policy.diff 2016-06-19 04:50:46.000000000 +0000 @@ -0,0 +1,18 @@ +Author: Pino Toscano +Description: Update cmake version & policy. + Set cmake_mininum_required to match kdelibs policy and enable newer cmake + policies. +Forwarded: not-needed +Last-Update: 2016-06-19 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,8 @@ + # Kate project + project (kate) + ++cmake_minimum_required(VERSION 2.8.9) ++ + # shared libs + set (LIBRARY_TYPE SHARED) + diff -Nru kate4-4.14.3/debian/patches/series kate4-4.14.3/debian/patches/series --- kate4-4.14.3/debian/patches/series 2017-08-20 09:54:09.000000000 +0000 +++ kate4-4.14.3/debian/patches/series 2017-08-20 06:19:50.000000000 +0000 @@ -1,3 +1,5 @@ sideeffects_in_asserts_are_evil.patch do_not_enforce_tests +cmake-policy.diff +cmake-optional.diff upstream_fix_ftbfs_gcc7.patch diff -Nru kate4-4.14.3/debian/rules kate4-4.14.3/debian/rules --- kate4-4.14.3/debian/rules 2014-12-05 14:15:00.000000000 +0000 +++ kate4-4.14.3/debian/rules 2016-06-19 05:59:46.000000000 +0000 @@ -1,14 +1,15 @@ #!/usr/bin/make -f include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk -libpkgs_addsubst_allLibraries = kate-dbg libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages) include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk override_dh_auto_configure: - $(overridden_command) -- -DPYTHON_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython2.7.so.1 + $(overridden_command) -- -DKDE4_BUILD_TESTS=false -DBUILD_kate=false -DBUILD_kwrite=false -DBUILD_doc=false -DBUILD_plasma=false -.PHONY: override_dh_auto_test +override_dh_auto_test: + # Disable dh_auto_test at build time + : override_dh_auto_install: $(overridden_command) diff -Nru kate4-4.14.3/debian/source/lintian-overrides kate4-4.14.3/debian/source/lintian-overrides --- kate4-4.14.3/debian/source/lintian-overrides 2014-11-27 20:13:12.000000000 +0000 +++ kate4-4.14.3/debian/source/lintian-overrides 2016-06-19 05:58:11.000000000 +0000 @@ -1,2 +1,6 @@ # Its a list of linters with it's licenses, not a license for this file -kate source: license-problem-json-evil addons/kate/pate/src/plugins/js_utils/js_lint.py +kate4 source: license-problem-json-evil addons/kate/pate/src/plugins/js_utils/js_lint.py +# Source with few long lines +kate4 source: source-contains-prebuilt-javascript-object part/script/data/commands/utils.js line length is 377 characters (>256) +# Source with few long lines +kate4 source: source-is-missing part/script/data/commands/utils.js line length is 377 characters (>256) diff -Nru kate4-4.14.3/debian/tests/control kate4-4.14.3/debian/tests/control --- kate4-4.14.3/debian/tests/control 2014-11-27 20:13:12.000000000 +0000 +++ kate4-4.14.3/debian/tests/control 2017-08-20 06:20:14.000000000 +0000 @@ -1,4 +1,4 @@ Tests: testsuite Depends: @, @builddeps@, build-essential, - xvfb, xauth, dbus-x11 + xvfb, xauth, dbus-x11, shared-mime-info Restrictions: rw-build-tree diff -Nru kate4-4.14.3/debian/tests/testsuite kate4-4.14.3/debian/tests/testsuite --- kate4-4.14.3/debian/tests/testsuite 2015-07-04 11:37:16.000000000 +0000 +++ kate4-4.14.3/debian/tests/testsuite 2017-12-02 23:05:27.000000000 +0000 @@ -1,5 +1,7 @@ #!/bin/sh +dpkg-architecture -e amd64 || dpkg-architecture -e i386 || exit 0 + sed -i 's/-DKDE4_BUILD_TESTS=false/-DKDE4_BUILD_TESTS=true/' debian/rules if [ -d /usr/lib/ccache ]; then export PATH="/usr/lib/ccache:$PATH"