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

[Gavin Panella]

[Julian Edwards (julian-edwards)]

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]

153. By Gavin Panella on 2012-11-22

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

154. By Gavin Panella on 2012-11-22

Bump version to trunk tip.

[Julian Edwards (julian-edwards)]

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

review: Needs Fixing

[lp:~allenap/maas/packaging.render-man]

155. By Gavin Panella on 2012-11-22

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-22 10:49:56 +0000
+++ debian/changelog	2012-11-22 23:46:19 +0000
@@ -1,4 +1,4 @@
-maas (0.1+bzr1358+dfsg-0ubuntu2) UNRELEASED; urgency=low
+maas (0.1+bzr1366+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
   [ Raphaël Badin ]
   * debian/extras/99-maas-sudoers: Add 'SETENV:' to sudo rule
@@ -15,8 +15,6 @@
   * debian/maas-region-controller.install: Remove installation of maas-gc; it
     is no longer required as upstream no longer stores files in the filesystem.
     (LP: #1069734)
-  * debian/maas-cluster-controller.install: maas-import-pxe-files.8 now lives
-    in docs/man in upstream source.
 
   [ Jeroen Vermeulen ]
   * debian/maas-cluster-controller.install: Install import scripts.

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2012-11-22 10:49:56 +0000
+++ debian/maas-cluster-controller.install	2012-11-22 23:46:19 +0000
@@ -15,7 +15,7 @@
 
 # Install maas-import-pxe-files and related files
 debian/tmp/usr/sbin/maas-import-pxe-files
-docs/man/maas-import-pxe-files.8 usr/share/man/man8
+man/maas-import-pxe-files.8 usr/share/man/man8
 debian/tmp/etc/maas/import_pxe_files
 debian/tmp/usr/sbin/maas-import-ephemerals
 debian/tmp/etc/maas/import_ephemerals

=== modified file 'debian/rules'
--- debian/rules	2012-10-17 16:56:50 +0000
+++ debian/rules	2012-11-22 23:46:19 +0000
@@ -53,7 +53,7 @@
               | sed -rne 's,^Version: ([^-]+).*,\1,p')
 get-orig-source:
 	bzr export -r $(REV) --root=maas-$(VER).orig \
-             maas_$(VER).orig.tar.gz lp:maas/1.2
+             maas_$(VER).orig.tar.gz lp:maas
 	rm -rf maas-$(VER)
 	tar -xf maas_$(VER).orig.tar.gz
 	rm maas_$(VER).orig.tar.gz