Merge lp:~maxb/preseed/maverick-681396-preseed-url-series into lp:~ubuntu-core-dev/preseed/maverick

[Max Bowsher]

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-24 15:35:07 +0000
+++ debian/changelog	2011-07-04 15:38:29 +0000
@@ -1,3 +1,10 @@
+preseed (1.45ubuntu1) maverick-proposed; urgency=low
+
+  * In 'autoserver' mode, fetch the preseed file for 'maverick' instead of for
+    'squeeze'. LP: #681396
+
+ -- Max Bowsher <[e-mail]>  Sun, 03 Jul 2011 13:00:47 +0100
+
 preseed (1.45) unstable; urgency=low
 
   * Integrate auto-install support in the preseed udebs.
 
=== modified file 'debian/control'
--- debian/control	2009-08-16 08:12:43 +0000
+++ debian/control	2011-07-04 15:38:29 +0000
@@ -1,10 +1,13 @@
 Source: preseed
 Section: debian-installer
 Priority: optional
-Maintainer: Debian Install System Team <[e-mail]>
+Maintainer: Ubuntu Installer Team <[e-mail]>
+XSBC-Original-Maintainer: Debian Install System Team <[e-mail]>
 Uploaders: Joey Hess <[e-mail]>, Philip Hands <[e-mail]>
 Build-Depends: debhelper (>= 7.3.10), dpkg-dev (>= 1.9)
-Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/preseed
+XS-Debian-Vcs-Browser: http://git.debian.org/?p=d-i/preseed.git
+XS-Debian-Vcs-Git: git://git.debian.org/d-i/preseed.git
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/preseed/maverick
 
 Package: preseed-common
 Architecture: all
 
=== modified file 'debian/network-preseed.templates'
--- debian/network-preseed.templates	2010-03-23 20:39:49 +0000
+++ debian/network-preseed.templates	2011-07-04 15:38:29 +0000
@@ -38,6 +38,6 @@
 
 Template: auto-install/defaultroot
 Type: string
-Default: d-i/squeeze/./preseed.cfg
+Default: d-i/maverick/./preseed.cfg
 Description: for internal use; can be preseeded
  Path added to local server to give the preseed root