juju-core

Merge lp://qastaging/~thumper/juju-core/package into lp://qastaging/~dave-cheney/juju-core/package

package
Merge into package

Proposed by Tim Penhey on 2013-04-04

Status:

Merged

Merged at revision:

Proposed branch:

lp://qastaging/~thumper/juju-core/package

Merge into:

lp://qastaging/~dave-cheney/juju-core/package

Diff against target:

94 lines (+17/-27)

5 files modified

debian/control (+5/-5)
debian/dirs (+1/-0)
debian/install (+1/-0)
debian/manpages (+1/-0)
debian/rules (+9/-22)

To merge this branch:

bzr merge lp://qastaging/~thumper/juju-core/package

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Dave Cheney		2013-04-04	Approve on 2013-04-05
Review via email: mp+157020@code.qastaging.launchpad.net

Description of the change

This change adds the man page to the packaging.

I got some help from wgrant and SteveK, and they made lots of funny noises about the current state of the rules.
I'm sure they'd be happy to help some more, but SteveK gave me the general outline for the change to rules.

This has been tested locally, and also tested with a recipe.

Revision history for this message

Dave Cheney (dave-cheney) wrote on 2013-04-05:

- mkdir -p $(PKGDIR)/usr/bin
85 - cp $(GOPATH)/bin/* $(PKGDIR)/usr/bin/

^ what happened to this part. How are binaries moved from $GOPATH/bin to /usr/bin ?

Revision history for this message

Tim Penhey (thumper) wrote on 2013-04-05:

Several other files were added to the debian directory.

It seems that the debian/install directory lists what needs to be installed by
default, and in this case it says:

bin/* usr/bin

So this then uses the debhelper framework to actually install the binaries.

In the same way that the debian/manpages new file lists the man pages to install.

Revision history for this message

Dave Cheney (dave-cheney) wrote on 2013-04-05:

I have no idea how to merge this without my lbox security blanket.

review: Approve

Revision history for this message

William Reade (fwereade) wrote on 2013-04-05:

> I have no idea how to merge this without my lbox security blanket.

You should be able to just `bzr merge lp:~thumper/juju-core/package` into your own branch and commit; when it's time for it to go into trunk the security blanket will be fine ;p. Or was it meant to go straight into trunk? Doesn't look like it...