=== modified file debian/changelog --- debian/changelog 2016-03-22 15:21:42 +0000 +++ debian/changelog 2016-03-22 16:23:52 +0000 @@ -1,6 +1,18 @@ +juju2 (2.0-beta2-0ubuntu1) xenial; urgency=medium + + * New upstream release (Lp: 1560315). + * d/control: + - Renamed the package juju-core to juju2. + - Dropped unneeded juju-local* and juju packages. + * d/rules: + - Renamed the package to juju2. + - Updated rules to 2.x. + - Additional path/name changes to support co-installability with + the 1.x juju-core package. + * d/copyright: Updated per changes to embedded dependencies. + * d/tests/* + - Updated tests to use juju2 command line. + - Replaced local-provider tests with lxd tests. + + -- Curtis C. Hovey Tue, 22 Mar 2016 15:19:55 +0000 === modified file debian/control --- debian/control 2016-03-14 14:18:17 +0000 +++ debian/control 2016-03-22 15:30:14 +0000 @@ -1,28 +1,22 @@ -Source: juju-core +Source: juju2 Section: devel Priority: extra Maintainer: Ubuntu Developers Build-Depends: debhelper (>= 7.0.50~), - dh-golang, distro-info, - gccgo-5 [powerpc] | gccgo-go [powerpc], - golang-github-bmizerany-pat-dev, - golang-go (>= 2:1.2) [!powerpc], - golang-go-dbus-dev, - golang-go.crypto-dev, - golang-go.net-dev, - golang-juju-loggo-dev, + golang-go (>= 2:1.6) [!amd64 !i386 !armhf] | gccgo-5 [!amd64 !i386 !armhf] | gccgo-go [!amd64 !i386 !armhf], + golang-go (>= 2:1.2) [amd64 i386 armhf], lsb-release, python Standards-Version: 3.9.6 Homepage: http://launchpad.net/juju-core XS-Testsuite: autopkgtest -Package: juju-core +Package: juju2 Architecture: any Depends: distro-info, ${misc:Depends}, ${shlibs:Depends} Recommends: bash-completion -Conflicts: juju (<< 0.7-0ubuntu1~) +Conflicts: juju (<< 0.7-0ubuntu1~), juju-core2 Built-Using: ${misc:Built-Using} Description: Juju is devops distilled - client Through the use of charms, juju provides you with shareable, re-usable, @@ -33,56 +27,3 @@ . This package provides the client application of creating and interacting with Juju environments. - -Package: juju -Architecture: all -Depends: juju-core (>= ${source:Version}), ${misc:Depends} -Description: next generation service orchestration system - 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. - . - This is a dependency package providing the current version of Juju. - -Package: juju-local -Architecture: all -Depends: cloud-image-utils | cloud-utils, - cpu-checker, - dbus, - juju-core (>= ${source:Version}), - lxc (>=1.0.0~alpha1-0ubuntu14), - lxc-templates, - rsyslog-gnutls, - ${dist:Depends}, - ${misc:Depends} -Description: dependency package for the Juju local provider - 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. - . - This is a dependency package for those who want to use the Juju local - provider, allowing Juju Charms to be tested locally using LXC containers. - -Package: juju-local-kvm -Architecture: all -Depends: cpu-checker, - dbus, - juju-core (>= ${source:Version}), - rsyslog-gnutls, - uvtool, - uvtool-libvirt, - ${dist:Depends}, - ${misc:Depends} -Description: dependency package for the Juju local provider - 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. - . - This is a dependency package for those who want to use the Juju local - provider, allowing Juju Charms to be tested locally using KVM containers. === modified file debian/copyright --- debian/copyright 2016-03-14 14:49:17 +0000 +++ debian/copyright 2016-03-22 04:01:50 +0000 @@ -33,6 +33,11 @@ Copyright: 2013-2015 Canonical Ltd. License: AGPL-3 +Files: src/github.com/Azure/azure-sdk-for-go/* +Copyright: 2009-2015 The Go Authors. All rights reserved. +License: Apache-2.0 +Comment: Last verified commit 9f40dc1ee704920d20418200ddf6ec382456bb0e + Files: src/github.com/ajstarks/svgo/* Copyright: 2010 Anthony Starks License: CC-BY-3.0 @@ -50,6 +55,26 @@ License: Expat Comment: Last verified commit 48be7df2c27e1cec821a3284a683ce6ef90d9052 +Files: src/github.com/chai2010/gettext-go +Copyright: 2013 ChaiShushan . All rights reserved. +License: BSD-3-clause+Google +Comment: Last verified commit 783c0fb3da95b06dd89c4ba2771f1dc289ecc27c + The copyright holder is sometimes referenced as + "". + +Files: src/github.com/chai2010/gettext-go +Copyright: 2000 Free Software Foundation, Inc. +License: BSD-3-clause+Google + +Files: src/github.com/chai2010/gettext-go/testdata/mm-viet.comp.po +Copyright: 2006 Gnome i18n Project for Vietnamese. +License: BSD-3-clause+Google + +Files: src/github.com/chai2010/gettext-go/testdata/qttest_pl.po + src/github.com/chai2010/gettext-go/testdata/qttest2_de.po +Copyright: 2003, 2005 Yoyodyne, Inc. +License: BSD-3-clause+Google + Files: src/github.com/coreos/go-systemd/* Copyright: 2015 CoreOS, Inc. License: Apache-2.0 @@ -74,6 +99,20 @@ License: BSD-2-clause Comment: Last verified commit 88765d85c0fdadcd98a54e30694fa4e4f5b51133 +Files: src/github.com/gorilla/websocket/* +Copyright: 2013, 2014, 2015 The Gorilla WebSocket Authors. All rights reserved. +License: BSD-2-clause +Comment: Last verified commit 13e4d0621caa4d77fd9aa470ef6d7ab63d1a5e41 + +Files: src/github.com/gosuri/uitable/* +Copyright: 2015 Greg Osuri +License: Expat +Comment: Last verified commit cacfc559e8712a81692496c5147c80aced020e51 + +Files: src/github.com/gosuri/uitable/util/wordwrap/* +Copyright: 2014 Mitchell Hashimoto +License: Expat + Files: src/github.com/joyent/gocommon/* Copyright: 2013, Joyent Inc. License: LGPL-3+ @@ -97,22 +136,22 @@ Files: src/github.com/juju/blobstore/* Copyright: 2014, 2015 Canonical Ltd. License: LGPL-3 with linking exception -Comment: Last verified commit 337aa7d5d712728d181dbda2547a6556d4189626 +Comment: Last verified commit 06056004b3d7b54bbb7984d830c537bad00fec21 + +Files: src/github.com/juju/bundlechanges/* +Copyright: 2015 Canonical Ltd. +License: LGPL-3+ +Comment: Last verified commit ad533f529b3b4a8bb2b76bf6213f1ef6b68df392 Files: src/github.com/juju/cmd/* Copyright: 2012-2015 Canonical Ltd. License: LGPL-3 with linking exception -Comment: Last verified commit 081dd27e371031b13c297d4016d7ef7b0d4fefa4 - -Files: src/github.com/juju/deputy/* -Copyright: 2015 Canonical Ltd. -License: LGPL-3 with linking exception -Comment: Last verified commit 63a2b10f43a34dca15080bfc7e21b712989562a9 +Comment: Last verified commit 33554d631f79b840d76673665b292215882ba90a Files: src/github.com/juju/errors/* Copyright: 2013-2015 Canonical Ltd. License: LGPL-3 with linking exception -Comment: Last verified commit 4567a5e69fd3130ca0d89f69478e7ac025b67452 +Comment: Last verified commit 1b5e39b83d1835fa480e0c2ddefb040ee82d58b3 Files: src/github.com/juju/go4/* Copyright: 2011, 2014, 2015, 2016 The go4 Authors @@ -184,6 +223,11 @@ Copyright: 2012 Julian Berman License: Expat +Files: src/github.com/juju/gomaasapi/* +Copyright: 2012-2015, Canonical Ltd. +License: LGPL-3+ +Comment: Last verified commit e173bc8d8d3304ff11b0ded5f6d4eea0cb560a40 + Files: src/github.com/juju/govmomi/* Copyright: 2014-2015 VMware, Inc. All Rights Reserved. License: Apache-2.0 @@ -202,6 +246,11 @@ This is a fork of the upstream golang httpprof package that fixes issues in golang 1.2.x. +Files: src/github.com/juju/httprequest/* +Copyright: 2015 Canonical Ltd. +License: LGPL-3+ +Comment: Last verified commit 1015665b66c26101695f2f51407b3b1e000176fd + Files: src/github.com/juju/juju/* Copyright: 2011-2015 Canonical Ltd. 2013 Joyent Inc. @@ -255,11 +304,6 @@ Comment: This file originates from https://github.com/coreos/go-systemd/blob/master/unit/serialize.go -Files: src/github.com/juju/jujusvg/* -Copyright: 2014, 2015 Canonical Ltd. -License: LGPL-3 with linking exception -Comment: Last verified commit 28683402583926ce903491c14a07cdc5cb371adb - Files: src/github.com/juju/loggo/* Copyright: 2014, 2015 Canonical Ltd. License: LGPL-3 with linking exception @@ -268,7 +312,7 @@ Files: src/github.com/juju/names/* Copyright: 2013-2016 Canonical Ltd. License: LGPL-3 with linking exception -Comment: Last verified commit e287fe4ae0dbda220cace3ed0e35cda4796c1aa3 +Comment: Last verified commit 0fa6e46604f432b3064b02b2160fc5e6056131b8 Files: src/github.com/juju/persistent-cookiejar/* Copyright: 2012, 2013, 2015 The Go Authors. All rights reserved. @@ -285,23 +329,33 @@ License: LGPL-3 with linking exception Comment: Last verified commit fb7294cf57a1e2f08a57691f1246d129a87ab7e8 +Files: src/github.com/juju/retry/* +Copyright: 2015 Canonical Ltd. +License: LGPL-3 with linking exception +Comment: Last verified commit 62c62032529169c7ec02fa48f93349604c345e1f + +Files: src/github.com/juju/romulus/* +Copyright: 2016 Canonical Ltd. +License: AGPL-3 +Comment: Last verified commit 90860c5f2f755a1d36f4382112a78d8cd65ffae4 + Files: src/github.com/juju/schema/* -Copyright: 2011-2015 Canonical Ltd. +Copyright: 2011-2016 Canonical Ltd. License: LGPL-3 with linking exception -Comment: Last verified commit afe1151cb49d1d7ed3c75592dfc6f38703f2e988 - -Files: src/github.com/juju/syslog/* -Copyright: 2009, 2012 The Go Authors. All rights reserved. -License: BSD-3-clause+Google -Comment: Last verified commit 6be94e8b718766e9ff7a37342157fe4795da7cfa - This is a fork of the upstream golang syslog package that fixes - issues in golang 1.2.x. +Comment: Last verified commit 47d9b102199f4c67e5bfb28eb07bbe39411754fe Files: src/github.com/juju/testing/* -Copyright: 2011-2015 Canonical Ltd. +Copyright: 2011-2016 Canonical Ltd. +License: LGPL-3 with linking exception +Comment: Last verified commit 4d5a7d64948aae30698f5d97b4c0d1a85a4504b7 + +Files: src/github.com/juju/testing/checkers/file_test.go + src/github.com/juju/testing/mgo_windows.go + src/github.com/juju/testing/checkers/file.go + src/github.com/juju/testing/mgo_unix.go +Copyright: 2013-2014 Canonical Ltd. 2014 Cloudbase Solutions SRL License: LGPL-3 with linking exception -Comment: Last verified commit f521911d9a79aeb62c051fe18e689796369c5564 Files: src/github.com/juju/testing/checkers/deepequal.go src/github.com/juju/testing/checkers/deepequal_test.go @@ -314,10 +368,10 @@ Comment: Last verified commit 99ec629d0066a4d73c54d8e021a7fc1dc07df614 Files: src/github.com/juju/utils/* -Copyright: 2011-2015 Canonical Ltd. +Copyright: 2011-2016 Canonical Ltd. 2014, 2015 Cloudbase Solutions SRL License: LGPL-3 with linking exception -Comment: Last verified commit d300cfbfa10388047c779b60e50e7be533cc781d +Comment: Last verified commit 6a56fe5cf0ae360cb6bf19f287289eaf9e28aea9 Files: src/github.com/juju/utils/du/diskusage.go src/github.com/juju/utils/du/diskusage_windows.go @@ -339,15 +393,64 @@ This is a fork of the upstream golang xml package that fixes issues in golang 1.2.x. +Files: src/github.com/julienschmidt/httprouter/* +Copyright: 2013 Julien Schmidt. All rights reserved. +License: BSD-3-clause +Comment: Last verified commit 109e267447e95ad1bb48b758e40dd7453eb7b039 + +Files: src/github.com/julienschmidt/httprouter/path.go + src/github.com/julienschmidt/httprouter/path_test.go +Copyright: 2013 Julien Schmidt. All rights reserved. +License: BSD-3-clause +comment: Based on the path package, Copyright 2009 The Go Authors. + Use of this source code is governed by a BSD-style license + that can be found in the LICENSE file. + +Files: src/github.com/lxc/lxd/* +Copyright: 2015 LXD contributors +License: Apache-2.0 +Comment: Last verified commit 45d6b5a766b34027528fae259d5c247e7f138e8e + +Files: src/github.com/lxc/lxd/shared/cert.go +Copyright: 2009, 2010 The Go Authors. All rights reserved. +License: BSD-3-clause+Google +Comment: The cert.go file comes from + https://golang.org/src/crypto/tls/generate_cert.go + under https://golang.org/LICENSE + +Files: src/github.com/lxc/lxd/shared/gnuflag/flag.go + src/github.com/lxc/lxd/shared/gnuflag/flag_test.go + src/github.com/lxc/lxd/shared/gnuflag/export_test.go +Copyright: 2009, 2010 The Go Authors. All rights reserved. +License: BSD-3-clause+Google +Comment: The gnuflag files cite a BSD-style LICENSE, but the file + is not included in the gnuflag dir. The file is included at + src/launchpad.net/gnuflag/LICENSE + +Files: src/github.com/mattn/go-colorable/* +Copyright: Yasuhiro Matsumoto (a.k.a mattn) +License: Expat +Comment: Last verified commit 40e4aedc8fabf8c23e040057540867186712faa5 + +Files: src/github.com/mattn/go-runewidth/* +Copyright: 2013-2016 Yasuhiro Matsumoto +License: Expat +Comment: Last verified commit d96d1bd051f2bd9e7e43d602782b37b93b1b5666 + +Files: src/github.com/mattn/go-isatty/* +Copyright: Yasuhiro MATSUMOTO +License: Expat +Comment: Last verified commit d6aaa2f596ae91a0a58d8e7f2c79670991468e4f + Files: src/golang.org/x/crypto/* -Copyright: 2009-2014 The Go Authors. All rights reserved. +Copyright: 2009-2015 The Go Authors. All rights reserved. License: BSD-3-clause+Google -Comment: Last verified commit c57d4a71915a248dbad846d60825145062b4c18e +Comment: Last verified commit aedad9a179ec1ea11b7064c57cbc6dc30d7724ec Files: src/golang.org/x/net/* Copyright: 2009-2015 The Go Authors. All rights reserved. License: BSD-3-clause+Google -Comment: Last verified commit bb64f4dc73d4ab97978d5e1cb34515dcc570361b +Comment: Last verified commit ea47fc708ee3e20177f3ca3716217c4ab75942cb Files: src/golang.org/x/net/html/charset/testdata/* Copyright: 2009-2014 W3C @@ -401,39 +504,75 @@ Files: src/gopkg.in/errgo.v1/* Copyright: 2013-2014, Roger Peppe License: BSD-3-clause -Comment: Last verified commit 15098963088579c1cd9eb1a7da285831e548390b +Comment: Last verified commit 66cb46252b94c1f3d65646f54ee8043ab38d766c Files: src/gopkg.in/goose.v1/* Copyright: 2013-2015, Canonical Ltd. License: LGPL-3+ -Comment: Last verified commit e4a91e8b8323b8eef6fe41a66fd3ac6120520bb0 - -Files: src/gopkg.in/juju/charm.v5/* -Copyright: 2013, 2014, 2015 Canonical Ltd. +Comment: Last verified commit 33121bddecedb2c9f9053c5c84ee729c379ab5ac + +Files: src/gopkg.in/inconshreveable/log15.v2/* +Copyright: 2014 Alan Shreve +License: Apache-2.0 +Comment: Last verified commit b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f + +Files: src/gopkg.in/inconshreveable/log15.v2/term/* +Copyright: 2014 Simon Eskildsen +License: Expat +Comment: Several files are based on ssh/terminal + (src/golang.org/x/crypto/ssh/terminal/terminal.go) which is + licensed under BSD-style: + src/gopkg.in/inconshreveable/log15.v2/term/terminal_appengine.go + src/gopkg.in/inconshreveable/log15.v2/term/terminal_windows.go + src/gopkg.in/inconshreveable/log15.v2/term/terminal_notwindows.go + src/gopkg.in/inconshreveable/log15.v2/term/terminal_darwin.go + src/gopkg.in/inconshreveable/log15.v2/term/terminal_linux.go + +Files: src/gopkg.in/ini.v1/* +Copyright: 2014, 2015 Unknwon +License: Apache-2.0 +Comment: Last verified commit 776aa739ce9373377cd16f526cdf06cb4c89b40f + +Files: src/gopkg.in/juju/blobstore.v2/* +Copyright: 2014 Canonical Ltd. License: LGPL-3 with linking exception -Comment: Last verified commit aece7b0e56c298641968239a7fa0b3466afa6ef5 +Comment: Last verified commit 51fa6e26128d74e445c72d3a91af555151cc3654 -Files: src/gopkg.in/juju/charmstore.v4/* +Files: src/gopkg.in/juju/charm.v6-unstable/* Copyright: 2011-2015 Canonical Ltd. +License: LGPL-3 with linking exception +Comment: Last verified commit a53382ef6e1940abf20f1150bd203d0d57ac1a44 + +Files: src/gopkg.in/juju/charmrepo.v2-unstable/* +Copyright: 2012-2015 Canonical Ltd. +License: LGPL-3 with linking exception +Comment: Last verified commit b17697d8bb60cdac7d8ffd61e1357c9977cc2096 + +Files: src/gopkg.in/juju/charmstore.v5-unstable/* +Copyright: 2012-2015 Canonical Ltd. License: AGPL-3 -Comment: Last verified commit b90d24652753eeb1f7d209483d499f6b24dcf25e +Comment: Last verified commit c727ba087ec577cd0f9d0eca475279992e7a626f -Files: src/gopkg.in/juju/charmstore.v4/csclient/* - src/gopkg.in/juju/charmstore.v4/params/* +Files: src/gopkg.in/juju/charmstore.v5-unstable/internal/mempool/pool.go + src/gopkg.in/juju/charmstore.v5-unstable/internal/mempool/pool_test.go Copyright: 2014, 2015 Canonical Ltd. -License: LGPL-3 -Comment: The upstream project provides separate licensing to encourage - linking to the included csclient library. +License: BSD-3-clause+Google + src/gopkg.in/juju/charmstore.v5-unstable/internal/mempool/LICENSE Files: src/gopkg.in/juju/environschema.v1/* Copyright: 2015 Canonical Ltd. License: LGPL-3 with linking exception -Comment: Last verified commit 16cc59268c09c22870cb4de8eb6248652535f315 - -Files: src/gopkg.in/macaroon-bakery.v0/* +Comment: Last verified commit 7bea6a9a531586600a7741e9bdd5e3c978ffda15 + +Files: src/gopkg.in/juju/jujusvg.v1/* +Copyright: 2014, 2015 Canonical Ltd. +License: LGPL-3 with linking exception +Comment: Last verified commit 2c97ff517dee12dc48bb3c2d2b113e5045a75b71 + +Files: src/gopkg.in/macaroon-bakery.v1/* Copyright: 2014, Roger Peppe, Canonical Inc. -License: LGPL-3 -Comment: Last verified commit 9593b80b01ba04b519769d045dffd6abd827d2fd +License: LGPL-3 with linking exception +Comment: Last verified commit ecc4ca6efa5ce1e50b79eb0f4027a6e70997f45a Files: src/gopkg.in/macaroon.v1/* Copyright: 2014, Roger Peppe @@ -441,9 +580,9 @@ Comment: Last verified commit ab3940c6c16510a850e1c2dd628b919f0f3f1464 Files: src/gopkg.in/mgo.v2/* -Copyright: 2010-2014 - Gustavo Niemeyer +Copyright: 2010-2015 Gustavo Niemeyer License: BSD-2-clause -Comment: Last verified commit 3569c88678d88179dcbd68d02ab081cbca3cd4d0 +Comment: Last verified commit 4d04138ffef2791c479c0c8bbffc30b34081b8d9 Files: src/gopkg.in/mgo.v2/internal/sasl/sspi_windows.* Copyright: 2013-2015 - Christian Amor Kvalheim @@ -480,6 +619,22 @@ Copyright: 2006 Kirill Simonov License: Expat +Files: src/gopkg.in/yaml.v2/* +Copyright: 2011-2014 Canonical Inc. +License: LGPL-3 with linking exception +Comment: Last verified commit 53feefa2559fb8dfa8d81baad31be332c97d6c77 + +Files: src/gopkg.in/yaml.v2/apic.go + src/gopkg.in/yaml.v2/emitterc.go + src/gopkg.in/yaml.v2/parserc.go + src/gopkg.in/yaml.v2/readerc.go + src/gopkg.in/yaml.v2/scannerc.go + src/gopkg.in/yaml.v2/writerc.go + src/gopkg.in/yaml.v2/yamlh.go + src/gopkg.in/yaml.v2/yamlprivateh.go +Copyright: 2006 Kirill Simonov +License: Expat + Files: src/launchpad.net/gnuflag/* Copyright: 2009, 2010, 2012 The Go Authors. All rights reserved. License: BSD-3-clause+Google @@ -490,24 +645,10 @@ License: LGPL-3+ Comment: Last verified commit ian.booth@canonical.com-20141121040613-ztm1q0iy9rune3zt -Files: src/launchpad.net/gomaasapi/* -Copyright: 2012-2014, Canonical Ltd. -License: LGPL-3+ -Comment: Last verified commit michael.foord@canonical.com-20150703101140-oo7493pkzlzg7l6u - -Files: src/launchpad.net/gwacl/* -Copyright: 2012-2014, Canonical Ltd. -License: LGPL-3+ -Comment: Last verified commit andrew.wilkins@canonical.com-20150811023840-kvosbu9d0kwwjfm2 - -Files: src/launchpad.net/gwacl/fork/* -Copyright: 2009-2012 The Go Authors. All rights reserved. -License: BSD-3-clause+Google - Files: src/launchpad.net/tomb/* Copyright: 2010-2011 - Gustavo Niemeyer License: BSD-3-clause -Comment: Last verified commit gustavo@niemeyer.net-20130531003818-70ikdgklbxopn8x4 +Comment: Last verified commit gustavo@niemeyer.net-20140529072043-hzcrlnl3ygvg914q License: AGPL-3 This program is free software: you can redistribute it and/or modify === renamed file debian/juju-core.lintian-overrides.in => debian/juju2.lintian-overrides.in --- debian/juju-core.lintian-overrides.in 2014-01-17 09:58:40 +0000 +++ debian/juju2.lintian-overrides.in 2016-03-21 21:54:11 +0000 === renamed and modified file debian/juju-core.postinst.in => debian/juju2.postinst.in --- debian/juju-core.postinst.in 2014-02-12 11:40:31 +0000 +++ debian/juju2.postinst.in 2016-03-21 21:54:11 +0000 @@ -11,8 +11,8 @@ --slave /usr/bin/jujud jujud $base_dir/juju-$VER/bin/jujud \ --slave /usr/share/man/man1/juju.1 juju.1 $base_dir/juju-$VER/man/man1/juju.1 \ --slave /usr/bin/juju-metadata juju-metadata $base_dir/juju-$VER/bin/juju-metadata \ - --slave /usr/bin/juju-restore juju-restore $base_dir/juju-$VER/bin/juju-restore \ - --slave /usr/bin/juju-backup juju-backup $base_dir/juju-$VER/bin/juju-backup + --slave /usr/bin/juju-upgrade-mongo juju-upgrade-mongo $base_dir/juju-$VER/bin/juju-upgrade-mongo \ + --slave /usr/bin/juju-restore juju-restore $base_dir/juju-$VER/bin/juju-restore ;; abort-upgrade|abort-remove|abort-deconfigure) ;; === renamed file debian/juju-core.prerm.in => debian/juju2.prerm.in --- debian/juju-core.prerm.in 2014-02-12 11:40:31 +0000 +++ debian/juju2.prerm.in 2016-03-21 21:54:11 +0000 === modified file debian/rules --- debian/rules 2016-03-14 14:18:17 +0000 +++ debian/rules 2016-03-22 15:39:03 +0000 @@ -9,7 +9,7 @@ export GOPATH:=$(CURDIR)/debian/gocode:$(CURDIR) export PATH:=$(CURDIR)/bin:$(PATH) -PKGDIR:=debian/juju-core +PKGDIR:=debian/juju2 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) @@ -24,13 +24,13 @@ %: dh $@ --with=golang -debian/juju-core.postinst: debian/juju-core.postinst.in - sed -e "s/__NEW_VERSION__/$(VERSION)/g" $< > $@ - -debian/juju-core.prerm: debian/juju-core.prerm.in - sed -e "s/__NEW_VERSION__/$(VERSION)/g" $< > $@ - -debian/juju-core.lintian-overrides: debian/juju-core.lintian-overrides.in +debian/juju2.postinst: debian/juju2.postinst.in + sed -e "s/__NEW_VERSION__/$(VERSION)/g" $< > $@ + +debian/juju2.prerm: debian/juju2.prerm.in + sed -e "s/__NEW_VERSION__/$(VERSION)/g" $< > $@ + +debian/juju2.lintian-overrides: debian/juju2.lintian-overrides.in sed -e "s/__NEW_VERSION__/$(VERSION)/g" $< > $@ COMMON_FLAGS:= -x -v -work @@ -48,25 +48,34 @@ 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 +override_dh_auto_install: debian/juju2.postinst debian/juju2.prerm debian/juju2.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) github.com/juju/juju/cmd/plugins/juju-upgrade-mongo go install $(COMMON_FLAGS) $(JUJUD_FLAGS) github.com/juju/juju/cmd/jujud mkdir -p debian/home 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 - dh_install src/github.com/juju/juju/cmd/plugins/juju-backup/juju-backup usr/lib/juju-$(VERSION)/bin + dh_install bin/juju-upgrade-mongo usr/lib/juju-$(VERSION)/bin dh_install bin/jujud usr/lib/juju-$(VERSION)/bin dh_install juju.1 usr/lib/juju-$(VERSION)/man/man1 - dh_install src/github.com/juju/juju/etc/bash_completion.d/juju-core etc/bash_completion.d + cp src/github.com/juju/juju/etc/bash_completion.d/juju-core \ + src/github.com/juju/juju/etc/bash_completion.d/juju2 + dh_install src/github.com/juju/juju/etc/bash_completion.d/juju2 \ + etc/bash_completion.d dh_auto_install +override_dh_link: + dh_link -pjuju2 usr/lib/juju-$(VERSION)/bin/juju usr/bin/juju2 + dh_link + 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 debian/gocode + rm -rf debian/juju2.prerm debian/juju2.postinst \ + debian/juju2.lintian-overrides bin juju.1 + rm -rf pkg bin /tmp/go-build* debian/home find . -name "*.pyc" -delete || : dh_auto_clean === modified file debian/tests/control --- debian/tests/control 2015-10-27 20:23:33 +0000 +++ debian/tests/control 2016-03-22 15:46:08 +0000 @@ -1,11 +1,11 @@ Tests: client -Depends: juju +Depends: juju2 Restrictions: allow-stderr -Tests: current-local-provider current-manual-provider -Depends: juju, juju-local, sudo -Restrictions: allow-stderr breaks-testbed isolation-machine needs-root +Tests: current-lxd-provider current-manual-provider +Depends: juju2 +Restrictions: allow-stderr breaks-testbed isolation-machine -Tests: future-local-provider future-manual-provider -Depends: juju, juju-local, sudo +Tests: future-lxd-provider future-manual-provider +Depends: juju2, sudo Restrictions: allow-stderr breaks-testbed isolation-machine needs-root === renamed and modified file debian/tests/current-local-provider => debian/tests/current-lxd-provider --- debian/tests/current-local-provider 2015-10-27 20:23:33 +0000 +++ debian/tests/current-lxd-provider 2016-03-22 15:45:43 +0000 @@ -1,4 +1,4 @@ #!/bin/sh set -ex -sh debian/tests/normal-user.sh debian/tests/local-provider +sh debian/tests/normal-user.sh debian/tests/lxd-provider === renamed and modified file debian/tests/future-local-provider => debian/tests/future-lxd-provider --- debian/tests/future-local-provider 2015-10-27 20:23:33 +0000 +++ debian/tests/future-lxd-provider 2016-03-22 15:44:06 +0000 @@ -7,4 +7,4 @@ fi sh debian/tests/fake-future.sh -sh debian/tests/normal-user.sh debian/tests/local-provider +sh debian/tests/normal-user.sh debian/tests/lxd-provider === renamed and modified file debian/tests/local-provider => debian/tests/lxd-provider --- debian/tests/local-provider 2014-06-06 15:53:28 +0000 +++ debian/tests/lxd-provider 2016-03-22 16:01:00 +0000 @@ -2,17 +2,13 @@ set -ex -mkdir -p ~/.juju -cat > ~/.juju/environments.yaml << EOF -default: local-test -environments: - local-test: - type: local - admin-secret: c46629f0935c757a46b26946ac244f3f -EOF +SERIES=$(lsb_release -sc) + +echo "Adding: image to LXD: " +lxd-images import ubuntu $SERIES --alias ubuntu-$SERIES echo "Testing juju bootstrap: " -juju bootstrap --upload-tools --debug +juju bootstrap my-controller lxd --upload-tools --debug --config default-series=$SERIES echo "OK" echo "Waiting for environment to bootstrap: " @@ -20,5 +16,5 @@ echo "OK" echo "Destroying environment: " -juju destroy-environment --debug --yes local-test +juju destroy-controller --debug --yes my-controller echo "OK" === modified file debian/tests/manual-provider --- debian/tests/manual-provider 2014-06-06 15:53:28 +0000 +++ debian/tests/manual-provider 2016-03-22 03:44:13 +0000 @@ -13,13 +13,11 @@ cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys ssh-keyscan "$ip" >> ~/.ssh/known_hosts -mkdir -p ~/.juju -cat > ~/.juju/environments.yaml < ~/.local/share/juju/clouds.yaml <