Merge lp:~james-page/ubuntu/wily/juju-core/mir-fixes into lp:ubuntu/wily/juju-core

[James Page]

Updates to support MIR of juju-core in Ubuntu Wily development.

[lp:~james-page/ubuntu/wily/juju-core/mir-fixes]

53. By James Page on 2015-10-16

Comment about use of shared -dev packages

[Robie Basak (racb)]

Is there something here that ensures that the package build fails if upstream add embedded dependencies in the future that miss getting added to Build-Depends?

[lp:~james-page/ubuntu/wily/juju-core/mir-fixes]

54. By James Page on 2015-10-17

Drop goyaml for now until juju transitions to yaml.v2

55. By James Page on 2015-10-19

* Updates to support MIR in Ubuntu:
  - d/control: Add BD's on go.crypto, go.net, juju-loggo,
    github-bmizerany-pat and go-dbus -dev packages.
  - d/rules: Tweak GOPATH configuration and link in any shared go
    dependencies from /usr/share/gocode to ensure that distribution
    -dev packages are preferred over embedded copies in juju source.
  - d/control,rules: Add BD on dh-golang, enable Built-Using field to
    ensure -dev dependencies can be tracked effectively.

56. By James Page on 2015-10-19

Go for it

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-22 15:27:01 +0000
+++ debian/changelog	2015-10-19 21:44:19 +0000
@@ -1,3 +1,16 @@
+juju-core (1.24.6-0ubuntu2) wily; urgency=medium
+
+  * Updates to support MIR in Ubuntu:
+    - d/control: Add BD's on go.crypto, go.net, juju-loggo,
+      github-bmizerany-pat and go-dbus golang-*-dev packages.
+    - d/rules: Tweak GOPATH configuration and link in any shared go
+      dependencies from /usr/share/gocode to ensure that distribution
+      -dev packages are preferred over embedded copies in juju source.
+    - d/control,rules: Add BD on dh-golang, enable Built-Using field to
+      ensure -dev dependencies can be tracked effectively.
+
+ -- James Page <[e-mail]>  Mon, 19 Oct 2015 22:43:27 +0100
+
 juju-core (1.24.6-0ubuntu1) wily; urgency=medium
 
   * New upstream release (LP: #1481556).
 
=== modified file 'debian/control'
--- debian/control	2015-09-22 15:27:01 +0000
+++ debian/control	2015-10-19 21:44:19 +0000
@@ -3,9 +3,15 @@
 Priority: extra
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~),
+               dh-golang,
                distro-info,
                gccgo-5 [!amd64 !i386 !armhf] | gccgo-go [!amd64 !i386 !armhf],
+               golang-github-bmizerany-pat-dev,
                golang-go (>= 2:1.2) [amd64 i386 armhf],
+               golang-go-dbus-dev,
+               golang-go.crypto-dev,
+               golang-go.net-dev,
+               golang-juju-loggo-dev,
                lsb-release,
                python
 Standards-Version: 3.9.6
@@ -17,6 +23,7 @@
 Depends: distro-info, ${misc:Depends}, ${shlibs:Depends}
 Recommends: bash-completion
 Conflicts: juju (<< 0.7-0ubuntu1~)
+Built-Using: ${misc:Built-Using}
 Description: Juju is devops distilled - client
  Through the use of charms, juju provides you with shareable, re-usable,
  and repeatable expressions of devops best practices. You can use them
 
=== modified file 'debian/rules'
--- debian/rules	2014-08-20 15:00:12 +0000
+++ debian/rules	2015-10-19 21:44:19 +0000
@@ -3,11 +3,14 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-export GOPATH:=$(CURDIR)
-export PATH:=$(GOPATH)/bin:$(PATH)
+# NOTE: debian/gocode/src will contain symlinks to system provided
+#       dev packages, which will be used over those in the upstream
+#       juju-core codebase.
+export GOPATH:=$(CURDIR)/debian/gocode:$(CURDIR)
+export PATH:=$(CURDIR)/bin:$(PATH)
 
 PKGDIR:=debian/juju-core
-VERSION:=$(shell sed -n 's/^const version = "\(.*\)"/\1/p' $(GOPATH)/src/github.com/juju/juju/version/version.go)
+VERSION:=$(shell sed -n 's/^const version = "\(.*\)"/\1/p' $(CURDIR)/src/github.com/juju/juju/version/version.go)
 ifeq ($(VERSION),)
 $(error Invalid version constant in version.go)
 endif
@@ -19,7 +22,7 @@
 endif
 
 %:
-	dh $@
+	dh $@ --with=golang
 
 debian/juju-core.postinst: debian/juju-core.postinst.in
 	sed -e "s/__NEW_VERSION__/$(VERSION)/g" $< > $@
@@ -39,13 +42,19 @@
 JUJUD_FLAGS:= -gccgoflags -static-libgo
 endif
 
+# NOTE: ensure /usr/share/gocode is use in preference to any
+#       embedded source for dependencies.
+override_dh_auto_configure:
+	mkdir -p debian/gocode/src
+	ln -s /usr/share/gocode/src/* debian/gocode/src
+
 override_dh_auto_install: debian/juju-core.postinst debian/juju-core.prerm debian/juju-core.lintian-overrides
 	go install $(COMMON_FLAGS) github.com/juju/juju/cmd/juju
 	go install $(COMMON_FLAGS) github.com/juju/juju/cmd/plugins/juju-metadata
 	go install $(COMMON_FLAGS) github.com/juju/juju/cmd/plugins/juju-restore
 	go install $(COMMON_FLAGS) $(JUJUD_FLAGS) github.com/juju/juju/cmd/jujud
 	mkdir -p debian/home
-	HOME=debian/home $(GOPATH)/src/github.com/juju/juju/scripts/generate-docs.py man -o juju.1
+	HOME=debian/home $(CURDIR)/src/github.com/juju/juju/scripts/generate-docs.py man -o juju.1
 	dh_install bin/juju usr/lib/juju-$(VERSION)/bin
 	dh_install bin/juju-metadata usr/lib/juju-$(VERSION)/bin
 	dh_install bin/juju-restore usr/lib/juju-$(VERSION)/bin
@@ -57,7 +66,7 @@
 
 override_dh_auto_clean:
 	rm -rf debian/juju-core.prerm debian/juju-core.postinst debian/juju-core.lintian-overrides bin juju.1
-	rm -rf pkg bin /tmp/go-build* debian/home
+	rm -rf pkg bin /tmp/go-build* debian/home debian/gocode
 	find . -name "*.pyc" -delete || :
 	dh_auto_clean