launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/maas/packaging.render-man into lp:~maas-maintainers/maas/packaging.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1081957 in MAAS: "Not generating man pages during build"
  https://bugs.launchpad.net/maas/+bug/1081957

For more details, see:
https://code.launchpad.net/~allenap/maas/packaging.render-man/+merge/135798
-- 
https://code.launchpad.net/~allenap/maas/packaging.render-man/+merge/135798
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/maas/packaging.render-man into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-22 10:49:56 +0000
+++ debian/changelog	2012-11-22 23:18:20 +0000
@@ -34,6 +34,9 @@
     configuration file are no longer part of upstream.
   * debian/maas-cluster-controller.install: The maas-import-pxe-files cron
     task is no longer used.
+  * debian/rules: Generate man pages during build.
+  * debian/maas-cluster-controller.install: Get man pages from man, not
+    docs/man.
 
   [ Andres Rodriguez ]
   * debian/control:

=== 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:18:20 +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:18:20 +0000
@@ -23,6 +23,8 @@
 		$(CURDIR)/src/maasserver/utils/jsenums.py	\
 		$(py_enums) > $(BUILDHOME)/enums.js
 
+	$(MAKE) man
+
 override_dh_auto_install:
 	dh_auto_install
 
@@ -53,7 +55,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