Merge lp:~robru/webbrowser-app/packaging into lp:webbrowser-app

[Robert Bruce Park]

Minor packaging fixes.

[Didier Roche-Tolomelli (didrocks)]

@Martin: can we get jenkins taking care of that one for a CI job?

After a first really quick looks, this looks good.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:95
http://s-jenkins:8080/job/webbrowser-app-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci-builder/./build=panda-pbuilder,distribution=quantal,flavor=armhf/125/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci-builder/./build=pbuilder-master,distribution=quantal,flavor=i386/125/console

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

review: Needs Fixing (continuous-integration)

[lp:~robru/webbrowser-app/packaging]

96. By Robert Bruce Park on 2013-03-19

Fix copy&paste error in debian/rules.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:96
http://s-jenkins:8080/job/webbrowser-app-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci-builder/./build=panda-pbuilder,distribution=quantal,flavor=armhf/126/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci-builder/./build=pbuilder-master,distribution=quantal,flavor=i386/126/console
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner/75/console

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

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Please approve ;-)

[Didier Roche-Tolomelli (didrocks)]

Hey Robert,

same question than the other (this job is using the ppa), did you try it without the ppa, are all build-deps available in normal distro? Did you try running it, looking at the tests status, and are you happy with those? :)

review: Needs Information

[lp:~robru/webbrowser-app/packaging]

97. By Robert Bruce Park on 2013-03-22

Update standards.

[Robert Bruce Park (robru)]

This one builds ok on amd64 but fails to install because libhud-qt-qml is missing.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-i386-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/2/console

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

review: Needs Fixing (continuous-integration)

[lp:~robru/webbrowser-app/packaging]

98. By Robert Bruce Park on 2013-03-22

Rebase on trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:98
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-i386-ci/6
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/244

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

In debian/control, in the build deps, the following line was mistakenly added (or rather, not removed when rebasing on the latest trunk):

    qt-components-ubuntu,

review: Needs Fixing

[lp:~robru/webbrowser-app/packaging]

99. By Robert Bruce Park on 2013-03-25

Drop obsolete dep.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-i386-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/6

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

review: Needs Fixing (continuous-integration)

[Robert Bruce Park (robru)]

I don't have the slightest clue what jenkins is trying to tell me here. But this package is still blocked on libhud-qt-qml anyway.

[Didier Roche-Tolomelli (didrocks)]

Robert: I think jenkins is having a hard time. Let me ping mmrazik :)

[Olivier Tilloy (osomon)]

Yup, looks like jenkins is messed up, it reports a failure because generic-mediumtests #366 failed, but this job was for the gallery application!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-i386-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/9
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/337

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-i386-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/338

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Looks good to me now.

review: Approve

[Robert Bruce Park (robru)]

So, I installed libhud-qt-qml from the PPA, and then I was able to install this package. It doesn't run though:

$ webbrowser-app

WARNING: This project is using the experimental QML API extensions for QtWebKit and is therefore tied to a specific QtWebKit release.
WARNING: The experimental API will change from version to version, or even be removed. You have been warned!

register types Ubuntu.HUD
initialize engine Ubuntu.HUD
file:///usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Browser/Browser.qml:130:22: Cannot assign to non-existent property "devicePixelRatio"
             experimental.devicePixelRatio: browser.qtwebkitdpr
                          ^
Segmentation fault (core dumped)

Thoughts, Olivier? I'm not good with gdb so I'll need you to guide me somewhat to better troubleshoot this.

[Olivier Tilloy (osomon)]

This one needs a patched version of QtWebKit that’s in the phablet-team PPA. Interestingly, it hasn’t been built for raring in the PPA, I’ll request it.

This 'experimental.devicePixelRatio' property doesn’t make much sense on the desktop anyway, so I’ll see if we can make it optional, instead of crashing badly at startup.

Note that this property was introduced to work around an incomplete implementation in QtUbuntu (Qt Platform Abstraction for Ubuntu Touch), so in the long run it is supposed to go away (what is unclear to me is when, I’ll see if I can find out).

[Robert Bruce Park (robru)]

In the name of convergence, wouldn't it make more sense to simply define the value of experimental.devicePixelRatio to be '1' (or whatever 'nop' value is appropriate), just so that the same code runs everywhere?

[Olivier Tilloy (osomon)]

Definitely. However the issue here is that the stock version of QtWebKit in ubuntu doesn’t know of this attached property, so QML chokes when trying to assign it a value.

[Olivier Tilloy (osomon)]

> This 'experimental.devicePixelRatio' property doesn’t make much sense on the
> desktop anyway, so I’ll see if we can make it optional, instead of crashing
> badly at startup.

Done, see https://code.launchpad.net/~osomon/webbrowser-app/webkitdpr-patch-not-mandatory/+merge/155706.

[Olivier Tilloy (osomon)]

