Merge lp:~robru/cordova-ubuntu/packaging into lp:cordova-ubuntu

[Robert Bruce Park]

Moved assets from /usr/lib to /usr/share.

* Moved assets from /usr/lib to /usr/share, fixing many lintian warnings.
* updated homepage/vcs-bzr fields in debian/control, since the project has moved.

[lp:~robru/cordova-ubuntu/packaging]

230. By Robert Bruce Park on 2013-08-16

Fix symlink.

[Maxim Ermilov (zaspire)]

> Moved assets from /usr/lib to /usr/share
bad idea
1. CaptureWidget.qml/InAppBrowser.qml uses relative paths.
If assets will store in different folder this files should be generated during build(to support running from build directory) _&_ install.
2. other components store assets in same way

> updated homepage/vcs-bzr fields in debian/control, since the project has moved.
It's better split this branch

review: Disapprove

[Robert Bruce Park (robru)]

No, the bad idea is having arch-independent qml/image files living under /usr/lib/[arch]. Moving them under /usr/share isn't optional, it's required by the filesystem. So far we've been using symlinks in order to avoid breaking qml's relative paths that insist on storing everything under /usr/lib.

The only thing I can't figure out is why this project is different and isn't working the same way as other projects that I've made this change to.

[Maxim Ermilov (zaspire)]

> So far we've been using symlinks in order to avoid breaking
symlinks will work.

> 9 +INSTALL(CODE "EXECUTE_PROCESS(COMMAND
> 10 + ln -sf /usr/share/cordova-ubuntu-${VERSION}/assets
> 11 + ${PROJECT_BINARY_DIR}/CordovaUbuntu.${VERSION})")
incorrect.
${PROJECT_BINARY_DIR} is building dir.

extra symlink should be created during build to support running from build directory.

review: Needs Fixing

[Robert Bruce Park (robru)]

Yes? Syntax of `ln` is that the target of the symlink goes first, and the place the symlink is created goes second. So in this case we're creating a symlink in the build dir that points at where stuff is going to get installed to. Then the regular debhelper stuff picks up that symlink and includes it in the final package, so that the symlink gets installed into the system correctly. I'm not sure what you're claiming is 'incorrect' about this. That symlink is really the only part of this that *is* correct. Build a deb from this branch, the symlink is there and points at the right place. All that's missing is somehow having a symlink in the source tree so that in-tree builds continue to function.

I tried just commiting a symlink to the source tree itself, but unfortunately cmake follows it during build time, and you end up with the asset files duplicated *both* in /usr/share and in /usr/lib, which is wrong and terrible.

[Maxim Ermilov (zaspire)]

I fix problems with symlinks & push changes to trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-saucy-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-saucy-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cordova-ubuntu-ci/1/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

230. By Robert Bruce Park on 2013-08-16

Fix symlink.

229. By Robert Bruce Park on 2013-08-16

Move assets out of /usr/lib into /usr/share.

228. By Robert Bruce Park on 2013-08-16

Minor packaging fixes.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-17 22:47:09 +0000
+++ CMakeLists.txt	2013-08-16 19:46:29 +0000
@@ -74,6 +74,11 @@
   COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/CordovaView.qml ${PROJECT_BINARY_DIR}/CordovaUbuntu.${VERSION}
   DEPENDS ${tmp} cordovaubuntuplugin ${PROJECT_BINARY_DIR}/CordovaView.qml
 )
