Merge lp:~cyphermox/autopilot-qt/inline into lp:autopilot-qt

[Mathieu Trudel-Lapierre]

Update packaging for autolanding.

Update packaging for autolanding

[Mathieu Trudel-Lapierre (cyphermox)]

It seems liek this is likely to explode; qt5 doesn't seem packaged yet?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:35
http://s-jenkins:8080/job/autopilot-qt-ci/34/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/autopilot-qt-ci/./build=pbuilder,distribution=quantal,flavor=amd64/34/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-qt-ci/34//rebuild/?

review: Approve (continuous-integration)

[lp:~cyphermox/autopilot-qt/inline]

32. By Michael Zanetti on 2012-12-18

remove some debug prints.

Approved by Juhapekka Piiroinen, PS Jenkins bot.

33. By Michael Zanetti on 2013-01-09

improve debug output a little.

Approved by PS Jenkins bot.

34. By Michael Zanetti on 2013-01-15

autopilot-qt is now a single package with drivers that load correctly for each supported Qt version.

Approved by Juhapekka Piiroinen, Omer Akram.

35. By Michael Zanetti on 2013-01-31

update for Qt5 final.

Approved by Olivier Tilloy, PS Jenkins bot.

36. By Michael Zanetti on 2013-02-27

fix dependency to libxpathselect.

Approved by Chris Gagnon, PS Jenkins bot.

37. By Michael Zanetti on 2013-03-01

revert precise dependency fix. Use autopilot-qt or autopilot-qt5 for precise.

Approved by PS Jenkins bot.

38. By Thomi Richards on 2013-03-05

remove white spaces in root node name. xpathselect does not support that any more. Fixes: https://bugs.launchpad.net/bugs/1144448.

Approved by PS Jenkins bot, Michael Zanetti.

39. By Michael Zanetti on 2013-03-06

update runtime dep to xpathselect to 1.2 .

Approved by PS Jenkins bot, Olivier Tilloy.

40. By Mathieu Trudel-Lapierre on 2013-03-14

* debian/control:
  - Wrap, sort and add trailing commas to (Build-)Depends lists.
  - Bump Build-Depends on debhelper to 9.
  - Add Vcs-Bzr, Vcs-Browser and a notice to uploaders.
  - Drop Build-Depends on libindicate-qt.
* debian/copyright: license everything under GPL3.
* debian/compat: bump to compat level 9.
* debian/rules:
  - Don't make DH be verbose.
  - Clean up extra comments.
  - Simplify the dh_install process.
* debian/libautopilot-qt.install: move file copies into the install file
  where they should be (from debian/rules).

[Didier Roche-Tolomelli (didrocks)]

