Merge lp:~michael-sheldon/ubuntu-terminal-app/packaging-fixes into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

Proposed by Michael Sheldon
Status: Merged
Approved by: David Planella
Approved revision: 215
Merged at revision: 212
Proposed branch: lp:~michael-sheldon/ubuntu-terminal-app/packaging-fixes
Merge into: lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 65 lines (+9/-7)
2 files modified
debian/control (+8/-6)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-terminal-app/packaging-fixes
Reviewer Review Type Date Requested Status
David Planella Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+306252@code.launchpad.net

Commit message

* Use dh_python3
* Rename QML modules to new qml-module format

Description of the change

* Use dh_python3
* Rename QML modules to new qml-module format

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Approved as per changes discussed on bug #1625074

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-09-19 14:33:25 +0000
3+++ debian/control 2016-09-20 17:27:03 +0000
4@@ -3,6 +3,7 @@
5 Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
6 Build-Depends: cmake,
7 debhelper (>= 9),
8+ dh-python,
9 python3-all,
10 gettext,
11 intltool,
12@@ -20,16 +21,16 @@
13 Architecture: any
14 Depends: ${misc:Depends},
15 ${shlibs:Depends},
16- qtdeclarative5-qmltermwidget1.0,
17- qtdeclarative5-pamauthentication0.1,
18- qtdeclarative5-qtquick2-plugin,
19- qtdeclarative5-ubuntu-ui-toolkit-plugin,
20+ qml-module-qmltermwidget1.0,
21+ qml-module-pamauthentication0.1,
22+ qml-module-qtquick2,
23+ qml-module-ubuntu-components,
24 qml-module-qt-labs-settings,
25 qml-module-qtsysteminfo (>= 5.0~),
26 Description: Terminal application
27 Core Terminal application
28
29-Package: qtdeclarative5-qmltermwidget1.0
30+Package: qml-module-qmltermwidget1.0
31 Architecture: any
32 Multi-Arch: same
33 Depends: ${misc:Depends},
34@@ -39,7 +40,7 @@
35 This package contains the QMLTermWidget terminal emulator plugin
36 for Qt Qml.
37
38-Package: qtdeclarative5-pamauthentication0.1
39+Package: qml-module-pamauthentication0.1
40 Architecture: any
41 Multi-Arch: same
42 Depends: ${misc:Depends},
43@@ -52,6 +53,7 @@
44 Package: ubuntu-terminal-app-autopilot
45 Architecture: all
46 Depends: ${misc:Depends},
47+ ${python3:Depends},
48 libautopilot-qt,
49 libqt5test5,
50 python3-autopilot,
51
52=== renamed file 'debian/qtdeclarative5-pamauthentication0.1.install' => 'debian/qml-module-pamauthentication0.1.install'
53=== renamed file 'debian/qtdeclarative5-qmltermwidget1.0.install' => 'debian/qml-module-qmltermwidget1.0.install'
54=== modified file 'debian/rules'
55--- debian/rules 2014-10-25 04:42:31 +0000
56+++ debian/rules 2016-09-20 17:27:03 +0000
57@@ -5,7 +5,7 @@
58 #export DH_VERBOSE=1
59
60 %:
61- dh $@
62+ dh $@ --with python3
63
64 override_dh_auto_configure:
65 dh_auto_configure -- -DCLICK_MODE=OFF

Subscribers

People subscribed via source and target branches