Merge lp:~abreu-alexandre/oxide/chromedriver-packaging-utopic into lp:~oxide-developers/oxide/packaging.utopic.next

Proposed by Alexandre Abreu
Status: Merged
Merged at revision: 48
Proposed branch: lp:~abreu-alexandre/oxide/chromedriver-packaging-utopic
Merge into: lp:~oxide-developers/oxide/packaging.utopic.next
Diff against target: 39 lines (+15/-1)
3 files modified
debian/control (+13/-0)
debian/oxideqt-chromedriver.install (+1/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~abreu-alexandre/oxide/chromedriver-packaging-utopic
Reviewer Review Type Date Requested Status
Chris Coulson Approve
Review via email: mp+239246@code.launchpad.net

This proposal supersedes a proposal from 2014-10-21.

Description of the change

Add chromedriver that seems to have been forgotten

To post a comment you must log in.
Revision history for this message
Chris Coulson (chrisccoulson) wrote : Posted in a previous version of this proposal

This should be proposed in to packaging.utopic for now, shouldn't it?

Also, I think you need to add -DENABLE_CHROMEDRIVER=1 as an argument to cmake in debian/rules. Other than that, this looks fine

review: Needs Fixing
Revision history for this message
Chris Coulson (chrisccoulson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-10-22 13:06:46 +0000
3+++ debian/control 2014-10-22 17:36:46 +0000
4@@ -162,3 +162,16 @@
5 it easy to embed web content in your Qt application
6 .
7 This package provides the debugging symbols for Oxide
8+
9+Package: oxideqt-chromedriver
10+Architecture: any
11+Section: misc
12+Depends: ${misc:Depends},
13+ liboxideqtcore0 (= ${binary:Version})
14+Description: Web browser engine library for Qt (chromedriver build)
15+ Oxide is a web browser engine library based on Google Chromium, that makes
16+ it easy to embed web content in your Qt application
17+ .
18+ This package provides the chromedriver binary that can be used
19+ as a WebDriver proxy to drive oxide with Selenium or any WebDriver
20+ based client.
21
22=== added file 'debian/oxideqt-chromedriver.install'
23--- debian/oxideqt-chromedriver.install 1970-01-01 00:00:00 +0000
24+++ debian/oxideqt-chromedriver.install 2014-10-22 17:36:46 +0000
25@@ -0,0 +1,1 @@
26+usr/lib/*/oxide-qt/chromedriver
27
28=== modified file 'debian/rules'
29--- debian/rules 2014-07-31 11:24:45 +0000
30+++ debian/rules 2014-10-22 17:36:46 +0000
31@@ -7,7 +7,7 @@
32 export DH_OPTIONS
33
34 DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
35-COMMON_OPTIONS := -DENABLE_TESTS=1 -DCMAKE_C_COMPILER=$(shell which gcc-4.8) -DCMAKE_CXX_COMPILER=$(shell which g++-4.8)
36+COMMON_OPTIONS := -DENABLE_TESTS=1 -DENABLE_CHROMEDRIVER=1 -DCMAKE_C_COMPILER=$(shell which gcc-4.8) -DCMAKE_CXX_COMPILER=$(shell which g++-4.8)
37
38 %:
39 dh $@ --parallel

Subscribers

People subscribed via source and target branches