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

Proposed by Robert Bruce Park on 2013-08-13
Status: Merged
Approved by: Robert Bruce Park on 2013-08-13
Approved revision: 70
Merged at revision: 69
Proposed branch: lp:~robru/autopilot-qt/packaging
Merge into: lp:autopilot-qt
Diff against target: 78 lines (+23/-19)
2 files modified
debian/control (+22/-18)
debian/libautopilot-qt-autopilot.install (+1/-1)
To merge this branch: bzr merge lp:~robru/autopilot-qt/packaging
Reviewer Review Type Date Requested Status
Thomi Richards (community) Needs Information on 2013-08-14
PS Jenkins bot continuous-integration Approve on 2013-08-13
Robert Bruce Park (community) Approve on 2013-08-13
Review via email: mp+180015@code.launchpad.net

Commit message

Minor packaging fixes for daily release.

To post a comment you must log in.
Robert Bruce Park (robru) :
review: Approve
review: Approve (continuous-integration)
Thomi Richards (thomir) wrote :

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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-05-03 14:17:19 +0000
3+++ debian/control 2013-08-13 22:40:48 +0000
4@@ -3,17 +3,17 @@
5 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
6 XSBC-Original-Maintainer: Michael Zanetti <michael.zanetti@canonical.com>
7 Build-Depends: debhelper (>= 9),
8+ libgl1-mesa-dev,
9+ libgles2-mesa-dev,
10+ libqt4-dev,
11+ libxpathselect-dev (>= 1.3),
12+ mesa-common-dev,
13 pkg-config,
14- qtchooser,
15 qt4-qmake,
16 qt5-qmake,
17- libqt4-dev,
18 qtbase5-dev,
19+ qtchooser,
20 qtdeclarative5-dev,
21- libxpathselect-dev (>= 1.3),
22- mesa-common-dev,
23- libgl1-mesa-dev,
24- libgles2-mesa-dev,
25 xvfb,
26 Standards-Version: 3.9.4
27 Section: libs
28@@ -26,25 +26,29 @@
29
30 Package: libautopilot-qt
31 Section: libs
32-Architecture: amd64 armhf i386
33-Depends: ${misc:Depends},
34- libxpathselect1.3,
35-Replaces: autopilot-qt, autopilot-qt5
36-Conflicts: autopilot-qt, autopilot-qt5
37-Provides: autopilot-qt, autopilot-qt5
38-Recommends: python-autopilot
39+Architecture: any
40+Depends: libxpathselect1.3,
41+ ${misc:Depends},
42+ ${shlibs:Depends},
43+Replaces: autopilot-qt,
44+ autopilot-qt5,
45+Conflicts: autopilot-qt,
46+ autopilot-qt5,
47+Provides: autopilot-qt,
48+ autopilot-qt5,
49+Recommends: python-autopilot,
50 Description: This project makes Qt applications introspectable by autopilot.
51 This allows autopilot to test any existing Qt4 or Qt5 application,
52 without having to rebuild the application under test.
53
54 Package: libautopilot-qt-autopilot
55 Section: libs
56-Architecture: amd64 armhf i386
57-Depends: ${shlibs:Depends},
58- ${misc:Depends},
59+Architecture: any
60+Depends: libautopilot-qt (>= ${source:Version}),
61+ python-autopilot,
62 python-support (>= 0.90),
63- libautopilot-qt (= ${source:Version}),
64- python-autopilot,
65+ ${misc:Depends},
66+ ${shlibs:Depends},
67 Description: Autopilot tests for libautopilot-qt
68 This contains sample Qt4 and Qt5 apps and autopilot tests
69 to test libautopilot-qt.
70
71=== modified file 'debian/libautopilot-qt-autopilot.install'
72--- debian/libautopilot-qt-autopilot.install 2013-03-17 21:24:10 +0000
73+++ debian/libautopilot-qt-autopilot.install 2013-08-13 22:40:48 +0000
74@@ -1,3 +1,3 @@
75+qt*/tests/autopilot/testapp/qt*testapp usr/share/libautopilot-qt/
76 tests/autopilot/libautopilot_qt/* usr/lib/python2.7/dist-packages/libautopilot_qt/
77 tests/autopilot/testapp/qt*.qml usr/share/libautopilot-qt/
78-qt*/tests/autopilot/testapp/qt*testapp usr/share/libautopilot-qt/

Subscribers

People subscribed via source and target branches