> > This 'experimental.devicePixelRatio' property doesn’t make much sense on the
> > desktop anyway, so I’ll see if we can make it optional, instead of crashing
> > badly at startup.
>
> Done, see https://code.launchpad.net/~osomon/webbrowser-app/webkitdpr-patch-
> not-mandatory/+merge/155706.

And merged in webbrowser-app trunk.

[Olivier Tilloy (osomon)]

Merging in trunk yields a conflict in debian/changelog, can you please rebase to fix that?

review: Needs Fixing

[lp:~robru/webbrowser-app/packaging]

100. By Robert Bruce Park on 2013-03-27

[ Olivier Tilloy ]
* Add support for <select> dropdowns (LP: #1157764).
* Work around the lack of support for handling hyperlinks with a
  target attribute set to '_blank' in QtWebKit (LP: #1129281).
* Allow faster scrolling, by making the maximum flick velocity of
  the webview proportional to its height (LP: #1118501).

[Robert Bruce Park (robru)]

Wow, it runs! This is amazing ;-)

Please merge!

review: Approve

[Olivier Tilloy (osomon)]

You shouldn’t modify the latest changelog entry (0.17), as it’s already been released (and published in the phablet-team PPA). I think you should add a new changelog entry instead.

review: Needs Fixing

[lp:~robru/webbrowser-app/packaging]

101. By Robert Bruce Park on 2013-03-27

Marching along...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-i386-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/413

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

LGTM now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-i386-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/418

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

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-26 18:07:13 +0000
+++ debian/changelog	2013-03-27 18:37:20 +0000
@@ -1,3 +1,9 @@
+webbrowser-app (0.17-0ubuntu1) UNRELEASED; urgency=low
+
+  * Some minor fixes to the packaging.
+
+ -- Robert Bruce Park <[e-mail]>  Wed, 27 Mar 2013 11:34:51 -0700
+
 webbrowser-app (0.17) quantal; urgency=low
 
   * Add support for <select> dropdowns (LP: #1157764).
@@ -125,7 +131,7 @@
 
 ubuntu-browser (0.2) quantal; urgency=low
 
-  * latest release 
+  * latest release
 
  -- Bill Filler <[e-mail]>  Thu, 31 Jan 2013 22:02:22 -0500
 

=== modified file 'debian/control'
--- debian/control	2013-03-19 11:59:00 +0000
+++ debian/control	2013-03-27 18:37:20 +0000
@@ -2,39 +2,42 @@
 Section: x11
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 9.0),
-               cmake (>= 2.8.9),
+Build-Depends: cmake (>= 2.8.9),
+               debhelper (>= 9),
+               python,
                qt5-default,
                qt5-qmake,
                qtbase5-dev,
                qtdeclarative5-dev,
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
+               qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
                qtdeclarative5-window-plugin,
-               qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
-               python,
-Standards-Version: 3.9.3
-Vcs-Bzr: lp:webbrowser-app
+Standards-Version: 3.9.4
+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.
+Vcs-Bzr: https://code.launchpad.net/~phablet-team/webbrowser-app/trunk
 
 Package: webbrowser-app
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Depends: libhud-qt-qml,
+         libqt5webkit5-qmlwebkitplugin,
          qtdeclarative5-qtquick2-plugin,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-window-plugin,
-         libqt5webkit5-qmlwebkitplugin,
-         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
-         libhud-qt-qml,
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: Ubuntu web browser
  A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
  engine and using the Ubuntu UI components.
 
 Package: webbrowser-app-autopilot
 Architecture: all
-Depends: ${misc:Depends},
-         libautopilot-qt,
+Depends: libautopilot-qt,
          libqt5test5,
          webbrowser-app (= ${source:Version}),
+         ${misc:Depends},
 Description: Ubuntu web browser autopilot tests
  A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
  engine and using the Ubuntu UI components. This package contains autopilot

=== modified file 'debian/copyright'
--- debian/copyright	2013-02-07 09:28:18 +0000
+++ debian/copyright	2013-03-27 18:37:20 +0000
@@ -19,4 +19,3 @@
  .
  On Debian systems, the full text of the GNU General Public License
  version 3 can be found in the file /usr/share/common-licenses/GPL-3.
-

=== modified file 'debian/rules'
--- debian/rules	2013-02-07 09:30:39 +0000
+++ debian/rules	2013-03-27 18:37:20 +0000
@@ -9,3 +9,5 @@
 %:
 	dh $@ --parallel
 
+override_dh_install:
+	dh_install --fail-missing

=== modified file 'debian/webbrowser-app-autopilot.install'
--- debian/webbrowser-app-autopilot.install	2013-03-08 10:59:25 +0000
+++ debian/webbrowser-app-autopilot.install	2013-03-27 18:37:20 +0000
@@ -1,2 +1,1 @@
 usr/lib/python*/dist-packages/webbrowser_app/*
-