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

[Ken VanDine]

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

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

[Jonas G. Drange (jonas-drange)]

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-01 14:57:17 +0000
+++ debian/changelog	2016-09-01 14:57:17 +0000
@@ -3,6 +3,7 @@
   * New upstream release
   * debian/control
     - Dropped recommends for ofono to a suggests
+    - Renamed QML module to follow qml-module-ofono naming (LP: #1342031)
 
  -- Ken VanDine <[e-mail]>  Wed, 23 Mar 2016 15:13:06 -0400
 
 
=== modified file 'debian/control'
--- debian/control	2016-09-01 14:57:17 +0000
+++ debian/control	2016-09-01 14:57:17 +0000
@@ -7,7 +7,7 @@
                qt5-default,
                qtbase5-dev,
                qtdeclarative5-dev,
-               qtdeclarative5-qtquick2-plugin,
+               qml-module-qtquick2,
                libqt5xmlpatterns5-dev,
 Standards-Version: 3.9.5
 Homepage: https://github.com/nemomobile/libqofono
@@ -33,13 +33,15 @@
  A library for accessing the ofono daemon, and a declarative plugin for 
  it. This allows accessing ofono in qtquick and friends.
 
-Package: qtdeclarative5-ofono0.2
+Package: qml-module-ofono
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Breaks: ubuntu-system-settings (<< 0.3+15.04.20150114)
+Breaks: ubuntu-system-settings (<< 0.3+15.04.20150114),
+        qtdeclarative5-ofono0.2,
+Replaces: qtdeclarative5-ofono0.2
 Description: QML bindings for libqofono
  A library for accessing the ofono daemon, and a declarative plugin for 
  it. This allows accessing ofono in qtquick and friends.
 
=== renamed file 'debian/qtdeclarative5-ofono0.2.install' => 'debian/qml-module-ofono.install'