Merge lp:~javier.collado/utah/bug1050262 into lp:utah

Proposed by Javier Collado
Status: Merged
Merged at revision: 672
Proposed branch: lp:~javier.collado/utah/bug1050262
Merge into: lp:utah
Diff against target: 34 lines (+6/-5)
1 file modified
debian/control (+6/-5)
To merge this branch: bzr merge lp:~javier.collado/utah/bug1050262
Reviewer Review Type Date Requested Status
Max Brustkern (community) Approve
Review via email: mp+124155@code.launchpad.net

Description of the change

This branch adds a version number to python-jsonschema dependency to avoid installing 0.2 from quantal/main instead of 0.5 from ppa:utah/stable

Also it does a little bit of refactoring:
- Remove redundant dependencies, that is, duplicated dependencies in utah not needed because they are already in utah-client.
- Reorder dependencies to follow alphabetical order (in my opinion, improves debian/control maintenance)

To post a comment you must log in.
Revision history for this message
Max Brustkern (nuclearbob) wrote :

This will definitely make dependency maintenance easier.

review: Approve

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 2012-08-14 16:55:16 +0000
3+++ debian/control 2012-09-13 10:56:50 +0000
4@@ -3,7 +3,7 @@
5 X-Python-Version: >= 2.5
6 Priority: optional
7 Maintainer: Max Brustkern <max@canonical.com>
8-Build-Depends: debhelper (>= 7.0.50~), python-all, devscripts
9+Build-Depends: debhelper (>= 7.0.50~), devscripts, python-all
10 Standards-Version: 3.9.3
11 Homepage: https://code.launchpad.net/utah
12 Vcs-Bzr: https://code.launchpad.net/utah
13@@ -11,9 +11,9 @@
14 Package: utah
15 Architecture: all
16 Depends: ${misc:Depends}, ${python:Depends},
17- bzr, bsdtar, git, libvirt-bin, lzma,
18- python-apt, python-libvirt, python-jsonschema,
19- python-netifaces, python-paramiko, python-psutil, python-yaml,
20+ bsdtar, libvirt-bin, lzma,
21+ python-apt, python-libvirt,
22+ python-netifaces, python-paramiko, python-psutil,
23 utah-client (=${binary:Version})
24 Recommends: kvm, vm-tools
25 Description: Ubuntu Test Automation Harness
26@@ -21,6 +21,7 @@
27
28 Package: utah-client
29 Architecture: all
30-Depends: ${misc:Depends}, ${python:Depends}, python-jsonschema, python-yaml, bzr, git
31+Depends: ${misc:Depends}, ${python:Depends},
32+ bzr, git, python-jsonschema (>= 0.5~), python-yaml
33 Description: Ubuntu Test Automation Harness Client
34 Automation framework for testing in Ubuntu, client portion

Subscribers

People subscribed via source and target branches