Merge lp:~osomon/webbrowser-app/qml-module-naming into lp:webbrowser-app

[Olivier Tilloy]

Rename debian packages to follow new QML module naming convention.

[Timo Jyrinki (timo-jyrinki)]

Looks good and complete!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1370
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2657/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6708
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1410
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1410
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1410/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1410
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5090
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6719
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6719/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27976

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2657/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Actually, qml-module-ubuntu-web-doc needs Replaces: qtdeclarative5-ubuntu-web-plugin-doc (<< ${source:Version}) instead of the web plugin.

review: Needs Fixing

[Timo Jyrinki (timo-jyrinki)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1371
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2658/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1411
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1411
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1411/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1411
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5092
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6721
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6721/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27979

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2658/rebuild

review: Needs Fixing (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2015-10-14 09:05:19 +0000
+++ .bzrignore	2016-03-16 12:46:59 +0000
@@ -34,6 +34,9 @@
 debian/usr.bin.webbrowser-app
 debian/files
 debian/tmp/
+debian/qml-module-ubuntu-ui-extras-browser/
+debian/qml-module-ubuntu-web/
+debian/qml-module-ubuntu-web-doc/
 debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin/
 debian/qtdeclarative5-ubuntu-web-plugin/
 debian/qtdeclarative5-ubuntu-web-plugin-doc/
@@ -41,6 +44,7 @@
 debian/webapp-container-autopilot/
 debian/webbrowser-app/
 debian/webbrowser-app-autopilot/
+debian/debhelper-build-stamp
 debian/*.debhelper
 debian/*.debhelper.log
 debian/*.substvars

=== modified file 'debian/control'
--- debian/control	2016-03-07 18:29:23 +0000
+++ debian/control	2016-03-16 12:46:59 +0000
@@ -32,7 +32,7 @@
                qtdeclarative5-private-dev,
                qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
                xvfb,
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://launchpad.net/webbrowser-app
 # If you aren't a member of ~phablet-team but need to upload packaging changes,
 # just go ahead.  ~phablet-team will notice and sync up the code again.
@@ -51,8 +51,8 @@
          qml-module-qtquick2 (>= 5.4),
          qml-module-qtquick-layouts,
          qml-module-qtquick-window2 (>= 5.3),
+         qml-module-ubuntu-web (= ${binary:Version}),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
-         qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
          qtdeclarative5-unity-action-plugin,
 Replaces: webbrowser-app-assets,
           qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< 0.22),
@@ -73,55 +73,87 @@
          libqt5sql5-sqlite,
          qml-module-qtquick2 (>= 5.4),
          qml-module-qtquick-window2 (>= 5.3),
-         qtdeclarative5-accounts-plugin,
+         qml-module-ubuntu-onlineaccounts,
+         qml-module-ubuntu-web (= ${binary:Version}),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
-         qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
          qtdeclarative5-unity-action-plugin,
          unity-webapps-qml,
          webbrowser-app (= ${binary:Version}),
-Suggests: qtdeclarative5-online-accounts-client0.1 (>= 0.3),
+Suggests: qml-module-ubuntu-onlineaccounts-client (>= 0.3),
 Description: Ubuntu web applications container
  A lightweight webapp container tailored for Ubuntu, based on the Oxide browser
  engine and using the Ubuntu UI components.
 
+Package: qml-module-ubuntu-ui-extras-browser
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         qml-module-qtquick2 (>= 5.4),
+         qml-module-qtquick-window2 (>= 5.3),
+         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
+         qml-module-ubuntu-web (= ${binary:Version}),
+Replaces: webbrowser-app (<< 0.21), qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< ${source:Version})
+Breaks: webbrowser-app (<< 0.21), qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< ${source:Version})
+Description: Ubuntu web QML module
+ A standalone QML module that contains the UbuntuWebView component
+ , in the Ubuntu.Components.Extras.Browser namespace.
+
 Package: qtdeclarative5-ubuntu-ui-extras-browser-plugin
 Architecture: any
 Multi-Arch: same
+Section: oldlibs
+Depends: qml-module-ubuntu-ui-extras-browser, ${misc:Depends}
+Description: transitional dummy package for the Ubuntu web QML module
+ A standalone QML module that contains the UbuntuWebView component
+ , in the Ubuntu.Components.Extras.Browser namespace.
+
+Package: qml-module-ubuntu-web
+Architecture: any
+Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         liboxideqt-qmlplugin (>= 1.12),
          qml-module-qtquick2 (>= 5.4),
          qml-module-qtquick-window2 (>= 5.3),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
-         qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
-Replaces: webbrowser-app (<< 0.21)
-Breaks: webbrowser-app (<< 0.21)
-Description: Ubuntu web QML plugin
- A standalone QML plugin that contains the UbuntuWebView component
- , in the Ubuntu.Components.Extras.Browser module.
+Breaks: qtdeclarative5-ubuntu-web-plugin (<< ${source:Version})
+Replaces: qtdeclarative5-ubuntu-web-plugin (<< ${source:Version})
+Description: Ubuntu web QML module
+ A standalone QML module that contains the WebView component,
+ in the Ubuntu.Web namespace.
 
 Package: qtdeclarative5-ubuntu-web-plugin
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         liboxideqt-qmlplugin (>= 1.12),
-         qml-module-qtquick2 (>= 5.4),
-         qml-module-qtquick-window2 (>= 5.3),
-         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
-Description: Ubuntu web QML plugin
- A standalone QML plugin that contains the WebView component,
- in the Ubuntu.Web module.
+Section: oldlibs
+Depends: qml-module-ubuntu-web, ${misc:Depends}
+Description: transitional dummy package for the Ubuntu web QML module
+ A standalone QML module that contains the WebView component,
+ in the Ubuntu.Web namespace.
+
+Package: qml-module-ubuntu-web-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Breaks: qtdeclarative5-ubuntu-web-plugin-doc (<< ${source:Version})
+Replaces: qtdeclarative5-ubuntu-web-plugin-doc (<< ${source:Version})
+Description: Ubuntu web QML module HTML documentation
+ A standalone QML module that contains the WebView component,
+ in the Ubuntu.Web namespace. This package contains the public
+ HTML documentation.
 
 Package: qtdeclarative5-ubuntu-web-plugin-doc
-Section: doc
+Section: oldlibs
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends},
-Description: Ubuntu web QML plugin HTML documentation
- A standalone QML plugin that contains the WebView component,
- in the Ubuntu.Web module. This package contains the public
+Depends: qml-module-ubuntu-web-doc, ${misc:Depends}
+Description: transitional dummy package for the Ubuntu web QML module HTML documentation
+ A standalone QML module that contains the WebView component,
+ in the Ubuntu.Web namespace. This package contains the public
  HTML documentation.
 
 Package: webbrowser-app-autopilot

=== renamed file 'debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.install' => 'debian/qml-module-ubuntu-ui-extras-browser.install'
=== renamed file 'debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.lintian-overrides' => 'debian/qml-module-ubuntu-ui-extras-browser.lintian-overrides'
--- debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.lintian-overrides	2013-10-03 18:29:03 +0000
+++ debian/qml-module-ubuntu-ui-extras-browser.lintian-overrides	2016-03-16 12:46:59 +0000
@@ -1,3 +1,3 @@
-qtdeclarative5-ubuntu-ui-extras-browser-plugin: pkg-has-shlibs-control-file-but-no-actual-shared-libs
-qtdeclarative5-ubuntu-ui-extras-browser-plugin: postinst-has-useless-call-to-ldconfig
-qtdeclarative5-ubuntu-ui-extras-browser-plugin: postrm-has-useless-call-to-ldconfig
+qml-module-ubuntu-ui-extras-browser: pkg-has-shlibs-control-file-but-no-actual-shared-libs
+qml-module-ubuntu-ui-extras-browser: postinst-has-useless-call-to-ldconfig
+qml-module-ubuntu-ui-extras-browser: postrm-has-useless-call-to-ldconfig

=== renamed file 'debian/qtdeclarative5-ubuntu-web-plugin-doc.install' => 'debian/qml-module-ubuntu-web-doc.install'
=== renamed file 'debian/qtdeclarative5-ubuntu-web-plugin.install' => 'debian/qml-module-ubuntu-web.install'
=== renamed file 'debian/qtdeclarative5-ubuntu-web-plugin.lintian-overrides' => 'debian/qml-module-ubuntu-web.lintian-overrides'
--- debian/qtdeclarative5-ubuntu-web-plugin.lintian-overrides	2014-05-29 16:40:31 +0000
+++ debian/qml-module-ubuntu-web.lintian-overrides	2016-03-16 12:46:59 +0000
@@ -1,3 +1,3 @@
-qtdeclarative5-ubuntu-web-plugin: pkg-has-shlibs-control-file-but-no-actual-shared-libs
-qtdeclarative5-ubuntu-web-plugin: postinst-has-useless-call-to-ldconfig
-qtdeclarative5-ubuntu-web-plugin: postrm-has-useless-call-to-ldconfig
+qml-module-ubuntu-web: pkg-has-shlibs-control-file-but-no-actual-shared-libs
+qml-module-ubuntu-web: postinst-has-useless-call-to-ldconfig
+qml-module-ubuntu-web: postrm-has-useless-call-to-ldconfig