Merge lp:~dholbach/ubuntu-docviewer-app/packaging-fixes2 into lp:ubuntu-docviewer-app/trunk

Proposed by Daniel Holbach on 2015-02-04
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„ on 2015-02-04
Approved revision: 71
Merged at revision: 68
Proposed branch: lp:~dholbach/ubuntu-docviewer-app/packaging-fixes2
Merge into: lp:ubuntu-docviewer-app/trunk
Diff against target: 46 lines (+8/-3)
3 files modified
debian/changelog (+6/-0)
debian/control (+1/-2)
src/plugin/file-qml-plugin/docviewerFile.cpp (+1/-1)
To merge this branch: bzr merge lp:~dholbach/ubuntu-docviewer-app/packaging-fixes2
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 πŸ¦„ 2015-02-04 Approve on 2015-02-04
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-02-04
Review via email: mp+248517@code.launchpad.net

Commit Message

Essentially just:
 - fix a typo
 - bump Standards-Version
 - and fix FTBFS (in pbuilder) by removing qmake from build-deps
   it's what filemanager does too which has a similar setup

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-08-04 03:25:21 +0000
3+++ debian/changelog 2015-02-04 09:33:16 +0000
4@@ -1,3 +1,9 @@
5+ubuntu-docviewer-app (0.1.2) UNRELEASED; urgency=medium
6+
7+ *
8+
9+ -- Daniel Holbach <daniel.holbach@ubuntu.com> Wed, 04 Feb 2015 09:52:24 +0100
10+
11 ubuntu-docviewer-app (0.1.1) raring; urgency=low
12
13 * Initial release
14
15=== modified file 'debian/control'
16--- debian/control 2015-01-29 19:20:41 +0000
17+++ debian/control 2015-02-04 09:33:16 +0000
18@@ -10,14 +10,13 @@
19 pkg-kde-tools,
20 python3-all,
21 qt5-default,
22- qt5-qmake,
23 qtbase5-dev,
24 qtchooser,
25 qtdeclarative5-dev,
26 qtdeclarative5-dev-tools,
27 qtdeclarative5-qtquick2-plugin,
28 qtdeclarative5-test-plugin
29-Standards-Version: 3.9.4
30+Standards-Version: 3.9.6
31 Section: misc
32 Homepage: https://launchpad.net/ubuntu-docviewer-app
33 Vcs-Bzr: https://code.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/trunk
34
35=== modified file 'src/plugin/file-qml-plugin/docviewerFile.cpp'
36--- src/plugin/file-qml-plugin/docviewerFile.cpp 2015-01-30 16:38:10 +0000
37+++ src/plugin/file-qml-plugin/docviewerFile.cpp 2015-02-04 09:33:16 +0000
38@@ -80,7 +80,7 @@
39 QFileInfo file(path);
40
41 if (file.exists()) {
42- qDebug() << "[FILE] Extracting informations from the file...";
43+ qDebug() << "[FILE] Extracting information from the file...";
44
45 /**Get info of the file**/
46 size = file.size();

Subscribers

People subscribed via source and target branches