Merge lp:~didrocks/ubuntu-html5-theme/clean-package into lp:~ubuntu-html5-theme-devs/ubuntu-html5-theme/ambiance

[Didier Roche-Tolomelli]

* Fix some package dependencies mismatch
* Use python to install autopilot tests
* Simplify and ensure debian/copyright follows our policy
* Rename some install file to match binaries
* Add bootstrap commit so that we don't list every commit from rev 1

* Fix some package dependencies mismatch
  * Use python to install autopilot tests
  * Simplify and ensure debian/copyright follows our policy
  * Rename some install file to match binaries
  * Add bootstrap commit so that we don't list every commit from rev 1

[Timo Jyrinki (timo-jyrinki)]

Looks good and elegant, builds and runs fine.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-03 19:24:36 +0000
+++ debian/changelog	2013-07-05 07:39:31 +0000
@@ -1,4 +1,4 @@
-ubuntu-html5-theme (0.1-0ubuntu2) UNRELEASED; urgency=low
+ubuntu-html5-theme (0.1-0ubuntu1) UNRELEASED; urgency=low
 
   [ Alexandre Abreu ]
   * Initial release
@@ -22,4 +22,11 @@
   [ Alexandre Abreu ]
   * Add package for autopilot tests
 
+  [ Didier Roche ]
+  * Fix some package dependencies mismatch
+  * Use python to install autopilot tests
+  * Simplify and ensure debian/copyright follows our policy
+  * Rename some install file to match binaries
+  * Automatic snapshot from revision 56 (bootstrap)
+
  -- Alexandre Abreu <[e-mail]>  Wed, 03 Jul 2013 15:23:15 -0400

=== modified file 'debian/control'
--- debian/control	2013-07-03 19:24:36 +0000
+++ debian/control	2013-07-05 07:39:31 +0000
@@ -3,6 +3,8 @@
 Priority: optional
 Maintainer: Michael Hall <[e-mail]>
 Build-Depends: debhelper (>= 9),
+               python (>= 2.7),
+               python-setuptools,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-html5-theme
 # If you aren't a member of ~ubuntu-html5-theme-devs but need to upload packaging changes,
@@ -28,9 +30,11 @@
 Package: ubuntu-html5-theme-autopilot
 Architecture: all
 Depends: ${misc:Depends},
+         ${python:Depends},
          libautopilot-qt,
          libqt5test5,
-	 ubuntu-html5-theme
+         ubuntu-html5-theme (= ${binary:Version}),
+         ubuntu-html5-theme-examples (= ${binary:Version}),
 Description: Autopilot tests for the Toolkit for Ubuntu HTML5 Apps
  Common CSS and Javascript for developing native-looking HTML5 applications
  for Ubuntu. This package contains autopilot tests for it.

=== modified file 'debian/copyright'
--- debian/copyright	2013-07-03 16:09:42 +0000
+++ debian/copyright	2013-07-05 07:39:31 +0000
@@ -13,19 +13,11 @@
 Files: *
 Copyright: 2013 Adnane Belmadiaf <[e-mail]>
            2013 Tiago Hillebrandt <[e-mail]>
-	   2013 Canonical Ltd
-License: LGPL-3+
-
-Files: debian/*
-Copyright: 2013 Michael Hall <[e-mail]>
-License: LGPL-3+
-
-License: LGPL-3+
+           2013 Canonical Ltd
+License: LGPL-3
  This package is free software; you can redistribute it and/or modify
- it under the terms of the Lesser GNU General Public License as
- published by the Free Software Foundation; either version 3 of the
- License, or
- (at your option) any later version.
+ it under the terms of the Lesser GNU General Public License version 3,
+ as published by the Free Software Foundation.
  .
  This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of

=== modified file 'debian/rules'
--- debian/rules	2013-07-03 11:43:04 +0000
+++ debian/rules	2013-07-05 07:39:31 +0000
@@ -5,4 +5,14 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --fail-missing
+	dh $@ --fail-missing --with python2
+
+override_dh_install:
+	# install autopilot tests
+	cd tests/autopilot; \
+	set -ex; for python in $(shell pyversions -r); do \
+		$$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
+	done; \
+	cd $(CURDIR)
+	dh_install -X'*.pyc' --fail-missing
+

=== modified file 'debian/ubuntu-html5-theme-autopilot.install'
--- debian/ubuntu-html5-theme-autopilot.install	2013-07-03 19:24:36 +0000
+++ debian/ubuntu-html5-theme-autopilot.install	2013-07-05 07:39:31 +0000
@@ -1,2 +1,2 @@
-tests/autopilot/ubuntu_html5_theme/* usr/lib/python2.7/dist-packages/ubuntu_html5_theme/
+usr/lib/python*
 tests/autopilot/tools/* usr/share/ubuntu-html5-theme/autopilot-tests/

=== renamed file 'debian/install' => 'debian/ubuntu-html5-theme.install'
=== added file 'tests/autopilot/setup.py'
--- tests/autopilot/setup.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/setup.py	2013-07-05 07:39:31 +0000
@@ -0,0 +1,21 @@
+#!/usr/bin/python
+
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2013 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+
+from distutils.core import setup
+from setuptools import find_packages
+
+setup(
+    name='ubuntu-html5-theme',
+    version='0.1',
+    description='ubuntu html5 theme autopilot tests.',
+    url='https://launchpad.net/ubuntu-html5-theme',
+    license='GPLv3',
+    packages=find_packages(),
+)