diff -Nru juju-core-1-1.25.5/debian/changelog juju-core-1-1.25.5/debian/changelog --- juju-core-1-1.25.5/debian/changelog 2016-04-15 00:07:21.000000000 +0000 +++ juju-core-1-1.25.5/debian/changelog 2016-04-20 00:32:00.000000000 +0000 @@ -1,3 +1,17 @@ +juju-core-1 (1.25.5-0ubuntu3) xenial; urgency=medium + + * juju-1-default must ship /usr/bin/juju in the package, not create/remove + this symlink from the maintainer scripts. + + -- Steve Langasek Tue, 19 Apr 2016 17:31:59 -0700 + +juju-core-1 (1.25.5-0ubuntu2) xenial; urgency=medium + + * Enable dpkg-divert in new juju-1-default package to allow diversion of /usr/bin/juju + * Restore juju-1.25 versioning, while retaining /usr/bin/juju-1 + + -- Nicholas Skaggs Tue, 19 Apr 2016 18:41:46 -0400 + juju-core-1 (1.25.5-0ubuntu1) xenial; urgency=medium * New upstream release. diff -Nru juju-core-1-1.25.5/debian/control juju-core-1-1.25.5/debian/control --- juju-core-1-1.25.5/debian/control 2016-04-15 00:07:21.000000000 +0000 +++ juju-core-1-1.25.5/debian/control 2016-04-19 23:11:36.000000000 +0000 @@ -18,11 +18,13 @@ Homepage: http://launchpad.net/juju-core Testsuite: autopkgtest -Package: juju-1 +Package: juju-1.25 Architecture: any Depends: distro-info, ${misc:Depends}, ${shlibs:Depends} Recommends: bash-completion -Conflicts: juju (<< 0.7-0ubuntu1~) +Conflicts: juju (<< 0.7-0ubuntu1~), juju-1 +Provides: juju-1 +Replaces: juju-1 Built-Using: ${misc:Built-Using} Description: Juju is devops distilled - client Through the use of charms, juju provides you with shareable, re-usable, @@ -35,19 +37,36 @@ with Juju environments. Package: juju-core -Section: oldlibs +Section: devel Priority: extra Architecture: all -Depends: juju-1, ${misc:Depends} +Depends: juju-1.25, ${misc:Depends} Description: transitional package for supporting multiple Juju versions Dependency package providing the latest 1.25 stable version of Juju. +Package: juju-1-default +Section: devel +Priority: extra +Architecture: all +Depends: juju-1.25, ${misc:Depends} +Description: Juju is devops distilled - client (legacy juju-1 symlink) + 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 package contains a symlink for legacy juju-1 tooling that requires + the /usr/bin/juju binary to point to juju-1, rather than juju-2.0. + . + No other packages should depend on this package. + Package: juju-local Architecture: all Depends: cloud-image-utils | cloud-utils, cpu-checker, dbus, - juju-1 (>= ${source:Version}), + juju-1.25 (>= ${source:Version}), lxc (>=1.0.0~alpha1-0ubuntu14), lxc-templates, rsyslog-gnutls, @@ -67,7 +86,7 @@ Architecture: all Depends: cpu-checker, dbus, - juju-1 (>= ${source:Version}), + juju-1.25 (>= ${source:Version}), rsyslog-gnutls, uvtool, uvtool-libvirt, diff -Nru juju-core-1-1.25.5/debian/juju-1.25.lintian-overrides juju-core-1-1.25.5/debian/juju-1.25.lintian-overrides --- juju-core-1-1.25.5/debian/juju-1.25.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ juju-core-1-1.25.5/debian/juju-1.25.lintian-overrides 2016-04-15 00:07:21.000000000 +0000 @@ -0,0 +1,5 @@ +# golang binaries should not be stripped +unstripped-binary-or-object usr/lib/juju-*/bin/* +# false positive from using golang port of libyaml +embedded-library usr/lib/juju-*/bin/*: libyaml +hardening-no-relro usr/lib/juju-*/bin/* diff -Nru juju-core-1-1.25.5/debian/juju-1-default.links juju-core-1-1.25.5/debian/juju-1-default.links --- juju-core-1-1.25.5/debian/juju-1-default.links 1970-01-01 00:00:00.000000000 +0000 +++ juju-core-1-1.25.5/debian/juju-1-default.links 2016-04-20 00:21:44.000000000 +0000 @@ -0,0 +1 @@ +usr/bin/juju-1 usr/bin/juju diff -Nru juju-core-1-1.25.5/debian/juju-1-default.postrm juju-core-1-1.25.5/debian/juju-1-default.postrm --- juju-core-1-1.25.5/debian/juju-1-default.postrm 1970-01-01 00:00:00.000000000 +0000 +++ juju-core-1-1.25.5/debian/juju-1-default.postrm 2016-04-20 00:21:26.000000000 +0000 @@ -0,0 +1,6 @@ +if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then + dpkg-divert --package juju-1-default --remove --rename \ + --divert /usr/bin/juju.default /usr/bin/juju +fi + +#DEBHELPER# diff -Nru juju-core-1-1.25.5/debian/juju-1-default.preinst juju-core-1-1.25.5/debian/juju-1-default.preinst --- juju-core-1-1.25.5/debian/juju-1-default.preinst 1970-01-01 00:00:00.000000000 +0000 +++ juju-core-1-1.25.5/debian/juju-1-default.preinst 2016-04-20 00:21:31.000000000 +0000 @@ -0,0 +1,4 @@ +dpkg-divert --package juju-1-default --add --rename \ + --divert /usr/bin/juju.default /usr/bin/juju + +#DEBHELPER# diff -Nru juju-core-1-1.25.5/debian/juju-1.lintian-overrides juju-core-1-1.25.5/debian/juju-1.lintian-overrides --- juju-core-1-1.25.5/debian/juju-1.lintian-overrides 2016-04-15 00:07:21.000000000 +0000 +++ juju-core-1-1.25.5/debian/juju-1.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -# golang binaries should not be stripped -unstripped-binary-or-object usr/lib/juju-*/bin/* -# false positive from using golang port of libyaml -embedded-library usr/lib/juju-*/bin/*: libyaml -hardening-no-relro usr/lib/juju-*/bin/* diff -Nru juju-core-1-1.25.5/debian/rules juju-core-1-1.25.5/debian/rules --- juju-core-1-1.25.5/debian/rules 2016-04-15 00:07:21.000000000 +0000 +++ juju-core-1-1.25.5/debian/rules 2016-04-19 23:11:36.000000000 +0000 @@ -44,8 +44,8 @@ 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 - echo '#!/bin/sh\nexport PATH=/usr/lib/juju-$(VERSION)/bin:"$$PATH"\nexec juju "$$@"' > bin/juju-1 - chmod 755 bin/juju-1 + echo '#!/bin/sh\nexport PATH=/usr/lib/juju-$(VERSION)/bin:"$$PATH"\nexec juju "$$@"' > bin/juju-$(VERSION) + chmod 755 bin/juju-$(VERSION) 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 @@ -53,13 +53,14 @@ 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/jujud usr/lib/juju-$(VERSION)/bin - dh_install bin/juju-1 usr/bin + dh_install bin/juju-$(VERSION) usr/bin dh_install juju.1 usr/lib/juju-$(VERSION)/man/man1 - # TODO: Add back bash completion for juju-1 name only. + # TODO: Add back bash completion for juju-1.25 name only. dh_auto_install override_dh_link: - dh_link -pjuju-1 usr/lib/juju-$(VERSION)/man/man1/juju.1.gz /usr/share/man/man1/juju-1.1.gz + dh_link -pjuju-1.25 usr/bin/juju-$(VERSION) usr/bin/juju-1 + dh_link -pjuju-1.25 usr/lib/juju-$(VERSION)/man/man1/juju.1.gz /usr/share/man/man1/juju-1.1.gz dh_link override_dh_compress: @@ -81,4 +82,4 @@ dh_builddeb -- -Zxz override_dh_gencontrol: - dh_gencontrol -- $(DB_DEP) + dh_gencontrol -- $(DB_DEP) \ No newline at end of file