[SCM] kcachegrind packaging branch, master, updated. debian/16.08.3-1-1-g34fb21c

Fri Apr 7 13:00:43 UTC 2017

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kcachegrind.git;a=commitdiff;h=34fb21c

The following commit has been merged in the master branch:
commit 34fb21c95958d0e7f91da1a7b50beb1ad1c80ad4
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Apr 7 14:00:36 2017 +0100

    update packaging for kf5 build
---
 debian/control                               | 30 +++++++---------
 debian/kcachegrind.install                   | 17 +++------
 debian/patches/rename_qcachegrind_icon.patch | 21 -----------
 debian/patches/series                        |  1 -
 debian/rules                                 |  9 +----
 debian/source/format                         |  2 +-
 debian/upstream/signing-key.asc              | 52 ++++++++++++++++++++++++++++
 debian/watch                                 |  4 +--
 8 files changed, 73 insertions(+), 63 deletions(-)

diff --git a/debian/control b/debian/control
index 8d68c2a..e2ec4de 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,18 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.6~),
                debhelper (>= 9),
-               kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev,
-               pkg-kde-tools (>= 0.12)
+               gettext,
+               libkf5archive-dev,
+               libkf5config-dev,
+               libkf5coreaddons-dev,
+               libkf5doctools-dev,
+               libkf5i18n-dev,
+               libkf5kio-dev,
+               libkf5widgetsaddons-dev,
+               libkf5xmlgui-dev,
+               pkg-kde-tools (>= 0.12),
+               python-dev,
+               qtbase5-dev
 Standards-Version: 3.9.8
 Homepage: http://www.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kcachegrind.git
@@ -34,21 +43,6 @@ Description: visualisation tool for the Valgrind profiler
  .
  This package is part of the KDE Software Development Kit module.
 
-Package: qcachegrind
-Architecture: any
-Section: devel
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: graphviz, valgrind
-Suggests: kcachegrind-converters, khelpcenter
-Description: visualisation tool for the Valgrind profiler
- QCachegrind is a visualisation tool for the profiling data generated
- by calltree, a memory profiling tool for valgrind.  Any executable can be
- profiled using calltree without being recompiled, including multi-threaded
- applications, shared libraries, and plugins.
- .
- For visualising the output from profiling tools other than Valgrind, several
- converters can be found in the kcachegrind-converters package.
-
 Package: kcachegrind-converters
 Architecture: all
 Section: devel
diff --git a/debian/kcachegrind.install b/debian/kcachegrind.install
index 680feaf..4dd0d46 100644
--- a/debian/kcachegrind.install
+++ b/debian/kcachegrind.install
@@ -1,15 +1,8 @@
 usr/bin/kcachegrind
-usr/share/applications/kde4/kcachegrind.desktop
-usr/share/doc/kde/HTML/en/kcachegrind/common
-usr/share/doc/kde/HTML/en/kcachegrind/index.cache.bz2
-usr/share/doc/kde/HTML/en/kcachegrind/index.docbook
+usr/share/applications/org.kde.kcachegrind.desktop
+usr/share/doc/HTML/en/kcachegrind/
 usr/share/icons/hicolor/32x32/apps/kcachegrind.png
 usr/share/icons/hicolor/48x48/apps/kcachegrind.png
-usr/share/kde4/apps/kcachegrind/icons/hicolor/16x16/actions/move.png
-usr/share/kde4/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png
-usr/share/kde4/apps/kcachegrind/icons/hicolor/22x22/actions/hidetemplates.png
-usr/share/kde4/apps/kcachegrind/icons/hicolor/22x22/actions/move.png
-usr/share/kde4/apps/kcachegrind/icons/hicolor/22x22/actions/percent.png
-usr/share/kde4/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png
-usr/share/kde4/apps/kcachegrind/kcachegrindui.rc
-usr/share/kde4/apps/kcachegrind/tips
+usr/share/kcachegrind/icons/hicolor/
+usr/share/kcachegrind/tips
+usr/share/kxmlgui5/kcachegrind/kcachegrindui.rc
diff --git a/debian/patches/rename_qcachegrind_icon.patch b/debian/patches/rename_qcachegrind_icon.patch
deleted file mode 100644
index 791b7d3..0000000
--- a/debian/patches/rename_qcachegrind_icon.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Thu, 10 Nov 2016 20:48:17 +0100
-Subject: rename_qcachegrind_icon
-
----
- qcachegrind/qcachegrind.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qcachegrind/qcachegrind.desktop b/qcachegrind/qcachegrind.desktop
-index 81b2102..b12580d 100755
---- a/qcachegrind/qcachegrind.desktop
-+++ b/qcachegrind/qcachegrind.desktop
-@@ -3,7 +3,7 @@ Type=Application
- Encoding=UTF-8
- Exec=qcachegrind %F
- MimeType=application/x-kcachegrind;
--Icon=kcachegrind
-+Icon=qcachegrind
- Terminal=false
- Name=QCachegrind
- Name[bs]=QCachegrind
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0e55cbc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-rename_qcachegrind_icon.patch
diff --git a/debian/rules b/debian/rules
index be7245e..b57f3e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,3 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
-
-override_dh_install:
-	$(overridden_command)
-	-install -v -D -m 755 -t debian/qcachegrind/usr/bin obj*/qcachegrind/qcachegrind
-	-install -v -D -m 644 -t debian/qcachegrind/usr/share/applications qcachegrind/qcachegrind.desktop
-	-install -v -D -m 644 -T kcachegrind/hi32-app-kcachegrind.png debian/qcachegrind/usr/share/icons/hicolor/32x32/apps/qcachegrind.png
-	-install -v -D -m 644 -T kcachegrind/hi48-app-kcachegrind.png debian/qcachegrind/usr/share/icons/hicolor/48x48/apps/qcachegrind.png
+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 d2902e5..3addc65 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
-http://download.kde.org/stable/applications/([\d.]+)/src/kcachegrind-([\d.]+).tar.xz
+version=4
+opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/applications/([\d.]+)/src/@PACKAGE at -([\d.]+).tar.xz

-- 
kcachegrind packaging

