webbrowser-app

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

  1. qml-module-naming
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1371
Merged at revision: 1404
Proposed branch: lp:~osomon/webbrowser-app/qml-module-naming
Merge into: lp:webbrowser-app
Diff against target: 181 lines (+68/-32)
4 files modified
.bzrignore (+4/-0)
debian/control (+58/-26)
debian/qml-module-ubuntu-ui-extras-browser.lintian-overrides (+3/-3)
debian/qml-module-ubuntu-web.lintian-overrides (+3/-3)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/qml-module-naming
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Timo Jyrinki Approve
Review via email: mp+288080@code.launchpad.net

Commit message

Rename debian packages to follow new QML module naming convention.

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Looks good and complete!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

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

review: Needs Fixing
Revision history for this message
Timo Jyrinki (timo-jyrinki) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2015-10-14 09:05:19 +0000
+++ .bzrignore 2016-03-16 12:46:59 +0000
@@ -34,6 +34,9 @@
34debian/usr.bin.webbrowser-app34debian/usr.bin.webbrowser-app
35debian/files35debian/files
36debian/tmp/36debian/tmp/
37debian/qml-module-ubuntu-ui-extras-browser/
38debian/qml-module-ubuntu-web/
39debian/qml-module-ubuntu-web-doc/
37debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin/40debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin/
38debian/qtdeclarative5-ubuntu-web-plugin/41debian/qtdeclarative5-ubuntu-web-plugin/
39debian/qtdeclarative5-ubuntu-web-plugin-doc/42debian/qtdeclarative5-ubuntu-web-plugin-doc/
@@ -41,6 +44,7 @@
41debian/webapp-container-autopilot/44debian/webapp-container-autopilot/
42debian/webbrowser-app/45debian/webbrowser-app/
43debian/webbrowser-app-autopilot/46debian/webbrowser-app-autopilot/
47debian/debhelper-build-stamp
44debian/*.debhelper48debian/*.debhelper
45debian/*.debhelper.log49debian/*.debhelper.log
46debian/*.substvars50debian/*.substvars
4751
=== 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 @@
32 qtdeclarative5-private-dev,32 qtdeclarative5-private-dev,
33 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),33 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
34 xvfb,34 xvfb,
35Standards-Version: 3.9.535Standards-Version: 3.9.6
36Homepage: https://launchpad.net/webbrowser-app36Homepage: https://launchpad.net/webbrowser-app
37# If you aren't a member of ~phablet-team but need to upload packaging changes,37# If you aren't a member of ~phablet-team but need to upload packaging changes,
38# just go ahead. ~phablet-team will notice and sync up the code again.38# just go ahead. ~phablet-team will notice and sync up the code again.
@@ -51,8 +51,8 @@
51 qml-module-qtquick2 (>= 5.4),51 qml-module-qtquick2 (>= 5.4),
52 qml-module-qtquick-layouts,52 qml-module-qtquick-layouts,
53 qml-module-qtquick-window2 (>= 5.3),53 qml-module-qtquick-window2 (>= 5.3),
54 qml-module-ubuntu-web (= ${binary:Version}),
54 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),55 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
55 qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
56 qtdeclarative5-unity-action-plugin,56 qtdeclarative5-unity-action-plugin,
57Replaces: webbrowser-app-assets,57Replaces: webbrowser-app-assets,
58 qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< 0.22),58 qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< 0.22),
@@ -73,55 +73,87 @@
73 libqt5sql5-sqlite,73 libqt5sql5-sqlite,
74 qml-module-qtquick2 (>= 5.4),74 qml-module-qtquick2 (>= 5.4),
75 qml-module-qtquick-window2 (>= 5.3),75 qml-module-qtquick-window2 (>= 5.3),
76 qtdeclarative5-accounts-plugin,76 qml-module-ubuntu-onlineaccounts,
77 qml-module-ubuntu-web (= ${binary:Version}),
77 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),78 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
78 qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
79 qtdeclarative5-unity-action-plugin,79 qtdeclarative5-unity-action-plugin,
80 unity-webapps-qml,80 unity-webapps-qml,
81 webbrowser-app (= ${binary:Version}),81 webbrowser-app (= ${binary:Version}),
82Suggests: qtdeclarative5-online-accounts-client0.1 (>= 0.3),82Suggests: qml-module-ubuntu-onlineaccounts-client (>= 0.3),
83Description: Ubuntu web applications container83Description: Ubuntu web applications container
84 A lightweight webapp container tailored for Ubuntu, based on the Oxide browser84 A lightweight webapp container tailored for Ubuntu, based on the Oxide browser
85 engine and using the Ubuntu UI components.85 engine and using the Ubuntu UI components.
8686
87Package: qml-module-ubuntu-ui-extras-browser
88Architecture: any
89Multi-Arch: same
90Pre-Depends: ${misc:Pre-Depends}
91Depends: ${misc:Depends},
92 ${shlibs:Depends},
93 qml-module-qtquick2 (>= 5.4),
94 qml-module-qtquick-window2 (>= 5.3),
95 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
96 qml-module-ubuntu-web (= ${binary:Version}),
97Replaces: webbrowser-app (<< 0.21), qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< ${source:Version})
98Breaks: webbrowser-app (<< 0.21), qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< ${source:Version})
99Description: Ubuntu web QML module
100 A standalone QML module that contains the UbuntuWebView component
101 , in the Ubuntu.Components.Extras.Browser namespace.
102
87Package: qtdeclarative5-ubuntu-ui-extras-browser-plugin103Package: qtdeclarative5-ubuntu-ui-extras-browser-plugin
88Architecture: any104Architecture: any
89Multi-Arch: same105Multi-Arch: same
106Section: oldlibs
107Depends: qml-module-ubuntu-ui-extras-browser, ${misc:Depends}
108Description: transitional dummy package for the Ubuntu web QML module
109 A standalone QML module that contains the UbuntuWebView component
110 , in the Ubuntu.Components.Extras.Browser namespace.
111
112Package: qml-module-ubuntu-web
113Architecture: any
114Multi-Arch: same
90Pre-Depends: ${misc:Pre-Depends}115Pre-Depends: ${misc:Pre-Depends}
91Depends: ${misc:Depends},116Depends: ${misc:Depends},
92 ${shlibs:Depends},117 ${shlibs:Depends},
118 liboxideqt-qmlplugin (>= 1.12),
93 qml-module-qtquick2 (>= 5.4),119 qml-module-qtquick2 (>= 5.4),
94 qml-module-qtquick-window2 (>= 5.3),120 qml-module-qtquick-window2 (>= 5.3),
95 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),121 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
96 qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),122Breaks: qtdeclarative5-ubuntu-web-plugin (<< ${source:Version})
97Replaces: webbrowser-app (<< 0.21)123Replaces: qtdeclarative5-ubuntu-web-plugin (<< ${source:Version})
98Breaks: webbrowser-app (<< 0.21)124Description: Ubuntu web QML module
99Description: Ubuntu web QML plugin125 A standalone QML module that contains the WebView component,
100 A standalone QML plugin that contains the UbuntuWebView component126 in the Ubuntu.Web namespace.
101 , in the Ubuntu.Components.Extras.Browser module.
102127
103Package: qtdeclarative5-ubuntu-web-plugin128Package: qtdeclarative5-ubuntu-web-plugin
104Architecture: any129Architecture: any
105Multi-Arch: same130Multi-Arch: same
106Pre-Depends: ${misc:Pre-Depends}131Section: oldlibs
107Depends: ${misc:Depends},132Depends: qml-module-ubuntu-web, ${misc:Depends}
108 ${shlibs:Depends},133Description: transitional dummy package for the Ubuntu web QML module
109 liboxideqt-qmlplugin (>= 1.12),134 A standalone QML module that contains the WebView component,
110 qml-module-qtquick2 (>= 5.4),135 in the Ubuntu.Web namespace.
111 qml-module-qtquick-window2 (>= 5.3),136
112 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),137Package: qml-module-ubuntu-web-doc
113Description: Ubuntu web QML plugin138Section: doc
114 A standalone QML plugin that contains the WebView component,139Architecture: all
115 in the Ubuntu.Web module.140Multi-Arch: foreign
141Depends: ${misc:Depends}
142Breaks: qtdeclarative5-ubuntu-web-plugin-doc (<< ${source:Version})
143Replaces: qtdeclarative5-ubuntu-web-plugin-doc (<< ${source:Version})
144Description: Ubuntu web QML module HTML documentation
145 A standalone QML module that contains the WebView component,
146 in the Ubuntu.Web namespace. This package contains the public
147 HTML documentation.
116148
117Package: qtdeclarative5-ubuntu-web-plugin-doc149Package: qtdeclarative5-ubuntu-web-plugin-doc
118Section: doc150Section: oldlibs
119Architecture: all151Architecture: all
120Multi-Arch: foreign152Multi-Arch: foreign
121Depends: ${misc:Depends},153Depends: qml-module-ubuntu-web-doc, ${misc:Depends}
122Description: Ubuntu web QML plugin HTML documentation154Description: transitional dummy package for the Ubuntu web QML module HTML documentation
123 A standalone QML plugin that contains the WebView component,155 A standalone QML module that contains the WebView component,
124 in the Ubuntu.Web module. This package contains the public156 in the Ubuntu.Web namespace. This package contains the public
125 HTML documentation.157 HTML documentation.
126158
127Package: webbrowser-app-autopilot159Package: webbrowser-app-autopilot
128160
=== 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 @@
1qtdeclarative5-ubuntu-ui-extras-browser-plugin: pkg-has-shlibs-control-file-but-no-actual-shared-libs1qml-module-ubuntu-ui-extras-browser: pkg-has-shlibs-control-file-but-no-actual-shared-libs
2qtdeclarative5-ubuntu-ui-extras-browser-plugin: postinst-has-useless-call-to-ldconfig2qml-module-ubuntu-ui-extras-browser: postinst-has-useless-call-to-ldconfig
3qtdeclarative5-ubuntu-ui-extras-browser-plugin: postrm-has-useless-call-to-ldconfig3qml-module-ubuntu-ui-extras-browser: postrm-has-useless-call-to-ldconfig
44
=== 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 @@
1qtdeclarative5-ubuntu-web-plugin: pkg-has-shlibs-control-file-but-no-actual-shared-libs1qml-module-ubuntu-web: pkg-has-shlibs-control-file-but-no-actual-shared-libs
2qtdeclarative5-ubuntu-web-plugin: postinst-has-useless-call-to-ldconfig2qml-module-ubuntu-web: postinst-has-useless-call-to-ldconfig
3qtdeclarative5-ubuntu-web-plugin: postrm-has-useless-call-to-ldconfig3qml-module-ubuntu-web: postrm-has-useless-call-to-ldconfig

Subscribers

People subscribed via source and target branches

to status/vote changes: