Merge lp:~robru/autopilot-qt/packaging into lp:autopilot-qt

[Robert Bruce Park]

Minor packaging fixes for daily release.

[Robert Bruce Park (robru)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

Hi,

What was the actual change here? The only thing I can see is the change of Architecture to be 'any'. Can you please explain why this was needed? I'd like to know what's happening in the package I'm currently working in, so I don't accidentally break it again in the future.

Cheers,

review: Needs Information

[Robert Bruce Park (robru)]

Sorry, this change was really minor so I didn't think anybody would care. The only notable change here is that I added '${shlibs:Depends}' to the Depends: line for the binary package. This change was requested by mterry as part of a MIR[0].

After that, I ran `wrap-and-sort -a -t` which just sorted all the various lists of deps for easier readability in the future, but that's essentially just a whitespace fixup... lots of noise in the diff, no technical change happening.

Also as you noticed, I changed the arch to 'any', which is something we've come to prefer since the last time the packaging for this project was looked at.

[0] https://bugs.launchpad.net/ubuntu/+source/unity-webapps-qml/+bug/1206268

=== modified file 'debian/control'
--- debian/control	2013-05-03 14:17:19 +0000
+++ debian/control	2013-08-13 22:40:48 +0000
@@ -3,17 +3,17 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Michael Zanetti <[e-mail]>
 Build-Depends: debhelper (>= 9),
+               libgl1-mesa-dev,
+               libgles2-mesa-dev,
+               libqt4-dev,
+               libxpathselect-dev (>= 1.3),
+               mesa-common-dev,
                pkg-config,
-               qtchooser,
                qt4-qmake,
                qt5-qmake,
-               libqt4-dev,
                qtbase5-dev,
+               qtchooser,
                qtdeclarative5-dev,
-               libxpathselect-dev (>= 1.3),
-               mesa-common-dev,
-               libgl1-mesa-dev,
-               libgles2-mesa-dev,
                xvfb,
 Standards-Version: 3.9.4
 Section: libs
@@ -26,25 +26,29 @@
 
 Package: libautopilot-qt
 Section: libs
-Architecture: amd64 armhf i386
-Depends: ${misc:Depends},
-         libxpathselect1.3,
-Replaces: autopilot-qt, autopilot-qt5
-Conflicts: autopilot-qt, autopilot-qt5
-Provides: autopilot-qt, autopilot-qt5
-Recommends: python-autopilot
+Architecture: any
+Depends: libxpathselect1.3,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Replaces: autopilot-qt,
+          autopilot-qt5,
+Conflicts: autopilot-qt,
+           autopilot-qt5,
+Provides: autopilot-qt,
+          autopilot-qt5,
+Recommends: python-autopilot,
 Description: This project makes Qt applications introspectable by autopilot.
  This allows autopilot to test any existing Qt4 or Qt5 application,
  without having to rebuild the application under test.
 
 Package: libautopilot-qt-autopilot
 Section: libs
-Architecture: amd64 armhf i386
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Architecture: any
+Depends: libautopilot-qt (>= ${source:Version}),
+         python-autopilot,
          python-support (>= 0.90),
-         libautopilot-qt (= ${source:Version}),
-         python-autopilot,
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: Autopilot tests for libautopilot-qt
  This contains sample Qt4 and Qt5 apps and autopilot tests
  to test libautopilot-qt.

=== modified file 'debian/libautopilot-qt-autopilot.install'
--- debian/libautopilot-qt-autopilot.install	2013-03-17 21:24:10 +0000
+++ debian/libautopilot-qt-autopilot.install	2013-08-13 22:40:48 +0000
@@ -1,3 +1,3 @@
+qt*/tests/autopilot/testapp/qt*testapp usr/share/libautopilot-qt/
 tests/autopilot/libautopilot_qt/* usr/lib/python2.7/dist-packages/libautopilot_qt/
 tests/autopilot/testapp/qt*.qml usr/share/libautopilot-qt/
-qt*/tests/autopilot/testapp/qt*testapp usr/share/libautopilot-qt/