Merge lp:~maxb/ubuntu/oneiric/preseed/681396-preseed-url-series into lp:ubuntu/oneiric/preseed

[Max Bowsher]

[Colin Watson (cjwatson)]

I'd prefer all installer branches to be based on imports of upstream git. There wasn't one of these for preseed so you couldn't have done that; I'm preparing one now, and will transfer your change over to that once it's ready.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-23 09:58:53 +0000
+++ debian/changelog	2011-05-04 11:22:15 +0000
@@ -1,3 +1,10 @@
+preseed (1.49ubuntu1) oneiric; urgency=low
+
+  * In 'autoserver' mode, fetch the preseed file for 'oneiric' instead for
+    'wheezy'. LP: #681396
+
+ -- Max Bowsher <[e-mail]>  Wed, 04 May 2011 10:55:51 +0100
+
 preseed (1.49) unstable; urgency=low
 
   [ Christian Perrier ]

=== modified file 'debian/network-preseed.templates'
--- debian/network-preseed.templates	2011-04-23 09:58:53 +0000
+++ debian/network-preseed.templates	2011-05-04 11:22:15 +0000
@@ -38,6 +38,6 @@
 
 Template: auto-install/defaultroot
 Type: string
-Default: d-i/wheezy/./preseed.cfg
+Default: d-i/oneiric/./preseed.cfg
 Description: for internal use; can be preseeded
  Path added to local server to give the preseed root