+
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND
+             ln -sf /usr/share/cordova-ubuntu-${VERSION}/assets
+                    ${PROJECT_BINARY_DIR}/CordovaUbuntu.${VERSION})")
+
 file(GLOB tmp xml/*)
 add_custom_command(
   OUTPUT ${PROJECT_BINARY_DIR}/xml
@@ -180,7 +185,7 @@
 install (TARGETS cordova-ubuntu-${VERSION} DESTINATION bin)
 install (TARGETS echoplugin DESTINATION share/cordova-ubuntu-${VERSION}/www)
 install (TARGETS coreplugins DESTINATION lib/cordova-ubuntu-${VERSION}/)
-install (DIRECTORY ${PROJECT_BINARY_DIR}/www ${PROJECT_BINARY_DIR}/xml DESTINATION share/cordova-ubuntu-${VERSION})
+install (DIRECTORY assets ${PROJECT_BINARY_DIR}/www ${PROJECT_BINARY_DIR}/xml DESTINATION share/cordova-ubuntu-${VERSION})
 install (FILES ${PROJECT_BINARY_DIR}/www/cordova-${VERSION}.js DESTINATION share/cordova-ubuntu-${VERSION}/www)
 install (FILES src/cordova.h src/cplugin.h DESTINATION include/cordova-ubuntu-${VERSION}/)
 install (DIRECTORY ${PROJECT_BINARY_DIR}/qml DESTINATION share/cordova-ubuntu-${VERSION})

=== renamed directory 'Cordovaqt/assets' => 'assets'
=== modified file 'debian/changelog'
--- debian/changelog	2013-07-17 02:52:18 +0000
+++ debian/changelog	2013-08-16 19:46:29 +0000
@@ -1,13 +1,22 @@
+cordova-ubuntu (2.8.0+13.10.20130816-0ubuntu1) UNRELEASED; urgency=low
+
+  * Minor packaging fixes.
+  * Automatic snapshot from revision 227 (bootstrap).
+
+ -- Robert Bruce Park <[e-mail]>  Fri, 16 Aug 2013 12:25:24 -0600
+
 cordova-ubuntu (2.8.0~rc2bzr130621-0saucy2) saucy; urgency=low
 
   * updated version.
 
  -- Maxim Ermilov <[e-mail]>  Fri, 2 Jul 2013 14:57:18 -0400
+
 cordovaqt (2.8.0~rc2bzr130621-0raring1) raring; urgency=low
 
   * updated version.
 
  -- Maxim Ermilov <[e-mail]>  Fri, 2 Jul 2013 14:57:18 -0400
+
 cordovaqt (2.3.0~rc2bzr130621-0raring6) raring; urgency=low
 
   * Rename cordovaqt-dev, qtdeclarative5-cordova-2.3-plugin.
@@ -17,7 +26,7 @@
 cordovaqt (2.3.0~rc2bzr130621-0saucy1) UNRELEASED; urgency=low
 
   * Latest snapshot
-  * Rename cordovaqt-runtime package cordovaqt-2.3 to allow parallel, 
+  * Rename cordovaqt-runtime package cordovaqt-2.3 to allow parallel,
     versioned installs.
   * Added transitional package for cordovaqt-runtime.
   * Build for arch any, we no longer need to limit the arch list

=== modified file 'debian/control'
--- debian/control	2013-07-17 23:01:08 +0000
+++ debian/control	2013-08-16 19:46:29 +0000
@@ -16,10 +16,10 @@
                qtsensors5-dev,
                qtsystems5-dev,
 Standards-Version: 3.9.4
-Homepage: https://launchpad.net/campo
-# If you aren't a member of ~campo but need to upload packaging changes,
-# just go ahead.  ~campo will notice and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~campo/campo/trunk
+Homepage: https://launchpad.net/cordova-ubuntu
+# If you aren't a member of ~cordova-ubuntu but need to upload packaging changes,
+# just go ahead.  ~cordova-ubuntu will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~cordova-ubuntu/cordova-ubuntu/trunk
 
 Package: cordova-ubuntu-2.8
 Architecture: any

=== modified file 'debian/qtdeclarative5-cordova-2.8-plugin.install'
--- debian/qtdeclarative5-cordova-2.8-plugin.install	2013-07-17 22:57:34 +0000
+++ debian/qtdeclarative5-cordova-2.8-plugin.install	2013-08-16 19:46:29 +0000
@@ -1,1 +1,2 @@
 usr/lib/*/qt5/qml/
+usr/share/cordova-ubuntu-*/assets