[SCM] kate packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-2-12-g8e954f5
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Thu Dec 4 18:21:34 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/kate.git;a=commitdiff;h=8e954f5
The following commit has been merged in the kubuntu_vivid_archive branch:
commit 8e954f5965dc0e34fa8334c1093670e8aba855aa
Author: Jonathan Riddell <jr at jriddell.org>
Date: Thu Dec 4 19:21:31 2014 +0100
New upstream release
* New upstream release
* Update build-deps and use pkg-kde v3 for Qt 5 build
---
debian/changelog | 7 ++
debian/control | 94 +++++-----------------
debian/kate-data.install | 43 ++--------
debian/kate.install | 76 +++++------------
debian/katepart.install | 13 ---
debian/kwrite.install | 12 +--
debian/libkateinterfaces4.install | 2 -
debian/libkatepartinterfaces4.install | 2 -
debian/patches/do_not_enforce_tests | 14 ----
debian/patches/series | 2 -
.../patches/sideeffects_in_asserts_are_evil.patch | 36 ---------
debian/rules | 4 +-
12 files changed, 58 insertions(+), 247 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c233453..39b7625 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kate (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * Update build-deps and use pkg-kde v3 for Qt 5 build
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 04 Dec 2014 16:49:41 +0100
+
kate (4:4.14.3-0ubuntu3) vivid; urgency=medium
* Fix autopkgtest run by making sure DEB_HOST_MULTIARCH is defined in the
diff --git a/debian/control b/debian/control
index 053eda3..75e9d15 100644
--- a/debian/control
+++ b/debian/control
@@ -7,18 +7,24 @@ Uploaders: Modestas Vainius <modax at debian.org>,
Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake,
debhelper (>= 9),
- kde-sc-dev-latest (>= 4:4.12),
- kdelibs5-dev (>= 4:4.14.2),
- libkactivities-dev,
+ extra-cmake-modules,
+ kdoctools-dev,
+ kinit-dev,
+ kio-dev,
+ libkf5config-dev,
+ libkf5guiaddons-dev,
+ libkf5i18n-dev,
+ libkf5itemmodels-dev,
+ libkf5jobwidgets-dev,
+ libkf5notifications-dev,
+ libkf5service-dev,
+ libkf5texteditor-dev,
+ libkf5threadweaver-dev,
+ libkf5wallet-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
+ plasma-framework
Standards-Version: 3.9.6
XS-Testsuite: autopkgtest
Homepage: http://kate-editor.org/
@@ -29,12 +35,10 @@ Package: kate
Section: editors
Architecture: any
Depends: kate-data (>= ${source:Version}),
- katepart (= ${binary:Version}),
+ ktexteditor-katepart,
${misc:Depends},
${shlibs:Depends}
-Breaks: kate-data (<< 4:4.13.90)
-Replaces: kate-data (<< 4:4.13.90)
-Suggests: aspell | ispell | hspell, khelpcenter4, konsole
+Suggests: aspell | ispell | hspell, khelpcenter, konsole-kpart
Description: powerful text editor
Kate is a powerful text editor that can open multiple files simultaneously.
.
@@ -49,88 +53,28 @@ Description: powerful text editor
* Configurable templates and text snippets
* Symbol viewers for C, C++, and Python
* XML completion and validation
- .
- This package is part of the KDE 4 Base applications module.
-
-Package: katepart
-Architecture: any
-Depends: kate-data (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Breaks: kate (<< 4:4.7.0),
- kdelibs5-data (<< 4:4.6.90),
- kdelibs5-plugins (<< 4:4.6.90)
-Replaces: kate (<< 4:4.7.0),
- kdelibs5-data (<< 4:4.6.90),
- kdelibs5-plugins (<< 4:4.6.90)
-Description: embeddable text editor component
- KatePart is a fast and featurerich text editor component. It implements the
- KTextEditor interfaces, a common interface collection for text editor
- components in KDE.
Package: kate-data
Architecture: all
Depends: ${misc:Depends}
-Breaks: kate (<< 4:4.14.3-0ubuntu2~),
- katepart (<< 4:4.14.3-0ubuntu2~),
- kdelibs5-data (<< 4:4.6.90)
-Replaces: kate (<< 4:4.14.3-0ubuntu2~),
- katepart (<< 4:4.14.3-0ubuntu2~),
- kdelibs5-data (<< 4:4.6.90)
Description: shared data files for Kate text editor
This package contains the architecture-independent shared data files needed
for Kate editor
- .
- This package is part of the KDE 4 Base applications module.
-
-Package: libkatepartinterfaces4
-Architecture: any
-Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: library for the embeddable text editor component
- This library contains the code used by the kate part. It is not
- meant to be used directly, applications should use libktexteditor4
- 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
Package: kwrite
Section: editors
Architecture: any
-Depends: katepart (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ktexteditor-katepart, ${misc:Depends}, ${shlibs:Depends}
Description: simple text editor
KWrite is a simple text editor built on the KDE Platform. It uses the Kate
editor component, so it supports powerful features such as flexible syntax
highlighting, automatic indentation, and numerous other text tools.
- .
- This package is part of the KDE 4 Base applications module.
Package: kate-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: katepart (= ${binary:Version}),
- kde-runtime-dbg (>= 4:4.6.90),
- ${allLibraries},
- ${misc:Depends}
-Breaks: kdebase-dbg (<< 4:4.6.90),
- kdelibs5-dbg (<< 4:4.6.90),
- kdesdk-dbg (<< 4:4.6.90)
-Replaces: kdebase-dbg (<< 4:4.6.90),
- kdelibs5-dbg (<< 4:4.6.90),
- kdesdk-dbg (<< 4:4.6.90)
+Depends: ${allLibraries}, ${misc:Depends}
Description: debugging symbols for Kate
This package contains debugging files used to investigate problems with
binaries included in Kate.
- .
- This package is part of the KDE 4 base applications module.
diff --git a/debian/kate-data.install b/debian/kate-data.install
index 6cf2864..ed01efd 100644
--- a/debian/kate-data.install
+++ b/debian/kate-data.install
@@ -1,38 +1,7 @@
-usr/lib/python2.7/dist-packages/PyKate4/__init__.py
-usr/share/doc/kde/HTML/*/kate/*
-usr/share/icons/hicolor/*/actions/debug-kategdb.png
-usr/share/icons/hicolor/*/apps/kate.png
-usr/share/icons/hicolor/scalable/apps/kate.svgz
-usr/share/icons/hicolor/scalable/apps/ktexteditorautobrace.svgz
-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
+etc/xdg/ktexteditor_codesnippets_core.knsrc
+usr/share/doc/HTML/en/katepart
+usr/share/icons/hicolor/
+usr/share/kateproject/kateproject.example
+usr/share/katexmltools/
+usr/share/kxmlgui5/
usr/share/man/man1/kate.1
diff --git a/debian/kate.install b/debian/kate.install
index 96d8c86..3884663 100644
--- a/debian/kate.install
+++ b/debian/kate.install
@@ -1,56 +1,22 @@
+etc/xdg/katerc
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
+usr/lib/x86_64-linux-gnu/libkdeinit5_kate.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/katebacktracebrowserplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/katebuildplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/katecloseexceptplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/katectagsplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/katefilebrowserplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/katefiletreeplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/kategdbplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/katekonsoleplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/kateopenheaderplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/kateprojectplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/katesearchplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/katesnippetsplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/katesqlplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/katesymbolviewerplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/katexmltoolsplugin.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/ktexteditor/tabswitcherplugin.so
+usr/share/applications/org.kde.kate.desktop
+usr/share/doc/HTML/en/kate/
+usr/share/kservices5/katesymbolviewerplugin.desktop
diff --git a/debian/katepart.install b/debian/katepart.install
deleted file mode 100644
index 389e495..0000000
--- a/debian/katepart.install
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/lib/kde4/katepart.so
-usr/lib/kde4/ktexteditor_autobrace.so
-usr/lib/kde4/ktexteditor_exporter.so
-usr/lib/kde4/ktexteditor_hlselection.so
-usr/lib/kde4/ktexteditor_iconinserter.so
-usr/lib/kde4/ktexteditor_insertfile.so
-usr/share/kde4/services/katepart.desktop
-usr/share/kde4/services/ktexteditor_autobrace.desktop
-usr/share/kde4/services/ktexteditor_autobrace_config.desktop
-usr/share/kde4/services/ktexteditor_exporter.desktop
-usr/share/kde4/services/ktexteditor_hlselection.desktop
-usr/share/kde4/services/ktexteditor_iconinserter.desktop
-usr/share/kde4/services/ktexteditor_insertfile.desktop
diff --git a/debian/kwrite.install b/debian/kwrite.install
index 9e7a573..69d47ee 100644
--- a/debian/kwrite.install
+++ b/debian/kwrite.install
@@ -1,10 +1,4 @@
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
+usr/lib/x86_64-linux-gnu/libkdeinit5_kwrite.so
+usr/share/applications/org.kde.kwrite.desktop
+usr/share/doc/HTML/en/kwrite/
diff --git a/debian/libkateinterfaces4.install b/debian/libkateinterfaces4.install
deleted file mode 100644
index 3686f63..0000000
--- a/debian/libkateinterfaces4.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libkateinterfaces.so.4
-usr/lib/libkateinterfaces.so.4.*
diff --git a/debian/libkatepartinterfaces4.install b/debian/libkatepartinterfaces4.install
deleted file mode 100644
index 24cc6d2..0000000
--- a/debian/libkatepartinterfaces4.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libkatepartinterfaces.so.4
-usr/lib/libkatepartinterfaces.so.4.*
diff --git a/debian/patches/do_not_enforce_tests b/debian/patches/do_not_enforce_tests
deleted file mode 100644
index 84c89fe..0000000
--- a/debian/patches/do_not_enforce_tests
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: kate/CMakeLists.txt
-===================================================================
---- kate.orig/CMakeLists.txt 2014-08-01 13:58:27.812305140 +0200
-+++ kate/CMakeLists.txt 2014-08-01 14:05:35.375380755 +0200
-@@ -25,9 +25,6 @@
-
- configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-
--# enforce build of tests
--set (KDE4_BUILD_TESTS "ON" CACHE "BOOL" "Enable building of tests" FORCE)
--
- # KDE/QT definitions we want
- add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
- add_definitions (-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS -DKTEXTEDITOR_NO_DEPRECATED)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5e1d019..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-sideeffects_in_asserts_are_evil.patch
-do_not_enforce_tests
diff --git a/debian/patches/sideeffects_in_asserts_are_evil.patch b/debian/patches/sideeffects_in_asserts_are_evil.patch
deleted file mode 100644
index 967d804..0000000
--- a/debian/patches/sideeffects_in_asserts_are_evil.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: kate/tests/katetextbuffertest.cpp
-===================================================================
---- kate.orig/tests/katetextbuffertest.cpp 2014-05-23 15:18:17.558274353 +0200
-+++ kate/tests/katetextbuffertest.cpp 2014-05-23 15:19:56.114368653 +0200
-@@ -417,12 +417,16 @@
- {
- const QString folder_name = QString("katetest_%1").arg(QCoreApplication::applicationPid());
- const QString file_path = QDir::tempPath() + '/' + folder_name + "/foo";
-- Q_ASSERT(QDir::temp().mkdir(folder_name));
-+ bool assert_test_value = QDir::temp().mkdir(folder_name);
-+ Q_ASSERT(assert_test_value);
-
- QFile f(file_path);
-- Q_ASSERT(f.open(QIODevice::WriteOnly | QIODevice::Truncate));
-+
-+ assert_test_value = f.open(QIODevice::WriteOnly | QIODevice::Truncate);
-+ Q_ASSERT(assert_test_value);
- f.write("1234567890");
-- Q_ASSERT(f.flush());
-+ assert_test_value = f.flush();
-+ Q_ASSERT(assert_test_value);
- f.close();
-
- QFile::setPermissions(QDir::tempPath() + '/' + folder_name, QFile::ExeOwner);
-@@ -444,6 +448,9 @@
- f.close();
-
- QFile::setPermissions(QDir::tempPath() + '/' + folder_name, QFile::WriteOwner | QFile::ExeOwner);
-- Q_ASSERT(f.remove());
-- Q_ASSERT(QDir::temp().rmdir(folder_name));
-+ assert_test_value = f.remove();
-+ Q_ASSERT(assert_test_value);
-+ assert_test_value = QDir::temp().rmdir(folder_name);
-+ Q_ASSERT(assert_test_value);
-+ Q_UNUSED(assert_test_value);
- }
diff --git a/debian/rules b/debian/rules
index b437ac8..a71e609 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
#!/usr/bin/make -f
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/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
+include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
override_dh_auto_configure:
$(overridden_command) -- -DPYTHON_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython2.7.so.1
--
kate packaging
More information about the pkg-kde-commits
mailing list