Import version 0.7.5-0ubuntu1.14ubuntu/0.7.5-0ubuntu1.14

Imported using git-import-dsc

4 files changed, 54 insertions, 33 deletions

diff --git a/debian/changelog b/debian/changelog
index c1ac867e..64279daa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cloud-init (0.7.5-0ubuntu1.14) trusty; urgency=medium
+
+  * d/patches/lp-1177432-same-archives-as-ubuntu-server.patch: use the
+    same archive pockets as Ubuntu Server (LP: #1177432).
+
+ -- Ben Howard <ben.howard@ubuntu.com>  Thu, 05 Nov 2015 09:50:57 -0700
+
 cloud-init (0.7.5-0ubuntu1.13) trusty; urgency=medium
 
   * d/patches/lp-1177432-enable_backports.patch: Enable backports apt pocket
diff --git a/debian/patches/lp-1177432-enable_backports.patch b/debian/patches/lp-1177432-enable_backports.patch
deleted file mode 100644
index 3a417ff1..00000000
--- a/debian/patches/lp-1177432-enable_backports.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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/lp-1177432-same-archives-as-ubuntu-server.patch b/debian/patches/lp-1177432-same-archives-as-ubuntu-server.patch
new file mode 100644
index 00000000..495569be
--- /dev/null
+++ b/debian/patches/lp-1177432-same-archives-as-ubuntu-server.patch
@@ -0,0 +1,46 @@
+--- a/templates/sources.list.ubuntu.tmpl
++++ b/templates/sources.list.ubuntu.tmpl
+@@ -9,13 +9,13 @@
+ 
+ # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
+ # newer versions of the distribution.
+-deb $mirror $codename main
+-deb-src $mirror $codename main
++deb $mirror $codename main restricted
++deb-src $mirror $codename main restricted
+ 
+ \## Major bug fix updates produced after the final release of the
+ \## distribution.
+-deb $mirror $codename-updates main
+-deb-src $mirror $codename-updates main
++deb $mirror $codename-updates main restricted
++deb-src $mirror $codename-updates main restricted
+ 
+ \## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+ \## team. Also, please note that software in universe WILL NOT receive any
+@@ -30,10 +30,10 @@
+ \## your rights to use the software. Also, please note that software in 
+ \## multiverse WILL NOT receive any review or updates from the Ubuntu
+ \## security team.
+-# deb $mirror $codename multiverse
+-# deb-src $mirror $codename multiverse
+-# deb $mirror $codename-updates multiverse
+-# deb-src $mirror $codename-updates multiverse
++deb $mirror $codename multiverse
++deb-src $mirror $codename multiverse
++deb $mirror $codename-updates multiverse
++deb-src $mirror $codename-updates multiverse
+ 
+ \## Uncomment the following two lines to add software from the 'backports'
+ \## repository.
+@@ -42,8 +42,8 @@
+ \## 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 restricted universe multiverse
++deb-src $mirror $codename-backports main restricted universe multiverse
+ 
+ \## Uncomment the following two lines to add software from Canonical's
+ \## 'partner' repository.
diff --git a/debian/patches/series b/debian/patches/series
index 8482f687..7072f091 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,4 +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
+lp-1177432-same-archives-as-ubuntu-server.patch