libqofono

Merge lp:~ken-vandine/libqofono/0.90_qml-module-ofono into lp:~phablet-team/libqofono/ubuntu

  1. 0.90_qml-module-ofono
  2. Merge into ubuntu
Proposed by Ken VanDine
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 218
Merged at revision: 217
Proposed branch: lp:~ken-vandine/libqofono/0.90_qml-module-ofono
Merge into: lp:~phablet-team/libqofono/ubuntu
Prerequisite: lp:~ken-vandine/libqofono/0.90-suggests
Diff against target: 44 lines (+6/-3)
2 files modified
debian/changelog (+1/-0)
debian/control (+5/-3)
To merge this branch: bzr merge lp:~ken-vandine/libqofono/0.90_qml-module-ofono
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) Approve
Review via email: mp+304656@code.launchpad.net

Commit message

Renamed QML module to follow qml-module-ofono naming (LP: #1342031)

Description of the change

Renamed QML module to follow qml-module-ofono naming (LP: #1342031)

To post a comment you must log in.
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

Thanks!

review: Approve

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 2016-09-01 14:57:17 +0000
3+++ debian/changelog 2016-09-01 14:57:17 +0000
4@@ -3,6 +3,7 @@
5 * New upstream release
6 * debian/control
7 - Dropped recommends for ofono to a suggests
8+ - Renamed QML module to follow qml-module-ofono naming (LP: #1342031)
9
10 -- Ken VanDine <ken.vandine@canonical.com> Wed, 23 Mar 2016 15:13:06 -0400
11
12
13=== modified file 'debian/control'
14--- debian/control 2016-09-01 14:57:17 +0000
15+++ debian/control 2016-09-01 14:57:17 +0000
16@@ -7,7 +7,7 @@
17 qt5-default,
18 qtbase5-dev,
19 qtdeclarative5-dev,
20- qtdeclarative5-qtquick2-plugin,
21+ qml-module-qtquick2,
22 libqt5xmlpatterns5-dev,
23 Standards-Version: 3.9.5
24 Homepage: https://github.com/nemomobile/libqofono
25@@ -33,13 +33,15 @@
26 A library for accessing the ofono daemon, and a declarative plugin for
27 it. This allows accessing ofono in qtquick and friends.
28
29-Package: qtdeclarative5-ofono0.2
30+Package: qml-module-ofono
31 Architecture: any
32 Pre-Depends: ${misc:Pre-Depends}
33 Multi-Arch: same
34 Depends: ${shlibs:Depends},
35 ${misc:Depends},
36-Breaks: ubuntu-system-settings (<< 0.3+15.04.20150114)
37+Breaks: ubuntu-system-settings (<< 0.3+15.04.20150114),
38+ qtdeclarative5-ofono0.2,
39+Replaces: qtdeclarative5-ofono0.2
40 Description: QML bindings for libqofono
41 A library for accessing the ofono daemon, and a declarative plugin for
42 it. This allows accessing ofono in qtquick and friends.
43
44=== renamed file 'debian/qtdeclarative5-ofono0.2.install' => 'debian/qml-module-ofono.install'

Subscribers

People subscribed via source and target branches