MAAS

Merge lp:~allenap/maas/packaging.render-man into lp:~maas-maintainers/maas/packaging

  1. packaging.render-man
  2. Merge into packaging
Proposed by Gavin Panella
Status: Merged
Merged at revision: 151
Proposed branch: lp:~allenap/maas/packaging.render-man
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 44 lines (+3/-5)
3 files modified
debian/changelog (+1/-3)
debian/maas-cluster-controller.install (+1/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~allenap/maas/packaging.render-man
Reviewer Review Type Date Requested Status
Julian Edwards (community) Needs Fixing
Review via email: mp+135798@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

9 + * debian/maas-cluster-controller.install: Get man pages from man, not
10 + docs/man.

You don't need this bit - you're just reversing my cockup on the last revno I added, so please delete the changelog entry under my name instead.

Thanks!

review: Approve
lp:~allenap/maas/packaging.render-man updated
153. By Gavin Panella

Julian's change and Gavin's change meet like matter and antimatter.

154. By Gavin Panella

Bump version to trunk tip.

Revision history for this message
Julian Edwards (julian-edwards) wrote :

Woops, "make man" downloads internet dependencies for Sphinx et al :(

review: Needs Fixing
lp:~allenap/maas/packaging.render-man updated
155. By Gavin Panella

Don't generate man pages; rely on them being already in the source tree.

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-11-22 10:49:56 +0000
3+++ debian/changelog 2012-11-22 23:46:19 +0000
4@@ -1,4 +1,4 @@
5-maas (0.1+bzr1358+dfsg-0ubuntu2) UNRELEASED; urgency=low
6+maas (0.1+bzr1366+dfsg-0ubuntu2) UNRELEASED; urgency=low
7
8 [ Raphaël Badin ]
9 * debian/extras/99-maas-sudoers: Add 'SETENV:' to sudo rule
10@@ -15,8 +15,6 @@
11 * debian/maas-region-controller.install: Remove installation of maas-gc; it
12 is no longer required as upstream no longer stores files in the filesystem.
13 (LP: #1069734)
14- * debian/maas-cluster-controller.install: maas-import-pxe-files.8 now lives
15- in docs/man in upstream source.
16
17 [ Jeroen Vermeulen ]
18 * debian/maas-cluster-controller.install: Install import scripts.
19
20=== modified file 'debian/maas-cluster-controller.install'
21--- debian/maas-cluster-controller.install 2012-11-22 10:49:56 +0000
22+++ debian/maas-cluster-controller.install 2012-11-22 23:46:19 +0000
23@@ -15,7 +15,7 @@
24
25 # Install maas-import-pxe-files and related files
26 debian/tmp/usr/sbin/maas-import-pxe-files
27-docs/man/maas-import-pxe-files.8 usr/share/man/man8
28+man/maas-import-pxe-files.8 usr/share/man/man8
29 debian/tmp/etc/maas/import_pxe_files
30 debian/tmp/usr/sbin/maas-import-ephemerals
31 debian/tmp/etc/maas/import_ephemerals
32
33=== modified file 'debian/rules'
34--- debian/rules 2012-10-17 16:56:50 +0000
35+++ debian/rules 2012-11-22 23:46:19 +0000
36@@ -53,7 +53,7 @@
37 | sed -rne 's,^Version: ([^-]+).*,\1,p')
38 get-orig-source:
39 bzr export -r $(REV) --root=maas-$(VER).orig \
40- maas_$(VER).orig.tar.gz lp:maas/1.2
41+ maas_$(VER).orig.tar.gz lp:maas
42 rm -rf maas-$(VER)
43 tar -xf maas_$(VER).orig.tar.gz
44 rm maas_$(VER).orig.tar.gz

Subscribers

People subscribed via source and target branches