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

Proposed by James Page on 2015-10-10
Status: Merged
Merge reported by: Robie Basak
Merged at revision: not available
Proposed branch: lp:~james-page/ubuntu/wily/juju-core/mir-fixes
Merge into: lp:ubuntu/wily/juju-core
Diff against target: 108 lines (+35/-6)
3 files modified
debian/changelog (+13/-0)
debian/control (+7/-0)
debian/rules (+15/-6)
To merge this branch: bzr merge lp:~james-page/ubuntu/wily/juju-core/mir-fixes
Reviewer Review Type Date Requested Status
Ubuntu branches 2015-10-10 Pending
Review via email: mp+274052@code.launchpad.net

Description of the change

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

To post a comment you must log in.
53. By James Page on 2015-10-16

Comment about use of shared -dev packages

Robie Basak (racb) wrote :

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?

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1juju-core (1.24.6-0ubuntu2) wily; urgency=medium
2
3 * Updates to support MIR in Ubuntu:
4 - d/control: Add BD's on go.crypto, go.net, juju-loggo,
5 github-bmizerany-pat and go-dbus golang-*-dev packages.
6 - d/rules: Tweak GOPATH configuration and link in any shared go
7 dependencies from /usr/share/gocode to ensure that distribution
8 -dev packages are preferred over embedded copies in juju source.
9 - d/control,rules: Add BD on dh-golang, enable Built-Using field to
10 ensure -dev dependencies can be tracked effectively.
11
12 -- James Page <james.page@ubuntu.com> Mon, 19 Oct 2015 22:43:27 +0100
13
1juju-core (1.24.6-0ubuntu1) wily; urgency=medium14juju-core (1.24.6-0ubuntu1) wily; urgency=medium
215
3 * New upstream release (LP: #1481556).16 * New upstream release (LP: #1481556).
417
=== 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 @@
3Priority: extra3Priority: extra
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Build-Depends: debhelper (>= 7.0.50~),5Build-Depends: debhelper (>= 7.0.50~),
6 dh-golang,
6 distro-info,7 distro-info,
7 gccgo-5 [!amd64 !i386 !armhf] | gccgo-go [!amd64 !i386 !armhf],8 gccgo-5 [!amd64 !i386 !armhf] | gccgo-go [!amd64 !i386 !armhf],
9 golang-github-bmizerany-pat-dev,
8 golang-go (>= 2:1.2) [amd64 i386 armhf],10 golang-go (>= 2:1.2) [amd64 i386 armhf],
11 golang-go-dbus-dev,
12 golang-go.crypto-dev,
13 golang-go.net-dev,
14 golang-juju-loggo-dev,
9 lsb-release,15 lsb-release,
10 python16 python
11Standards-Version: 3.9.617Standards-Version: 3.9.6
@@ -17,6 +23,7 @@
17Depends: distro-info, ${misc:Depends}, ${shlibs:Depends}23Depends: distro-info, ${misc:Depends}, ${shlibs:Depends}
18Recommends: bash-completion24Recommends: bash-completion
19Conflicts: juju (<< 0.7-0ubuntu1~)25Conflicts: juju (<< 0.7-0ubuntu1~)
26Built-Using: ${misc:Built-Using}
20Description: Juju is devops distilled - client27Description: Juju is devops distilled - client
21 Through the use of charms, juju provides you with shareable, re-usable,28 Through the use of charms, juju provides you with shareable, re-usable,
22 and repeatable expressions of devops best practices. You can use them29 and repeatable expressions of devops best practices. You can use them
2330
=== 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 @@
33
4# Uncomment this to turn on verbose mode.4# Uncomment this to turn on verbose mode.
5#export DH_VERBOSE=15#export DH_VERBOSE=1
6export GOPATH:=$(CURDIR)6# NOTE: debian/gocode/src will contain symlinks to system provided
7export PATH:=$(GOPATH)/bin:$(PATH)7# dev packages, which will be used over those in the upstream
8# juju-core codebase.
9export GOPATH:=$(CURDIR)/debian/gocode:$(CURDIR)
10export PATH:=$(CURDIR)/bin:$(PATH)
811
9PKGDIR:=debian/juju-core12PKGDIR:=debian/juju-core
10VERSION:=$(shell sed -n 's/^const version = "\(.*\)"/\1/p' $(GOPATH)/src/github.com/juju/juju/version/version.go)13VERSION:=$(shell sed -n 's/^const version = "\(.*\)"/\1/p' $(CURDIR)/src/github.com/juju/juju/version/version.go)
11ifeq ($(VERSION),)14ifeq ($(VERSION),)
12$(error Invalid version constant in version.go)15$(error Invalid version constant in version.go)
13endif16endif
@@ -19,7 +22,7 @@
19endif22endif
2023
21%:24%:
22 dh $@25 dh $@ --with=golang
2326
24debian/juju-core.postinst: debian/juju-core.postinst.in27debian/juju-core.postinst: debian/juju-core.postinst.in
25 sed -e "s/__NEW_VERSION__/$(VERSION)/g" $< > $@28 sed -e "s/__NEW_VERSION__/$(VERSION)/g" $< > $@
@@ -39,13 +42,19 @@
39JUJUD_FLAGS:= -gccgoflags -static-libgo42JUJUD_FLAGS:= -gccgoflags -static-libgo
40endif43endif
4144
45# NOTE: ensure /usr/share/gocode is use in preference to any
46# embedded source for dependencies.
47override_dh_auto_configure:
48 mkdir -p debian/gocode/src
49 ln -s /usr/share/gocode/src/* debian/gocode/src
50
42override_dh_auto_install: debian/juju-core.postinst debian/juju-core.prerm debian/juju-core.lintian-overrides51override_dh_auto_install: debian/juju-core.postinst debian/juju-core.prerm debian/juju-core.lintian-overrides
43 go install $(COMMON_FLAGS) github.com/juju/juju/cmd/juju52 go install $(COMMON_FLAGS) github.com/juju/juju/cmd/juju
44 go install $(COMMON_FLAGS) github.com/juju/juju/cmd/plugins/juju-metadata53 go install $(COMMON_FLAGS) github.com/juju/juju/cmd/plugins/juju-metadata
45 go install $(COMMON_FLAGS) github.com/juju/juju/cmd/plugins/juju-restore54 go install $(COMMON_FLAGS) github.com/juju/juju/cmd/plugins/juju-restore
46 go install $(COMMON_FLAGS) $(JUJUD_FLAGS) github.com/juju/juju/cmd/jujud55 go install $(COMMON_FLAGS) $(JUJUD_FLAGS) github.com/juju/juju/cmd/jujud
47 mkdir -p debian/home56 mkdir -p debian/home
48 HOME=debian/home $(GOPATH)/src/github.com/juju/juju/scripts/generate-docs.py man -o juju.157 HOME=debian/home $(CURDIR)/src/github.com/juju/juju/scripts/generate-docs.py man -o juju.1
49 dh_install bin/juju usr/lib/juju-$(VERSION)/bin58 dh_install bin/juju usr/lib/juju-$(VERSION)/bin
50 dh_install bin/juju-metadata usr/lib/juju-$(VERSION)/bin59 dh_install bin/juju-metadata usr/lib/juju-$(VERSION)/bin
51 dh_install bin/juju-restore usr/lib/juju-$(VERSION)/bin60 dh_install bin/juju-restore usr/lib/juju-$(VERSION)/bin
@@ -57,7 +66,7 @@
5766
58override_dh_auto_clean:67override_dh_auto_clean:
59 rm -rf debian/juju-core.prerm debian/juju-core.postinst debian/juju-core.lintian-overrides bin juju.168 rm -rf debian/juju-core.prerm debian/juju-core.postinst debian/juju-core.lintian-overrides bin juju.1
60 rm -rf pkg bin /tmp/go-build* debian/home69 rm -rf pkg bin /tmp/go-build* debian/home debian/gocode
61 find . -name "*.pyc" -delete || :70 find . -name "*.pyc" -delete || :
62 dh_auto_clean71 dh_auto_clean
6372

Subscribers

People subscribed via source and target branches

to all changes: