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
1=== modified file '.bzrignore'
2--- .bzrignore 2015-10-14 09:05:19 +0000
3+++ .bzrignore 2016-03-16 12:46:59 +0000
4@@ -34,6 +34,9 @@
5 debian/usr.bin.webbrowser-app
6 debian/files
7 debian/tmp/
8+debian/qml-module-ubuntu-ui-extras-browser/
9+debian/qml-module-ubuntu-web/
10+debian/qml-module-ubuntu-web-doc/
11 debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin/
12 debian/qtdeclarative5-ubuntu-web-plugin/
13 debian/qtdeclarative5-ubuntu-web-plugin-doc/
14@@ -41,6 +44,7 @@
15 debian/webapp-container-autopilot/
16 debian/webbrowser-app/
17 debian/webbrowser-app-autopilot/
18+debian/debhelper-build-stamp
19 debian/*.debhelper
20 debian/*.debhelper.log
21 debian/*.substvars
22
23=== modified file 'debian/control'
24--- debian/control 2016-03-07 18:29:23 +0000
25+++ debian/control 2016-03-16 12:46:59 +0000
26@@ -32,7 +32,7 @@
27 qtdeclarative5-private-dev,
28 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
29 xvfb,
30-Standards-Version: 3.9.5
31+Standards-Version: 3.9.6
32 Homepage: https://launchpad.net/webbrowser-app
33 # If you aren't a member of ~phablet-team but need to upload packaging changes,
34 # just go ahead. ~phablet-team will notice and sync up the code again.
35@@ -51,8 +51,8 @@
36 qml-module-qtquick2 (>= 5.4),
37 qml-module-qtquick-layouts,
38 qml-module-qtquick-window2 (>= 5.3),
39+ qml-module-ubuntu-web (= ${binary:Version}),
40 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
41- qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
42 qtdeclarative5-unity-action-plugin,
43 Replaces: webbrowser-app-assets,
44 qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< 0.22),
45@@ -73,55 +73,87 @@
46 libqt5sql5-sqlite,
47 qml-module-qtquick2 (>= 5.4),
48 qml-module-qtquick-window2 (>= 5.3),
49- qtdeclarative5-accounts-plugin,
50+ qml-module-ubuntu-onlineaccounts,
51+ qml-module-ubuntu-web (= ${binary:Version}),
52 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
53- qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
54 qtdeclarative5-unity-action-plugin,
55 unity-webapps-qml,
56 webbrowser-app (= ${binary:Version}),
57-Suggests: qtdeclarative5-online-accounts-client0.1 (>= 0.3),
58+Suggests: qml-module-ubuntu-onlineaccounts-client (>= 0.3),
59 Description: Ubuntu web applications container
60 A lightweight webapp container tailored for Ubuntu, based on the Oxide browser
61 engine and using the Ubuntu UI components.
62
63+Package: qml-module-ubuntu-ui-extras-browser
64+Architecture: any
65+Multi-Arch: same
66+Pre-Depends: ${misc:Pre-Depends}
67+Depends: ${misc:Depends},
68+ ${shlibs:Depends},
69+ qml-module-qtquick2 (>= 5.4),
70+ qml-module-qtquick-window2 (>= 5.3),
71+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
72+ qml-module-ubuntu-web (= ${binary:Version}),
73+Replaces: webbrowser-app (<< 0.21), qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< ${source:Version})
74+Breaks: webbrowser-app (<< 0.21), qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< ${source:Version})
75+Description: Ubuntu web QML module
76+ A standalone QML module that contains the UbuntuWebView component
77+ , in the Ubuntu.Components.Extras.Browser namespace.
78+
79 Package: qtdeclarative5-ubuntu-ui-extras-browser-plugin
80 Architecture: any
81 Multi-Arch: same
82+Section: oldlibs
83+Depends: qml-module-ubuntu-ui-extras-browser, ${misc:Depends}
84+Description: transitional dummy package for the Ubuntu web QML module
85+ A standalone QML module that contains the UbuntuWebView component
86+ , in the Ubuntu.Components.Extras.Browser namespace.
87+
88+Package: qml-module-ubuntu-web
89+Architecture: any
90+Multi-Arch: same
91 Pre-Depends: ${misc:Pre-Depends}
92 Depends: ${misc:Depends},
93 ${shlibs:Depends},
94+ liboxideqt-qmlplugin (>= 1.12),
95 qml-module-qtquick2 (>= 5.4),
96 qml-module-qtquick-window2 (>= 5.3),
97 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
98- qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
99-Replaces: webbrowser-app (<< 0.21)
100-Breaks: webbrowser-app (<< 0.21)
101-Description: Ubuntu web QML plugin
102- A standalone QML plugin that contains the UbuntuWebView component
103- , in the Ubuntu.Components.Extras.Browser module.
104+Breaks: qtdeclarative5-ubuntu-web-plugin (<< ${source:Version})
105+Replaces: qtdeclarative5-ubuntu-web-plugin (<< ${source:Version})
106+Description: Ubuntu web QML module
107+ A standalone QML module that contains the WebView component,
108+ in the Ubuntu.Web namespace.
109
110 Package: qtdeclarative5-ubuntu-web-plugin
111 Architecture: any
112 Multi-Arch: same
113-Pre-Depends: ${misc:Pre-Depends}
114-Depends: ${misc:Depends},
115- ${shlibs:Depends},
116- liboxideqt-qmlplugin (>= 1.12),
117- qml-module-qtquick2 (>= 5.4),
118- qml-module-qtquick-window2 (>= 5.3),
119- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
120-Description: Ubuntu web QML plugin
121- A standalone QML plugin that contains the WebView component,
122- in the Ubuntu.Web module.
123+Section: oldlibs
124+Depends: qml-module-ubuntu-web, ${misc:Depends}
125+Description: transitional dummy package for the Ubuntu web QML module
126+ A standalone QML module that contains the WebView component,
127+ in the Ubuntu.Web namespace.
128+
129+Package: qml-module-ubuntu-web-doc
130+Section: doc
131+Architecture: all
132+Multi-Arch: foreign
133+Depends: ${misc:Depends}
134+Breaks: qtdeclarative5-ubuntu-web-plugin-doc (<< ${source:Version})
135+Replaces: qtdeclarative5-ubuntu-web-plugin-doc (<< ${source:Version})
136+Description: Ubuntu web QML module HTML documentation
137+ A standalone QML module that contains the WebView component,
138+ in the Ubuntu.Web namespace. This package contains the public
139+ HTML documentation.
140
141 Package: qtdeclarative5-ubuntu-web-plugin-doc
142-Section: doc
143+Section: oldlibs
144 Architecture: all
145 Multi-Arch: foreign
146-Depends: ${misc:Depends},
147-Description: Ubuntu web QML plugin HTML documentation
148- A standalone QML plugin that contains the WebView component,
149- in the Ubuntu.Web module. This package contains the public
150+Depends: qml-module-ubuntu-web-doc, ${misc:Depends}
151+Description: transitional dummy package for the Ubuntu web QML module HTML documentation
152+ A standalone QML module that contains the WebView component,
153+ in the Ubuntu.Web namespace. This package contains the public
154 HTML documentation.
155
156 Package: webbrowser-app-autopilot
157
158=== renamed file 'debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.install' => 'debian/qml-module-ubuntu-ui-extras-browser.install'
159=== renamed file 'debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.lintian-overrides' => 'debian/qml-module-ubuntu-ui-extras-browser.lintian-overrides'
160--- debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.lintian-overrides 2013-10-03 18:29:03 +0000
161+++ debian/qml-module-ubuntu-ui-extras-browser.lintian-overrides 2016-03-16 12:46:59 +0000
162@@ -1,3 +1,3 @@
163-qtdeclarative5-ubuntu-ui-extras-browser-plugin: pkg-has-shlibs-control-file-but-no-actual-shared-libs
164-qtdeclarative5-ubuntu-ui-extras-browser-plugin: postinst-has-useless-call-to-ldconfig
165-qtdeclarative5-ubuntu-ui-extras-browser-plugin: postrm-has-useless-call-to-ldconfig
166+qml-module-ubuntu-ui-extras-browser: pkg-has-shlibs-control-file-but-no-actual-shared-libs
167+qml-module-ubuntu-ui-extras-browser: postinst-has-useless-call-to-ldconfig
168+qml-module-ubuntu-ui-extras-browser: postrm-has-useless-call-to-ldconfig
169
170=== renamed file 'debian/qtdeclarative5-ubuntu-web-plugin-doc.install' => 'debian/qml-module-ubuntu-web-doc.install'
171=== renamed file 'debian/qtdeclarative5-ubuntu-web-plugin.install' => 'debian/qml-module-ubuntu-web.install'
172=== renamed file 'debian/qtdeclarative5-ubuntu-web-plugin.lintian-overrides' => 'debian/qml-module-ubuntu-web.lintian-overrides'
173--- debian/qtdeclarative5-ubuntu-web-plugin.lintian-overrides 2014-05-29 16:40:31 +0000
174+++ debian/qml-module-ubuntu-web.lintian-overrides 2016-03-16 12:46:59 +0000
175@@ -1,3 +1,3 @@
176-qtdeclarative5-ubuntu-web-plugin: pkg-has-shlibs-control-file-but-no-actual-shared-libs
177-qtdeclarative5-ubuntu-web-plugin: postinst-has-useless-call-to-ldconfig
178-qtdeclarative5-ubuntu-web-plugin: postrm-has-useless-call-to-ldconfig
179+qml-module-ubuntu-web: pkg-has-shlibs-control-file-but-no-actual-shared-libs
180+qml-module-ubuntu-web: postinst-has-useless-call-to-ldconfig
181+qml-module-ubuntu-web: postrm-has-useless-call-to-ldconfig

Subscribers

People subscribed via source and target branches

to status/vote changes: