summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/README.source12
-rw-r--r--debian/changelog9
2 files changed, 21 insertions, 0 deletions
diff --git a/debian/README.source b/debian/README.source
index d08c0f6d..a7799aed 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -23,3 +23,15 @@ To cherry pick revisions 391 to tip from from trunk, do something like:
bzr add $(quilt files) debian/patches/${pfile} debian/patches/series
You can set 'e' (end) to not go to tip.
+
+== New snapshot ==
+To import a new snapshot, do:
+
+ uver="0.6.3" # this is the *next* upstream version
+ trunk="../trunk"
+ revno=$(cd "$trunk" && bzr revno)
+ version=${uver}~bzr${revno}
+ tarball=cloud-init-${version}.tar.gz
+ bzr export --format=tgz --revision=${revno} "$tarball" "${trunk}"
+ bzr merge-upstream "$tarball" --version=${version}
+
diff --git a/debian/changelog b/debian/changelog
index a2a0f894..6b0874ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cloud-init (0.6.3~bzr548-0ubuntu1) precise; urgency=low
+
+ * New upstream snapshot.
+ * If public-keys is a string, split it into multiple keys on newline
+ This specifically helps the MAAS data source, and should not negatively
+ affect others.
+
+ -- Scott Moser <smoser@ubuntu.com> Mon, 19 Mar 2012 13:50:50 -0400
+
cloud-init (0.6.3~bzr547-0ubuntu1) precise; urgency=low
* New upstream snapshot.