Merge branch 'ubuntu/devel' into ubuntu/xenial

- debian/cloud-init.templates fix capitalisation in template so
  dpkg-reconfigure works to select OpenStack. (LP: #1575727)
- d/README.source, d/control, d/new-upstream-snapshot, d/rules: sync
  with yakkety for changes due to move to git.
- d/rules: change PYVER=python3 to PYVER=3 to adjust to upstream change.
- debian/rules, debian/cloud-init.install: remove install file
  to ensure expected files are collected into cloud-init deb.
  (LP: #1615745)
- debian/dirs: remove obsolete / unused file.

LP: #1575727
LP: #1615745

1 files changed, 15 insertions, 35 deletions

diff --git a/debian/README.source b/debian/README.source
index 5e4319fb..86bcf530 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,43 +1,23 @@
 === General Info ===
-Development packaging branch is at
-   lp:ubuntu/<suite>/cloud-init
-alternatively, if you're on the development release:
-   lp:ubuntu/cloud-init
+Packaging branches for the Ubuntu development release are maintained in
+upstream git under ubuntu/devel branch.
 
-Patches in debian/patches are also stored applied in bzr.
+   git clone git://git.launchpad.net/cloud-init -b ubuntu/devel
 
-To cherry pick revisions 391 to tip from from trunk, do something like:
-  s=391; e=;
-  b=../trunk;
-  [ -n "${e}" ] || e=$(cd ${b} && bzr revno)
-  pfile=catchup-${s}${e:+-${e}}.patch
-  [ "$s" = "$e" ] && pfile=catchup-${s}.patch
-  ( cd ../trunk && bzr log -r$s..$e &&
-      bzr diff -p1 -r$(($s-1))..$e ) > ../$pfile.full
-  mkdir -p debian/patches
-  filterdiff --exclude "*/ChangeLog" < ../$pfile.full > debian/patches/$pfile
-  echo "$pfile" >> debian/patches/series
-  quilt push
-  quilt refresh
-  files="$(quilt files ${pfile}) debian/patches/series debian/patches/${pfile}"
-  files="$files .pc/${pfile} .pc/applied-patches"
-  bzr add $files
+Stable release branches are also available in ubuntu/<codename>
+   $ git clone git://git.launchpad.net/cloud-init
+   $ cd cloud-init
+   $ git branch -r
+   origin/HEAD -> origin/master
+   origin/master
+   origin/ubuntu/devel
+   origin/ubuntu/precise
+   origin/ubuntu/trusty
+   origin/ubuntu/xenial
 
-  # now add an entry
-  dch --append "${pfile} (sync to $e)"
-  dch --edit # improve the entry
-  debcommit $files
-
-  ../$pfile.full will have the full diff.  See 'ChangeLog' entries there
-  and debian/patches/$pfile for help writing debian/changelog entry
-
-You can set 'e' (end) to not go to tip.
-
-== Cherry pick single patch ==
-There is a utility in debian/cherry-pick-rev that will
-help to cherry pick a single commit from trunk.
+Patches in debian/patches are stored un-applied.
 
 == New snapshot ==
-To pull a new upstream snapshot, given lp:cloud-init in ../trunk:
+To pull a new upstream snapshot:
 
  ./debian/new-upstream-snapshot ../trunk