Merge lp://staging/~andreserl/maas/maas_test_packaging into lp://staging/~maas-maintainers/maas-test/packaging

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 4
Merged at revision: 2
Proposed branch: lp://staging/~andreserl/maas/maas_test_packaging
Merge into: lp://staging/~maas-maintainers/maas-test/packaging
Diff against target: 75 lines (+11/-11)
5 files modified
debian/changelog (+2/-3)
debian/control (+6/-5)
debian/maas-test.install (+0/-1)
debian/rules (+2/-2)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp://staging/~andreserl/maas/maas_test_packaging
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Raphaël Badin (community) Approve
Review via email: mp+196590@code.staging.launchpad.net

Commit message

debian/changelog: Fix versioning to drop 'dsfg'.
debian/control:
 - Drop Depends on dh-apport.
 - Fix Description.
 - Build-Depend on python-six
 - Update maintainer.
debian/rules: Drop use of apport, fix packaging source.
debian/source/format: Add, 3.0 (quilt).
debian/maas-test.install: Drop.

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

45 -man/maas-test.8 usr/share/man/man8
46 +#man/maas-test.8 usr/share/man/man8
47
48 === modified file 'debian/maas-test.manpages'
49 --- debian/maas-test.manpages 2013-11-25 13:55:01 +0000
50 +++ debian/maas-test.manpages 2013-11-25 16:35:13 +0000
51 @@ -1,1 +1,1 @@
52 -man/maas-test.8
53 +#man/maas-test.8

You can put them back, I've committed the generated man page in revision 58.

6 +maas-test (0.1+bzr50-0ubuntu1) UNRELEASED; urgency=low

You need to bump that to revision 58 to get the manpage.

review: Approve
4. By Andres Rodriguez

Install existant manpage, remove debian/maas-test.install

Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches