Merge lp:~abreu-alexandre/cordova-ubuntu/3.4-arch-packaging into lp:~dholbach/cordova-ubuntu/3.4-packaging

[Alexandre Abreu]

Update the package install data, to:

- change the name of the package to something less cordova specific,
- install the runtime bits in arch specific paths already,

The other bit (qtc side) of this MR is there:

https://code.launchpad.net/~abreu-alexandre/qtcreator-plugin-ubuntu/cordova-runtime-copy-script-pkg-rename

[Robert Bruce Park (robru)]

Did you really mean to commit so many files under build/ ? this diff is huge... surely those files are generated and don't need to be committed?

[Alexandre Abreu (abreu-alexandre)]

> Did you really mean to commit so many files under build/ ? this diff is
> huge... surely those files are generated and don't need to be committed?

oops ... wrong target branch

[David Barth (dbarth)]

+1

review: Approve

[Daniel Holbach (dholbach)]

I think this changed should have gone to lp:cordova-ubuntu/container instead? I'm happy to propose a merge to speed things up.

review: Approve

=== modified file 'debian/README.Debian'
--- debian/README.Debian	2014-02-13 14:00:46 +0000
+++ debian/README.Debian	2014-02-17 19:09:28 +0000
@@ -1,4 +1,4 @@
-The files in /usr/share/cordova-ubuntu-3.4/ are not meant to be used 
+The files in /usr/share/ubuntu-html5-platform-3.4/ are not meant to be used 
 locally, but are to be shipped in the resulting click packages.
 
 This means that each click package which uses cordova-ubuntu-3.4 will ship
 
=== modified file 'debian/control'
--- debian/control	2014-02-13 23:26:33 +0000
+++ debian/control	2014-02-17 19:09:28 +0000
@@ -23,15 +23,12 @@
 # upstream branch
 Vcs-Bzr: lp:cordova-ubuntu/3.4
 
-Package: cordova-ubuntu-3.4-dev
+Package: ubuntu-html5-platform-3.4-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Description: Cordova Framework for building mobile web apps - development files
- Cordova is a free and open source framework that allows you to create mobile
- apps using standardized web APIs for the platforms you care about.
- .
+Description: Ubuntu HTML5 Framework for building mobile web apps - development files
  This package contains files that are needed to build applications.
  .
  They are not meant to be used locally, but are embedded in the resulting
 
=== modified file 'debian/rules'
--- debian/rules	2014-02-14 07:22:25 +0000
+++ debian/rules	2014-02-17 19:09:28 +0000
@@ -4,7 +4,7 @@
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
-	cd build; cmake -DCMAKE_INSTALL_PREFIX=/usr/share/cordova-ubuntu-3.4 \
+	cd build; cmake -DCMAKE_INSTALL_PREFIX=/usr/share/ubuntu-html5-platform-3.4/${DEB_HOST_MULTIARCH} \
 	                -DCMAKE_VERBOSE_MAKEFILE=ON \
 	                -DCMAKE_BUILD_TYPE=RelWithDebInfo