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

[Tim Penhey]

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.

[Dave Cheney (dave-cheney)]

 - 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 ?

[Tim Penhey (thumper)]

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.

[Dave Cheney (dave-cheney)]

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

review: Approve

[William Reade (fwereade)]

> 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...

=== modified file 'debian/control'
--- debian/control	2012-10-31 13:16:54 +0000
+++ debian/control	2013-04-04 08:04:21 +0000
@@ -2,7 +2,7 @@
 Section: devel
 Priority: extra
 Maintainer: David Cheney <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~), golang-go
+Build-Depends: debhelper (>= 7.0.50~), golang-go, python
 Standards-Version: 3.9.1
 Homepage: http://launchpad.net/juju-core
 
@@ -10,8 +10,8 @@
 Architecture: amd64
 Depends: ${misc:Depends}
 Description: Juju is devops distilled
- Through the use of charms, juju provides you with shareable, re-usable, 
- and repeatable expressions of devops best practices. You can use them 
- unmodified, or easily change and connect them to fit your needs. Deploying 
- a charm is similar to installing a package on Ubuntu: ask for it and 
+ Through the use of charms, juju provides you with shareable, re-usable,
+ and repeatable expressions of devops best practices. You can use them
+ unmodified, or easily change and connect them to fit your needs. Deploying
+ a charm is similar to installing a package on Ubuntu: ask for it and
  it’s there, remove it and it’s completely gone.

=== added file 'debian/dirs'
--- debian/dirs	1970-01-01 00:00:00 +0000
+++ debian/dirs	2013-04-04 08:04:21 +0000
@@ -0,0 +1,1 @@
+usr/bin

=== removed file 'debian/docs'
=== added file 'debian/install'
--- debian/install	1970-01-01 00:00:00 +0000
+++ debian/install	2013-04-04 08:04:21 +0000
@@ -0,0 +1,1 @@
+bin/* usr/bin

=== added file 'debian/manpages'
--- debian/manpages	1970-01-01 00:00:00 +0000
+++ debian/manpages	2013-04-04 08:04:21 +0000
@@ -0,0 +1,1 @@
+juju.1

=== modified file 'debian/rules'
--- debian/rules	2013-02-20 23:03:00 +0000
+++ debian/rules	2013-04-04 08:04:21 +0000
@@ -4,9 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export GOPATH=$(CURDIR)
-
-PKGDIR=debian/juju-core
+export GOPATH:=$(CURDIR)
+export PATH:=$(GOPATH)/bin:$(PATH)
 
 VERSION:=$(shell sed -n 's/^const version = "\(.*\)"/\1/p' $(GOPATH)/src/launchpad.net/juju-core/version/version.go)
 ifeq ($(VERSION),)
@@ -14,26 +13,14 @@
 endif
 
 %:
-	dh $@ 
+	dh $@
+
+override_dh_auto_install-arch:
+	dh_auto_install
+	go install -v launchpad.net/juju-core/cmd/juju
+	go install -v launchpad.net/juju-core/cmd/jujud
+	$(GOPATH)/src/launchpad.net/juju-core/scripts/generate-docs.py man -o juju.1
 
 clean:
 	sed -i 's/00000000/$(VERSION)/' debian/changelog
 	dh_clean
-	rm -rf $(GOPATH)/bin/* $(GOPATH)/pkg/*
-
-binary-arch: clean
-	dh_prep
-	dh_installdirs
-	go install -v launchpad.net/juju-core/cmd/juju
-	go install -v launchpad.net/juju-core/cmd/jujud
-	mkdir -p $(PKGDIR)/usr/bin
-	cp $(GOPATH)/bin/* $(PKGDIR)/usr/bin/
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch