MAAS

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

  1. packaging_bzr911
  2. Merge into packaging
Proposed by Andres Rodriguez on 2012-08-22
Status: Merged
Approved by: Andres Rodriguez on 2012-08-22
Approved revision: 63
Merged at revision: 62
Proposed branch: lp:~andreserl/maas/packaging_bzr911
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 27 lines (+1/-4)
2 files modified
debian/changelog (+1/-3)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_bzr911
Reviewer Review Type Date Requested Status
Gavin Panella (community) 2012-08-22 Approve on 2012-08-22
Review via email: mp+120865@code.launchpad.net

Commit Message

Drop 99-dnssec-keygen-path.patch
Update to bzr911

To post a comment you must log in.
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-08-21 19:33:41 +0000
3+++ debian/changelog 2012-08-22 20:32:21 +0000
4@@ -1,4 +1,4 @@
5-maas (0.1+bzr908+dfsg-0ubuntu1) UNRELEASED; urgency=low
6+maas (0.1+bzr911+dfsg-0ubuntu1) UNRELEASED; urgency=low
7
8 * New upstream release
9 * debian/maas.postinst:
10@@ -12,8 +12,6 @@
11 - debian/control: Drop Depends on maas-provision. Depends on bind9utils.
12 - debian/patches:
13 + 02-pserv-config.patch: Updated. Do not patch cobbler related bits.
14- + 99-dnssec-keygen-path.patch: Added to add full path of dnssec-keygen
15- or otherwise it will fail to run.
16
17 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 02 Aug 2012 09:01:43 -0400
18
19
20=== modified file 'debian/patches/series'
21--- debian/patches/series 2012-08-21 19:33:41 +0000
22+++ debian/patches/series 2012-08-22 20:32:21 +0000
23@@ -1,4 +1,3 @@
24 01-fix-database-settings.patch
25 02-pserv-config.patch
26 03-txlongpoll-config.patch
27-99-dnssec-keygen-path.patch

Subscribers

People subscribed via source and target branches

to all changes: