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

[Michael Terry]

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

=== 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 @@
 // Automatically upgrade packages from these (origin, archive) pairs
 Unattended-Upgrade::Allowed-Origins {
-	"${distro_id} stable";
+	"${distro_id} ${distro_codename}";
 	"${distro_id} ${distro_codename}-security";
 //	"${distro_id} ${distro_codename}-updates";
-//	"${distro_id} ${distro_codename}-proposed-updates";
+//	"${distro_id} ${distro_codename}-proposed";
+//	"${distro_id} ${distro_codename}-backports";
 };
 
 // List of packages to not update

=== 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 @@
 unattended-upgrades (0.65ubuntu1) UNRELEASED; urgency=low
 
+  [ Michael Vogt ]
   * debian/po/pt_BR.po:
     - updated, thanks to Adriano Rafael Gomes (closes: #607403)
 
- -- Michael Vogt <[e-mail]>  Mon, 20 Dec 2010 09:49:31 +0100
+  [ Nobuto MURATA ]
+  * data/50unattended-upgrades:
+    - adapt repository format for Ubuntu, LP: #691886
+
+ -- Nobuto MURATA <[e-mail]>  Wed, 22 Dec 2010 09:51:08 -0500
 
 unattended-upgrades (0.64ubuntu1) natty; urgency=low