Merge lp:~dholbach/cordova-ubuntu/3.4-packaging into lp:cordova-ubuntu/container

Proposed by Daniel Holbach on 2014-02-18
Status: Merged
Approved by: David Barth on 2014-02-18
Approved revision: 17
Merged at revision: 17
Proposed branch: lp:~dholbach/cordova-ubuntu/3.4-packaging
Merge into: lp:cordova-ubuntu/container
Diff against target: 43 lines (+4/-7)
3 files modified
debian/README.Debian (+1/-1)
debian/control (+2/-5)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~dholbach/cordova-ubuntu/3.4-packaging
Reviewer Review Type Date Requested Status
David Barth (community) 2014-02-18 Approve on 2014-02-18
Cordova Ubuntu Team 2014-02-18 Pending
Review via email: mp+206863@code.launchpad.net
To post a comment you must log in.
David Barth (dbarth) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/README.Debian'
2--- debian/README.Debian 2014-02-14 12:34:37 +0000
3+++ debian/README.Debian 2014-02-18 08:52:37 +0000
4@@ -1,4 +1,4 @@
5-The files in /usr/share/cordova-ubuntu-3.4/ are not meant to be used
6+The files in /usr/share/ubuntu-html5-platform-3.4/ are not meant to be used
7 locally, but are to be shipped in the resulting click packages.
8
9 This means that each click package which uses cordova-ubuntu-3.4 will ship
10
11=== modified file 'debian/control'
12--- debian/control 2014-02-13 23:26:33 +0000
13+++ debian/control 2014-02-18 08:52:37 +0000
14@@ -23,15 +23,12 @@
15 # upstream branch
16 Vcs-Bzr: lp:cordova-ubuntu/3.4
17
18-Package: cordova-ubuntu-3.4-dev
19+Package: ubuntu-html5-platform-3.4-dev
20 Section: libdevel
21 Architecture: any
22 Depends: ${misc:Depends},
23 ${shlibs:Depends},
24-Description: Cordova Framework for building mobile web apps - development files
25- Cordova is a free and open source framework that allows you to create mobile
26- apps using standardized web APIs for the platforms you care about.
27- .
28+Description: Ubuntu HTML5 Framework for building mobile web apps - development files
29 This package contains files that are needed to build applications.
30 .
31 They are not meant to be used locally, but are embedded in the resulting
32
33=== modified file 'debian/rules'
34--- debian/rules 2014-02-14 07:22:25 +0000
35+++ debian/rules 2014-02-18 08:52:37 +0000
36@@ -4,7 +4,7 @@
37 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
38
39 override_dh_auto_configure:
40- cd build; cmake -DCMAKE_INSTALL_PREFIX=/usr/share/cordova-ubuntu-3.4 \
41+ cd build; cmake -DCMAKE_INSTALL_PREFIX=/usr/share/ubuntu-html5-platform-3.4/${DEB_HOST_MULTIARCH} \
42 -DCMAKE_VERBOSE_MAKEFILE=ON \
43 -DCMAKE_BUILD_TYPE=RelWithDebInfo
44

Subscribers

People subscribed via source and target branches