[SCM] kde-dev-utils packaging branch, master, updated. debian/16.08.0-1-1-g562ad17
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Fri Apr 7 13:25:09 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-dev-utils.git;a=commitdiff;h=562ad17
The following commit has been merged in the master branch:
commit 562ad17a3daba669d5d1e3ecb71c313ed22b798d
Author: Jonathan Riddell <jr at jriddell.org>
Date: Fri Apr 7 14:25:07 2017 +0100
update for kf5 build
---
debian/control | 42 +++++++-----------------
debian/copyright | 70 ++++++----------------------------------
debian/kdesdk-misc.install | 3 --
debian/kmtrace.install | 8 -----
debian/kmtrace.lintian-overrides | 1 -
debian/kpartloader.install | 2 +-
debian/kuiviewer.install | 14 ++++----
debian/not-installed | 7 ----
debian/rules | 5 +--
debian/source/format | 2 +-
debian/upstream/signing-key.asc | 52 +++++++++++++++++++++++++++++
debian/watch | 4 +--
12 files changed, 84 insertions(+), 126 deletions(-)
diff --git a/debian/control b/debian/control
index ffc3cd5..cba95ab 100644
--- a/debian/control
+++ b/debian/control
@@ -9,31 +9,21 @@ Uploaders: Sune Vuorela <sune at debian.org>,
Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake,
debhelper (>= 9),
- kde-sc-dev-latest (>= 4:4.12),
- kdelibs5-dev,
- libiberty-dev | binutils-dev,
- libltdl-dev,
- libx11-dev,
- pkg-kde-tools (>= 0.12)
+ gettext,
+ libkf5coreaddons-dev,
+ libkf5i18n-dev,
+ libkf5jobwidgets-dev,
+ libkf5kio-dev,
+ libkf5parts-dev,
+ libkf5widgetsaddons-dev,
+ pkg-kde-tools (>= 0.12),
+ python,
+ qtbase5-dev
Standards-Version: 3.9.8
Homepage: http://www.kde.org/
Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kde-dev-utils.git
Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kde-dev-utils.git
-Package: kdesdk-misc
-Architecture: any
-Section: devel
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: libqt4-dev
-Description: miscellaneous tools from the KDE Software Development Kit
- This package contains additional tools to aid in development for KDE.
- .
- Included are:
- - headers to assist with profiling KDE code
- - kstartperf to measure startup time
- .
- This package is part of the KDE Software Development Kit module.
-
Package: kpartloader
Architecture: any
Section: devel
@@ -52,7 +42,7 @@ Package: kuiviewer
Architecture: any
Section: devel
Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: qt4-designer
+Suggests: qt5-designer
Description: viewer for Qt Designer user interface files
KUIViewer is a utility to display and check user interface (.ui) files
created in Qt Designer. The interfaces can be shown in a variety of
@@ -62,13 +52,3 @@ Description: viewer for Qt Designer user interface files
The Qt Designer itself is in the package qt4-designer.
.
This package is part of the KDE Software Development Kit module.
-
-Package: kmtrace
-Architecture: any
-Section: devel
-Depends: less, ${misc:Depends}, ${shlibs:Depends}
-Description: memory leak tracer
- KMtrace is a KDE tool to assist with malloc debugging using glibc's
- "mtrace" functionality.
- .
- This package is part of the KDE Software Development Kit module.
diff --git a/debian/copyright b/debian/copyright
index 86c872b..fe8bc6f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,41 +9,26 @@ Copyright: 2004, Benjamin C. Meyer <ben+kuiviewer at meyerhome.net>
2003, Ian Reinhart Geiser <geiseri at kde.org>
2003, Richard Moore <rich at kde.org>
License: LGPL-2
-
-Files: kmtrace/ktrace.c
- kmtrace/mtrace.c
-Copyright: 1991-2000, Free Software Foundation, Inc
-License: LGPL-2+
-
-Files: kpartloader/kpartloader.cpp
- kpartloader/kpartloader.h
-Copyright: 2008, David Faure <faure at kde.org>
-License: LGPL-KDEeV
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), which shall
- act as a proxy defined in Section 6 of version 3 of the license.
+ modify it under the terms of the GNU Library General Public
+ License version 2 as published by the Free Software Foundation.
.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ Library General Public License for more details.
.
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
.
- On Debian systems, the full text of the GNU Lesser General Public License
- versions 2.1 and 3 can be found in `/usr/share/common-licenses/LGPL-2.1' and
- `/usr/share/common-licenses/LGPL-3'.
+ On Debian systems, the complete text of the GNU Library General Public
+ License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
Files: debian/*
Copyright: 2007-2013, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
License: GPL-2+
-
-License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -59,40 +44,3 @@ License: GPL-2+
.
On Debian systems, the complete text of the GNU General Public
License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-License: LGPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public License
- along with this program; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU Library General Public
- License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
-
-License: LGPL-2
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License version 2 as published by the Free Software Foundation.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU Library General Public
- License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
diff --git a/debian/kdesdk-misc.install b/debian/kdesdk-misc.install
deleted file mode 100644
index 17b618d..0000000
--- a/debian/kdesdk-misc.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/kstartperf
-usr/include/kprofilemethod.h
-usr/lib/kde4/kstartperf.so
diff --git a/debian/kmtrace.install b/debian/kmtrace.install
deleted file mode 100644
index 6f18054..0000000
--- a/debian/kmtrace.install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/bin/demangle
-usr/bin/kminspector
-usr/bin/kmmatch
-usr/bin/kmtrace
-usr/lib/libktrace.so.4
-usr/lib/libktrace.so.4.*.*
-usr/share/kde4/apps/kmtrace/kde.excludes
-usr/share/man/man1/demangle.1
diff --git a/debian/kmtrace.lintian-overrides b/debian/kmtrace.lintian-overrides
deleted file mode 100644
index 82fa15f..0000000
--- a/debian/kmtrace.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kmtrace: package-name-doesnt-match-sonames libktrace4
diff --git a/debian/kpartloader.install b/debian/kpartloader.install
index 1860d35..6eb0464 100644
--- a/debian/kpartloader.install
+++ b/debian/kpartloader.install
@@ -1,2 +1,2 @@
usr/bin/kpartloader
-usr/share/kde4/apps/kpartloader/kpartloaderui.rc
+usr/share/kxmlgui5/kpartloader/kpartloaderui.rc
diff --git a/debian/kuiviewer.install b/debian/kuiviewer.install
index e84f700..6cad6cc 100644
--- a/debian/kuiviewer.install
+++ b/debian/kuiviewer.install
@@ -1,11 +1,11 @@
usr/bin/kuiviewer
-usr/lib/kde4/kuiviewerpart.so
-usr/lib/kde4/quithumbnail.so
-usr/share/applications/kde4/kuiviewer.desktop
+usr/lib/*/qt5/plugins/kuiviewerpart.so
+usr/lib/*/qt5/plugins/quithumbnail.so
+usr/share/applications/org.kde.kuiviewer.desktop
usr/share/icons/hicolor/16x16/apps/kuiviewer.png
usr/share/icons/hicolor/32x32/apps/kuiviewer.png
usr/share/icons/hicolor/48x48/apps/kuiviewer.png
-usr/share/kde4/apps/kuiviewer/kuiviewerui.rc
-usr/share/kde4/apps/kuiviewerpart/kuiviewer_part.rc
-usr/share/kde4/services/designerthumbnail.desktop
-usr/share/kde4/services/kuiviewer_part.desktop
+usr/share/kservices5/designerthumbnail.desktop
+usr/share/kservices5/kuiviewer_part.desktop
+usr/share/kxmlgui5/kuiviewer/kuiviewerui.rc
+usr/share/kxmlgui5/kuiviewerpart/kuiviewer_part.rc
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index db4c8f9..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1,7 +0,0 @@
-# Manual pages are there, but scripts aren't
-./usr/share/man/man1/demangle.1
-
-#other devstuff
-./usr/include/ktrace.h
-./usr/lib/libktrace.so
-
diff --git a/debian/rules b/debian/rules
index 244905c..b57f3e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,3 @@
#!/usr/bin/make -f
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
-
-override_dh_auto_install:
- $(overridden_command) --destdir=debian/tmp
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..eeba72e
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+hC+sXh0NMOq4pxE=
+=Wqdv
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 0c66f44..3addc65 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
-http://download.kde.org/stable/applications/([\d.]+)/src/kde-dev-utils-([\d.]+).tar.xz
+version=4
+opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/applications/([\d.]+)/src/@PACKAGE at -([\d.]+).tar.xz
--
kde-dev-utils packaging
More information about the pkg-kde-commits
mailing list