Merge lp:~mterry/unattended-upgrades/691886 into lp:~ubuntu-core-dev/unattended-upgrades/ubuntu

Proposed by Michael Terry
Status: Merged
Merged at revision: 154
Proposed branch: lp:~mterry/unattended-upgrades/691886
Merge into: lp:~ubuntu-core-dev/unattended-upgrades/ubuntu
Diff against target: 35 lines (+9/-3)
2 files modified
data/50unattended-upgrades (+3/-2)
debian/changelog (+6/-1)
To merge this branch: bzr merge lp:~mterry/unattended-upgrades/691886
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+44470@code.launchpad.net

Description of the change

See linked bug for details. This patch is by Nobuto MURATA.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/50unattended-upgrades'
--- data/50unattended-upgrades 2010-11-10 14:21:56 +0000
+++ data/50unattended-upgrades 2010-12-22 14:56:53 +0000
@@ -1,9 +1,10 @@
1// Automatically upgrade packages from these (origin, archive) pairs1// Automatically upgrade packages from these (origin, archive) pairs
2Unattended-Upgrade::Allowed-Origins {2Unattended-Upgrade::Allowed-Origins {
3 "${distro_id} stable";3 "${distro_id} ${distro_codename}";
4 "${distro_id} ${distro_codename}-security";4 "${distro_id} ${distro_codename}-security";
5// "${distro_id} ${distro_codename}-updates";5// "${distro_id} ${distro_codename}-updates";
6// "${distro_id} ${distro_codename}-proposed-updates";6// "${distro_id} ${distro_codename}-proposed";
7// "${distro_id} ${distro_codename}-backports";
7};8};
89
9// List of packages to not update10// List of packages to not update
1011
=== modified file 'debian/changelog'
--- debian/changelog 2010-12-20 08:50:30 +0000
+++ debian/changelog 2010-12-22 14:56:53 +0000
@@ -1,9 +1,14 @@
1unattended-upgrades (0.65ubuntu1) UNRELEASED; urgency=low1unattended-upgrades (0.65ubuntu1) UNRELEASED; urgency=low
22
3 [ Michael Vogt ]
3 * debian/po/pt_BR.po:4 * debian/po/pt_BR.po:
4 - updated, thanks to Adriano Rafael Gomes (closes: #607403)5 - updated, thanks to Adriano Rafael Gomes (closes: #607403)
56
6 -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Dec 2010 09:49:31 +01007 [ Nobuto MURATA ]
8 * data/50unattended-upgrades:
9 - adapt repository format for Ubuntu, LP: #691886
10
11 -- Nobuto MURATA <nobuto@nobuto-murata.org> Wed, 22 Dec 2010 09:51:08 -0500
712
8unattended-upgrades (0.64ubuntu1) natty; urgency=low13unattended-upgrades (0.64ubuntu1) natty; urgency=low
914

Subscribers

People subscribed via source and target branches

to all changes: