diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:36 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:36 -0400 |
| commit | 2b5419fcfdca1720a644717053163bbbdc192963 (patch) | |
| tree | 4822947b8bb06057b64e63d161fc0899ddc0370d | |
| parent | 28c2f11f4fb4d3aa25e26b8f62daecb5c30ee276 (diff) | |
| download | cloud-init-git-ubuntu/0.6.3-0ubuntu1.23.tar.gz | |
Import version 0.6.3-0ubuntu1.23ubuntu/0.6.3-0ubuntu1.23
Imported using git-dsc-commit.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/lp-1177432-same-archives-as-ubuntu-server.patch | 46 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 54 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 59280b63..9d759845 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cloud-init (0.6.3-0ubuntu1.23) precise; 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:44 -0700 + cloud-init (0.6.3-0ubuntu1.22) precise; urgency=medium * debian/patches/lp-1458052-redact-azure-password.patch: 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..d638534a --- /dev/null +++ b/debian/patches/lp-1177432-same-archives-as-ubuntu-server.patch @@ -0,0 +1,46 @@ +--- a/templates/sources.list.tmpl ++++ b/templates/sources.list.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 adb555a3..76adf59e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -38,3 +38,4 @@ lp-1492420-config-drive_skip-invalid-file-paths.patch lp-1492468-config-drive_alternative-interface-path.patch lp-1458052-redact-azure-password.patch lp-1382481-cloudstack-vr.patch +lp-1177432-same-archives-as-ubuntu-server.patch |