Merge lp:~andreserl/maas/packaging_crochet into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 231
Merged at revision: 231
Proposed branch: lp:~andreserl/maas/packaging_crochet
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 25 lines (+4/-0)
2 files modified
debian/changelog (+3/-0)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_crochet
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+204987@code.launchpad.net

Commit message

debian/control: Add depends on python-crochet.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve
Revision history for this message
Gavin Panella (allenap) wrote :

Thanks Andres!

BTW, the upstream maintainer of Crochet has said he'd be happy to accept merge proposals for a debian/ directory. Is that a good way of managing this, or should we stick with a separate packaging branch?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-01-31 14:41:18 +0000
+++ debian/changelog 2014-02-05 15:56:12 +0000
@@ -4,6 +4,9 @@
4 * debian/maas-region-controller-min.postinst: Fix typo in sed. Remove4 * debian/maas-region-controller-min.postinst: Fix typo in sed. Remove
5 double quotes. (LP: #1274448)5 double quotes. (LP: #1274448)
66
7 [ Andres Rodriguez ]
8 * debian/control: Add depends on python-crochet.
9
7 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 31 Jan 2014 09:38:51 -050010 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 31 Jan 2014 09:38:51 -0500
811
9maas (1.4+bzr1853+dfsg-0ubuntu1) trusty; urgency=low12maas (1.4+bzr1853+dfsg-0ubuntu1) trusty; urgency=low
1013
=== modified file 'debian/control'
--- debian/control 2014-01-18 16:34:41 +0000
+++ debian/control 2014-02-05 15:56:12 +0000
@@ -234,6 +234,7 @@
234Depends: python-amqp,234Depends: python-amqp,
235 python-celery,235 python-celery,
236 python-convoy,236 python-convoy,
237 python-crochet,
237 python-curtin,238 python-curtin,
238 python-lockfile,239 python-lockfile,
239 python-lxml,240 python-lxml,

Subscribers

People subscribed via source and target branches

to all changes: