From 2188dc71be86b6c22d2c5522fb7ce41dee566903 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Fri, 5 Aug 2016 16:57:38 -0400
Subject: add debian directory from current yakkety

---
 debian/README.source | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 debian/README.source

(limited to 'debian/README.source')

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 00000000..5e4319fb
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,43 @@
+=== General Info ===
+Development packaging branch is at
+   lp:ubuntu/<suite>/cloud-init
+alternatively, if you're on the development release:
+   lp:ubuntu/cloud-init
+
+Patches in debian/patches are also stored applied in bzr.
+
+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
+
+  # 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.
+
+== New snapshot ==
+To pull a new upstream snapshot, given lp:cloud-init in ../trunk:
+
+ ./debian/new-upstream-snapshot ../trunk
-- 
cgit v1.2.3


From f0e9dcce1b7ac248fcadf5576e63cee92f0e578e Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Wed, 24 Aug 2016 10:46:35 -0400
Subject: debian/control, debian/README.source: update to reference git.

---
 debian/README.source | 50 +++++++++++++++-----------------------------------
 debian/control       |  2 ++
 2 files changed, 17 insertions(+), 35 deletions(-)

(limited to 'debian/README.source')

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
diff --git a/debian/control b/debian/control
index c3e5447d..e9926e40 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,8 @@ Build-Depends: debhelper (>= 9),
                python3-unittest2,
                python3-yaml
 XS-Python-Version: all
+Vcs-Browser: https://git.launchpad.net/cloud-init/?h=ubuntu/devel
+Vcs-Git: git://git.launchpad.net/cloud-init -b ubuntu/devel
 Standards-Version: 3.9.8
 
 Package: cloud-init
-- 
cgit v1.2.3