Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1342031 into lp:~online-accounts/ubuntu-system-settings-online-accounts/master

[Alberto Mardegan]

Rename QML package

Rename QML package

[Timo Jyrinki (timo-jyrinki)]

Looks good, provided that the version is bumped to 0.5. I did a test build and checked the contents of the packages.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-09-17 14:39:07 +0000
+++ .bzrignore	2014-10-06 11:50:55 +0000
@@ -21,8 +21,9 @@
 /debian/files
 /debian/libonline-accounts-client-dev/
 /debian/libonline-accounts-client1/
+/debian/qml-module-ubuntu-onlineaccounts-client/
+/debian/qml-module-ubuntu-onlineaccounts-client-doc/
 /debian/qtdeclarative5-online-accounts-client0.1/
-/debian/qtdeclarative5-online-accounts-client-doc/
 /debian/tmp
 /debian/ubuntu-system-settings-online-accounts/
 /debian/ubuntu-system-settings-online-accounts-autopilot/
 
=== modified file 'debian/control'
--- debian/control	2014-09-04 12:17:05 +0000
+++ debian/control	2014-10-06 11:50:55 +0000
@@ -70,14 +70,24 @@
 
 Package: qtdeclarative5-online-accounts-client0.1
 Architecture: any
+Section: oldlibs
+Depends: qml-module-ubuntu-onlineaccounts-client, ${misc:Depends}
+Description: transitional dummy package for Online Accounts QML clients
+ This module offers an API for applications to invoke the Online Accounts panel
+ in order to request the creation/configuration of accounts.
+
+Package: qml-module-ubuntu-onlineaccounts-client
+Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          qtdeclarative5-qtquick2-plugin,
+Breaks: qtdeclarative5-online-accounts-client0.1 (<< 0.5)
+Replaces: qtdeclarative5-online-accounts-client0.1 (<< 0.5)
 Description: Online Accounts panel library for QML applications
  This module offers an API for applications to invoke the Online Accounts panel
  in order to request the creation/configuration of accounts.
 
-Package: qtdeclarative5-online-accounts-client-doc
+Package: qml-module-ubuntu-onlineaccounts-client-doc
 Section: doc
 Architecture: all
 Multi-Arch: foreign
 
=== renamed file 'debian/qtdeclarative5-online-accounts-client-doc.install' => 'debian/qml-module-ubuntu-onlineaccounts-client-doc.install'
=== renamed file 'debian/qtdeclarative5-online-accounts-client0.1.install' => 'debian/qml-module-ubuntu-onlineaccounts-client.install'