Merge lp:~timo-jyrinki/pay-service/stop_depending_on_transitional_packages into lp:pay-service

[Timo Jyrinki]

Stop depending on transitional packages. (LP: #1583079) Run wrap-and-sort -a -t on the packaging.

[dobey (dobey)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-04-08 21:38:55 +0000
+++ debian/control	2016-05-19 06:20:14 +0000
@@ -45,11 +45,11 @@
 Package: pay-service
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         pay-ui (= ${source:Version}),
+Depends: pay-ui (= ${source:Version}),
          sysvinit-utils,
          ubuntu-push-client (>= 0.68+15.04.20151009),
+         ${misc:Depends},
+         ${shlibs:Depends},
 Recommends: gnupg,
             libglib2.0-bin,
 Description: service to allow requesting payment for an item
@@ -62,12 +62,11 @@
 
 Package: pay-ui
 Architecture: any
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
- qtdeclarative5-ubuntu-web-plugin [amd64 armhf i386],
- qtdeclarative5-online-accounts-client0.1,
- qtdeclarative5-ubuntu-ui-toolkit-plugin,
+Depends: qml-module-ubuntu-components,
+         qml-module-ubuntu-onlineaccounts-client,
+         qml-module-ubuntu-web [amd64 armhf i386],
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: service to allow requesting payment for an item - user interface
  Allows applications to request an item be paid for by the user.
  This requires interaction with the server backend to handle the
@@ -79,8 +78,8 @@
 Package: libpay2
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Recommends: pay-service (= ${source:Version}),
 Multi-Arch: same
 Description: Library for interacting with the in app payments
@@ -90,10 +89,10 @@
 Package: libpay2-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends},
+Depends: libglib2.0-dev,
+         libpay2 (=${binary:Version}),
          ${misc:Depends},
-         libglib2.0-dev,
-         libpay2 (=${binary:Version})
+         ${shlibs:Depends},
 Multi-Arch: same
 Description: Pay service - library development files
  This library contains information to purchase items and figure out
@@ -101,8 +100,8 @@
 
 Package: pay-test-app
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Description: Small application to help test payment
  Not a useful application for users but gives additional
  information about what's happening in the pay-service

=== modified file 'debian/libpay2-dev.install'
--- debian/libpay2-dev.install	2015-09-23 17:49:40 +0000
+++ debian/libpay2-dev.install	2016-05-19 06:20:14 +0000
@@ -1,4 +1,4 @@
+usr/include/libpay-*
+usr/lib/*/libpay.so
 usr/lib/*/pkgconfig/pay*pc
-usr/lib/*/libpay.so
 usr/lib/python3/dist-packages/dbusmock/templates
-usr/include/libpay-*

=== modified file 'debian/pay-service.install'
--- debian/pay-service.install	2016-03-09 15:04:09 +0000
+++ debian/pay-service.install	2016-05-19 06:20:14 +0000
@@ -1,5 +1,5 @@
 usr/lib/*/pay-service/pay-service-2
 usr/lib/*/pay-service/setup-staging.sh
+usr/share/dbus-1/services/*.service
 usr/share/locale/*/LC_MESSAGES/pay-service.mo
-usr/share/dbus-1/services/*.service
 usr/share/upstart/sessions/*.conf

=== modified file 'debian/pay-test-app.install'
--- debian/pay-test-app.install	2014-08-05 23:52:27 +0000
+++ debian/pay-test-app.install	2016-05-19 06:20:14 +0000
@@ -1,3 +1,3 @@
+usr/lib/*/pay-service/pay-test-app*
 usr/share/applications
 usr/share/icons
-usr/lib/*/pay-service/pay-test-app*

=== modified file 'debian/pay-ui.install'
--- debian/pay-ui.install	2016-03-09 02:49:35 +0000
+++ debian/pay-ui.install	2016-05-19 06:20:14 +0000
@@ -1,3 +1,3 @@
+usr/lib/*/payui
 usr/lib/payui
-usr/lib/*/payui
 usr/share/payui