summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRik Mills <rikmills@kubuntu.org>2016-12-31 20:31:56 (GMT)
committerRik Mills <rikmills@kubuntu.org>2016-12-31 20:31:56 (GMT)
commit2b32c568cf5ac20f2550a9c95e6786658c194586 (patch)
treea85a54d3297c1bb615157959870b736d82504d85
parentbcd03520b97b1849bfdf6ba1a6ed6c8d5d453a99 (diff)
Revert "undo port to KF5 and 16.12.0 stable is still kde4"
This reverts commit bcd03520b97b1849bfdf6ba1a6ed6c8d5d453a99.
-rw-r--r--debian/changelog4
-rw-r--r--debian/control15
-rw-r--r--debian/kcachegrind.install23
-rwxr-xr-xdebian/rules2
4 files changed, 27 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog
index 559fa20..a599896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ kcachegrind (4:16.12.0-0ubuntu1) UNRELEASED; urgency=medium
[ José Manuel Santamaría Lema ]
* Update Vcs-Git fields to use https:// instead of git://
+ [ Clive Johnston ]
+ * Porting packaging to KF5
+ * Fixing install files
+
[ Rik Mills ]
* New upstream release (16.12.0)
diff --git a/debian/control b/debian/control
index 3d490fb..ef5b296 100644
--- a/debian/control
+++ b/debian/control
@@ -10,10 +10,17 @@ Uploaders: Sune Vuorela <sune@debian.org>,
Maximiliano Curia <maxy@debian.org>
Build-Depends: cmake (>= 2.6~),
debhelper (>= 9),
- kde-sc-dev-latest (>= 4:4.12),
- kdelibs5-dev (>= 4:4.14.27~),
- php-cli,
- pkg-kde-tools (>= 0.12)
+ extra-cmake-modules (>= 5.28.0~),
+ kdoctools-dev (>= 5.28.0~),
+ libkf5archive-dev (>= 5.28.0~),
+ libkf5config-dev (>= 5.28.0~),
+ libkf5coreaddons-dev (>= 5.28.0~),
+ libkf5i18n-dev (>= 5.28.0~),
+ libkf5kio-dev (>= 5.28.0~),
+ libkf5widgetsaddons-dev (>= 5.28.0~),
+ libkf5xmlgui-dev (>= 5.28.0~),
+ pkg-kde-tools (>= 0.12),
+ qtbase5-dev (>= 5.6.1~)
Standards-Version: 3.9.6
Homepage: http://www.kde.org/
Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kcachegrind
diff --git a/debian/kcachegrind.install b/debian/kcachegrind.install
index 680feaf..fad7179 100644
--- a/debian/kcachegrind.install
+++ b/debian/kcachegrind.install
@@ -1,15 +1,14 @@
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/index.cache.bz2
+usr/share/doc/HTML/en/kcachegrind/index.docbook
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/16x16/actions/move.png
+usr/share/kcachegrind/icons/hicolor/16x16/actions/percent.png
+usr/share/kcachegrind/icons/hicolor/22x22/actions/hidetemplates.png
+usr/share/kcachegrind/icons/hicolor/22x22/actions/move.png
+usr/share/kcachegrind/icons/hicolor/22x22/actions/percent.png
+usr/share/kcachegrind/icons/hicolor/32x32/actions/percent.png
+usr/share/kcachegrind/tips
+usr/share/kxmlgui5/kcachegrind/kcachegrindui.rc
diff --git a/debian/rules b/debian/rules
index 6a77e53..b57f3e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,3 @@
#!/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