83 +License: GPL-3
84 +
85 +Files: debian/*
86 +Copyright: 2012 Canonical Ltd.
87 +License: GPL-3

-> do you mind just making that one stenza please? No need to separate the debian/ folder

The other changes looks good to me. Feel free to approve the global change once your sbuild is happy ;)

review: Approve

[lp:~cyphermox/autopilot-qt/inline]

41. By Mathieu Trudel-Lapierre on 2013-03-14

Unsplit the copyright stanzas. No reason to have debian/ separate if it's covered by the same license.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:40
http://jenkins.qa.ubuntu.com/job/autopilot-qt-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-raring-amd64-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-raring-armhf-ci/1/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/autopilot-qt-ci/1/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/autopilot-qt-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-raring-amd64-ci/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-raring-armhf-ci/2/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/autopilot-qt-ci/2/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

review: Approve

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2013-03-14 17:09:22 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-01 09:07:48 +0000
+++ debian/changelog	2013-03-14 17:09:22 +0000
@@ -1,3 +1,21 @@
+libautopilot-qt (0.6-0ubuntu1) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Wrap, sort and add trailing commas to (Build-)Depends lists.
+    - Bump Build-Depends on debhelper to 9.
+    - Add Vcs-Bzr, Vcs-Browser and a notice to uploaders.
+    - Drop Build-Depends on libindicate-qt.
+  * debian/copyright: license everything under GPL3.
+  * debian/compat: bump to compat level 9.
+  * debian/rules:
+    - Don't make DH be verbose.
+    - Clean up extra comments.
+    - Simplify the dh_install process.
+  * debian/libautopilot-qt.install: move file copies into the install file
+    where they should be (from debian/rules).
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 27 Nov 2012 18:04:58 -0500
+
 libautopilot-qt (0.6) quantal; urgency=low
 
   * revert to previous version. For Precise, use autopilot-qt4 or autopilot-qt5

=== modified file 'debian/compat'
--- debian/compat	2012-10-09 16:21:50 +0000
+++ debian/compat	2013-03-14 17:09:22 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2013-03-06 12:56:19 +0000
+++ debian/control	2013-03-14 17:09:22 +0000
@@ -1,8 +1,8 @@
 Source: libautopilot-qt
 Priority: extra
-Maintainer: Michael Zanetti <[e-mail]>
-Build-Depends: debhelper (>= 8.0.0),
-               libindicate-qt-dev,
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Michael Zanetti <[e-mail]>
+Build-Depends: debhelper (>= 9),
                pkg-config,
                qtchooser,
                qt4-qmake,
@@ -13,10 +13,15 @@
                libxpathselect-dev,
                mesa-common-dev,
                libgl1-mesa-dev,
-               libgles2-mesa-dev
+               libgles2-mesa-dev,
 Standards-Version: 3.9.3
 Section: libs
 Homepage: https://launchpad.net/autopilot-qt
+# If you aren't a member of ~autopilot but need to upload
+# packaging changes, just go ahead. ~autopilot will notice
+# and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~autopilot/autopilot-qt/trunk
+Vcs-Browser: https://bazaar.launchpad.net/~autopilot/autopilot-qt/trunk/files
 
 Package: libautopilot-qt
 Section: libs

=== modified file 'debian/copyright'
--- debian/copyright	2013-01-14 10:52:56 +0000
+++ debian/copyright	2013-03-14 17:09:22 +0000
@@ -4,7 +4,7 @@
 
 Files: *
 Copyright: 2012 Canonical Ltd.
-License: 
+License: GPL-3
  This program is free software: you can redistribute it and/or modify it
  under the terms of the the GNU General Public License version 3, as
  published by the Free Software Foundation.
@@ -20,23 +20,3 @@
  .
  On Debian systems, the complete text of the GNU General
  Public License v3 can be found in `/usr/share/common-licenses/GPL-3'.
-
-Files: debian/*
-Copyright: 2012 Canonical Ltd.
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-

=== modified file 'debian/libautopilot-qt.install'
--- debian/libautopilot-qt.install	2013-01-14 10:52:56 +0000
+++ debian/libautopilot-qt.install	2013-03-14 17:09:22 +0000
@@ -1,1 +1,2 @@
-usr/lib/lib*.so.*
+qt4/lib*.so* usr/lib
+qt5/lib*.so* usr/lib

=== modified file 'debian/rules'
--- debian/rules	2013-01-17 20:20:44 +0000
+++ debian/rules	2013-03-14 17:09:22 +0000
@@ -1,13 +1,6 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
 	dh $@
@@ -28,7 +21,4 @@
 	rm -rf qt5
 
 override_dh_install:
-	mkdir -p $(CURDIR)/debian/libautopilot-qt/usr/lib/
-	mkdir -p $(CURDIR)/debian/libautopilot-qt5/opt/qt5/lib/
-	cp -pP qt4/*.so* $(CURDIR)/debian/libautopilot-qt/usr/lib/
-	cp -pP qt5/*.so* $(CURDIR)/debian/libautopilot-qt/usr/lib/
+	dh_install --fail-missing