Merge lp:~laney/apt-setup/backports-default into lp:~ubuntu-core-dev/apt-setup/ubuntu

[Iain Lane]

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/apt-mirror-setup.templates-ubuntu'
--- debian/apt-mirror-setup.templates-ubuntu	2010-10-04 08:48:05 +0000
+++ debian/apt-mirror-setup.templates-ubuntu	2011-05-10 16:08:26 +0000
@@ -51,7 +51,7 @@
 
 Template: apt-setup/backports
 Type: boolean
-Default: false
+Default: true
 # This template is used by the Ubuntu version of d-i.
 # :sl2:
 _Description: Use backported software?
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-04-08 11:39:47 +0000
+++ debian/changelog	2011-05-10 16:08:26 +0000
@@ -1,3 +1,10 @@
+apt-setup (1:0.49ubuntu5) UNRELEASED; urgency=low
+
+  * Enable backports by default now that we have NotAutomatic enabled and
+    working.
+
+ -- Iain Lane <[e-mail]>  Tue, 10 May 2011 16:52:00 +0100
+
 apt-setup (1:0.49ubuntu4) natty; urgency=low
 
   * Disable partner by default again (accidentally enabled in