summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2017-01-10 11:25:31 -0500
committerScott Moser <smoser@brickies.net>2017-01-10 11:25:31 -0500
commiteed347094f37048bbf6bd0a0efa32934e5382844 (patch)
tree5609ff5942eb9278e2bc4a5b4ca8a07b06cda045
parent0a488598ea1f0ccc577bac780b5de2b522f278f9 (diff)
downloadcloud-init-git-eed347094f37048bbf6bd0a0efa32934e5382844.tar.gz
Import version 0.7.5-0ubuntu1.13ubuntu/0.7.5-0ubuntu1.13
Imported using git-import-dsc
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/lp-1177432-enable_backports.patch32
-rw-r--r--debian/patches/series1
3 files changed, 40 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 06f9ebf9..c1ac867e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cloud-init (0.7.5-0ubuntu1.13) trusty; urgency=medium
+
+ * d/patches/lp-1177432-enable_backports.patch: Enable backports apt pocket
+ (LP: #1177432).
+
+ -- Ben Howard <ben.howard@ubuntu.com> Mon, 02 Nov 2015 08:52:09 -0700
+
cloud-init (0.7.5-0ubuntu1.12) trusty; urgency=medium
* d/patches/lp-1493453-nocloudds-vendor_data.patch:
diff --git a/debian/patches/lp-1177432-enable_backports.patch b/debian/patches/lp-1177432-enable_backports.patch
new file mode 100644
index 00000000..3a417ff1
--- /dev/null
+++ b/debian/patches/lp-1177432-enable_backports.patch
@@ -0,0 +1,32 @@
+Description: Enable backports apt pocket
+Author: Ben Howard <ben.howard@canonical.com>
+Bug: https://bugs.launchpad.net/cloud-init/+bug/1177432
+--- a/templates/sources.list.ubuntu.tmpl
++++ b/templates/sources.list.ubuntu.tmpl
+@@ -35,15 +35,22 @@
+ # deb $mirror $codename-updates multiverse
+ # deb-src $mirror $codename-updates multiverse
+
+-\## Uncomment the following two lines to add software from the 'backports'
+-\## repository.
+ \## N.B. software from this repository may not have been tested as
+ \## extensively as that contained in the main release, although it includes
+ \## newer versions of some applications which may provide useful features.
+ \## Also, please note that software in backports WILL NOT receive any review
+ \## or updates from the Ubuntu security team.
+-# deb $mirror $codename-backports main restricted universe multiverse
+-# deb-src $mirror $codename-backports main restricted universe multiverse
++deb $mirror $codename-backports main
++deb-src $mirror $codename-backports main
++deb $mirror $codename-backports universe
++deb-src $mirror $codename-backports universe
++
++\## Uncomment the following lines to add software from the 'backports'
++\## repository for mulitverse and restricted.
++# deb $mirror $codename-backports multiverse
++# deb-src $mirror $codename-backports multiverse
++# deb $mirror $codename-backports restricted
++# deb-src $mirror $codename-backports restricted
+
+ \## Uncomment the following two lines to add software from Canonical's
+ \## 'partner' repository.
diff --git a/debian/patches/series b/debian/patches/series
index fd0fb920..8482f687 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ lp-1490796-azure-fix-mount_cb-for-symlinks.patch
lp-1469260-fix-consumption-of-vendor-data.patch
lp-1461242-generate-ed25519-host-keys.patch
lp-1493453-nocloudds-vendor_data.patch
+lp-1177432-enable_backports.patch