launchpad-reviewers team mailing list archive

[Julian Edwards <julian.edwards@xxxxxxxxxxxxx>]

Julian Edwards has proposed merging lp:~julian-edwards/maas/packaging.render-man into lp:~maas-maintainers/maas/packaging.

Commit message:
Fix get-orig-source which was picking up the 1.2 branch, and pick up man pages from in the tree again.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~julian-edwards/maas/packaging.render-man/+merge/135802

Landing https://code.launchpad.net/~allenap/maas/packaging.render-man/+merge/135798 which had trunk conflicts.
-- 
https://code.launchpad.net/~julian-edwards/maas/packaging.render-man/+merge/135802
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~julian-edwards/maas/packaging.render-man into lp:~maas-maintainers/maas/packaging.

=== 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-23 00:10:28 +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-23 00:10:28 +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