Merge ~gsilvapt/kubuntu-packaging/+git/kmouth:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/kmouth:kubuntu_unstable

Proposed by Gustavo Silva on 2017-08-22
Status: Merged
Merged at revision: 541f2dd889d90fd7e643ddaaeee368458448a21b
Proposed branch: ~gsilvapt/kubuntu-packaging/+git/kmouth:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/kmouth:kubuntu_unstable
Diff against target: 108 lines (+53/-37)
2 files modified
debian/control (+14/-3)
debian/kmouth.install (+39/-34)
Reviewer Review Type Date Requested Status
Simon Quigley 2017-08-22 Needs Fixing on 2017-08-22
Review via email: mp+329342@code.launchpad.net

Description of the Change

Fix b-d for KF5 and QT5.
Build successful locally:http://paste.ubuntu.com/25366076/

To post a comment you must log in.
Clive Johnston (clivejo) wrote :

Please review the paths in the install files, as they should not start with debian/tmp/

If in doubt check the previous install file for the format you should use.

Simon Quigley (tsimonq2) wrote :

See clivejo's comment.

review: Needs Fixing
Gustavo Silva (gsilvapt) wrote :

@tsimonq2, @clivejo, can you check if this is now ok? I removed /debian/tmp/ as suggested and it builds locally again: http://paste.ubuntu.com/25372896/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/control b/debian/control
2index a65c156..29d57df 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -9,9 +9,20 @@ Uploaders: Sune Vuorela <sune@debian.org>,
6 Maximiliano Curia <maxy@debian.org>
7 Build-Depends: cmake,
8 debhelper (>= 9),
9- kde-sc-dev-latest (>= 4:4.12),
10- kdelibs5-dev (>= 4:4.14.34~),
11- pkg-kde-tools (>= 0.12)
12+ extra-cmake-modules (>= 1.7.0),
13+ libkf5completion-dev,
14+ libkf5config-bin-dev,
15+ libkf5configwidgets-dev,
16+ libkf5coreaddons-dev,
17+ libkf5crash-dev,
18+ libkf5doctools-dev,
19+ libkf5i18n-dev,
20+ libkf5kio-dev,
21+ libkf5widgetsaddons-dev,
22+ libkf5xmlgui-dev,
23+ libqt5texttospeech5-dev,
24+ pkg-kde-tools (>= 0.12),
25+ qtbase5-dev
26 Standards-Version: 3.9.6
27 Homepage: http://www.kde.org
28 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kmouth
29diff --git a/debian/kmouth.install b/debian/kmouth.install
30index 70e0ddf..0017761 100644
31--- a/debian/kmouth.install
32+++ b/debian/kmouth.install
33@@ -1,36 +1,41 @@
34+etc/xdg/kmouthrc
35 usr/bin/kmouth
36-usr/share/applications/kde4/kmouth.desktop
37-usr/share/doc/kde/HTML/en/kmouth/common
38-usr/share/doc/kde/HTML/en/kmouth/index.cache.bz2
39-usr/share/doc/kde/HTML/en/kmouth/index.docbook
40-usr/share/doc/kde/HTML/en/kmouth/kmouthcpref.png
41-usr/share/doc/kde/HTML/en/kmouth/kmouthctts.png
42-usr/share/doc/kde/HTML/en/kmouth/kmouthcwcp.png
43-usr/share/doc/kde/HTML/en/kmouth/kmouthedit.png
44-usr/share/doc/kde/HTML/en/kmouth/kmouthmain.png
45-usr/share/doc/kde/HTML/en/kmouth/kmouthwizard1.png
46-usr/share/doc/kde/HTML/en/kmouth/kmouthwizard2.png
47-usr/share/doc/kde/HTML/en/kmouth/kmouthwizard3.png
48-usr/share/doc/kde/HTML/en/kmouth/man-kmouth.1.docbook
49-usr/share/icons/hicolor/*/apps/kmouth.png
50-usr/share/icons/hicolor/*/actions/phrase.png
51-usr/share/icons/hicolor/*/actions/phrasebook.png
52-usr/share/kde4/apps/kmouth/books/de/de-courteousness.phrasebook
53-usr/share/kde4/apps/kmouth/books/de/de-greetings.phrasebook
54-usr/share/kde4/apps/kmouth/books/de/de-howareyou.phrasebook
55-usr/share/kde4/apps/kmouth/books/de/de-personal.phrasebook
56-usr/share/kde4/apps/kmouth/books/de/de.desktop
57-usr/share/kde4/apps/kmouth/books/en/en-courteousness.phrasebook
58-usr/share/kde4/apps/kmouth/books/en/en-greetings.phrasebook
59-usr/share/kde4/apps/kmouth/books/en/en-howareyou.phrasebook
60-usr/share/kde4/apps/kmouth/books/en/en-personal.phrasebook
61-usr/share/kde4/apps/kmouth/books/en/en.desktop
62-usr/share/kde4/apps/kmouth/books/sv/sv-courteousness.phrasebook
63-usr/share/kde4/apps/kmouth/books/sv/sv-greetings.phrasebook
64-usr/share/kde4/apps/kmouth/books/sv/sv-howareyou.phrasebook
65-usr/share/kde4/apps/kmouth/books/sv/sv-personal.phrasebook
66-usr/share/kde4/apps/kmouth/books/sv/sv.desktop
67-usr/share/kde4/apps/kmouth/kmouthui.rc
68-usr/share/kde4/apps/kmouth/phrasebookdialogui.rc
69-usr/share/kde4/config/kmouthrc
70+usr/share/applications/org.kde.kmouth.desktop
71+usr/share/doc/HTML/en/kmouth/index.cache.bz2
72+usr/share/doc/HTML/en/kmouth/index.docbook
73+usr/share/doc/HTML/en/kmouth/kmouthcpref.png
74+usr/share/doc/HTML/en/kmouth/kmouthctts.png
75+usr/share/doc/HTML/en/kmouth/kmouthcwcp.png
76+usr/share/doc/HTML/en/kmouth/kmouthedit.png
77+usr/share/doc/HTML/en/kmouth/kmouthmain.png
78+usr/share/doc/HTML/en/kmouth/kmouthwizard1.png
79+usr/share/doc/HTML/en/kmouth/kmouthwizard2.png
80+usr/share/doc/HTML/en/kmouth/kmouthwizard3.png
81+usr/share/icons/hicolor/16x16/actions/phrase.png
82+usr/share/icons/hicolor/16x16/actions/phrasebook.png
83+usr/share/icons/hicolor/16x16/apps/kmouth.png
84+usr/share/icons/hicolor/22x22/actions/phrase.png
85+usr/share/icons/hicolor/22x22/actions/phrasebook.png
86+usr/share/icons/hicolor/22x22/apps/kmouth.png
87+usr/share/icons/hicolor/32x32/actions/phrase.png
88+usr/share/icons/hicolor/32x32/actions/phrasebook.png
89+usr/share/icons/hicolor/32x32/apps/kmouth.png
90+usr/share/icons/hicolor/48x48/apps/kmouth.png
91+usr/share/kmouth/books/de/de-courteousness.phrasebook
92+usr/share/kmouth/books/de/de-greetings.phrasebook
93+usr/share/kmouth/books/de/de-howareyou.phrasebook
94+usr/share/kmouth/books/de/de-personal.phrasebook
95+usr/share/kmouth/books/de/de.desktop
96+usr/share/kmouth/books/en/en-courteousness.phrasebook
97+usr/share/kmouth/books/en/en-greetings.phrasebook
98+usr/share/kmouth/books/en/en-howareyou.phrasebook
99+usr/share/kmouth/books/en/en-personal.phrasebook
100+usr/share/kmouth/books/en/en.desktop
101+usr/share/kmouth/books/sv/sv-courteousness.phrasebook
102+usr/share/kmouth/books/sv/sv-greetings.phrasebook
103+usr/share/kmouth/books/sv/sv-howareyou.phrasebook
104+usr/share/kmouth/books/sv/sv-personal.phrasebook
105+usr/share/kmouth/books/sv/sv.desktop
106+usr/share/kxmlgui5/kmouth/kmouthui.rc
107+usr/share/kxmlgui5/kmouth/phrasebookdialogui.rc
108 usr/share/man/man1/kmouth.1

Subscribers

People subscribed via source and target branches