MAAS

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

  1. packaging.render-man
  2. Merge into packaging
Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: 156
Merged at revision: 151
Proposed branch: lp:~julian-edwards/maas/packaging.render-man
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 25 lines (+2/-2)
2 files modified
debian/maas-cluster-controller.install (+1/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~julian-edwards/maas/packaging.render-man
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+135802@code.launchpad.net

Commit message

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

Description of the change

Landing https://code.launchpad.net/~allenap/maas/packaging.render-man/+merge/135798 which had trunk conflicts.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/maas-cluster-controller.install'
2--- debian/maas-cluster-controller.install 2012-11-22 10:49:56 +0000
3+++ debian/maas-cluster-controller.install 2012-11-23 00:10:28 +0000
4@@ -15,7 +15,7 @@
5
6 # Install maas-import-pxe-files and related files
7 debian/tmp/usr/sbin/maas-import-pxe-files
8-docs/man/maas-import-pxe-files.8 usr/share/man/man8
9+man/maas-import-pxe-files.8 usr/share/man/man8
10 debian/tmp/etc/maas/import_pxe_files
11 debian/tmp/usr/sbin/maas-import-ephemerals
12 debian/tmp/etc/maas/import_ephemerals
13
14=== modified file 'debian/rules'
15--- debian/rules 2012-10-17 16:56:50 +0000
16+++ debian/rules 2012-11-23 00:10:28 +0000
17@@ -53,7 +53,7 @@
18 | sed -rne 's,^Version: ([^-]+).*,\1,p')
19 get-orig-source:
20 bzr export -r $(REV) --root=maas-$(VER).orig \
21- maas_$(VER).orig.tar.gz lp:maas/1.2
22+ maas_$(VER).orig.tar.gz lp:maas
23 rm -rf maas-$(VER)
24 tar -xf maas_$(VER).orig.tar.gz
25 rm maas_$(VER).orig.tar.gz

Subscribers

People subscribed via source and target branches