preseed

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

  1. natty-681396-preseed-url-series
  2. Merge into natty
Proposed by Max Bowsher
Status: Merged
Merged at revision: 914
Proposed branch: lp:~maxb/preseed/natty-681396-preseed-url-series
Merge into: lp:~ubuntu-core-dev/preseed/natty
Diff against target: 46 lines (+13/-3)
3 files modified
debian/changelog (+7/-0)
debian/control (+5/-2)
debian/network-preseed.templates (+1/-1)
To merge this branch: bzr merge lp:~maxb/preseed/natty-681396-preseed-url-series
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+66812@code.launchpad.net
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
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-12-24 23:35:13 +0000
3+++ debian/changelog 2011-07-04 15:37:10 +0000
4@@ -1,3 +1,10 @@
5+preseed (1.48ubuntu1) natty-proposed; urgency=low
6+
7+ * In 'autoserver' mode, fetch the preseed file for 'natty' instead of for
8+ 'squeeze'. LP: #681396
9+
10+ -- Max Bowsher <_@maxb.eu> Sun, 03 Jul 2011 13:01:53 +0100
11+
12 preseed (1.48) unstable; urgency=low
13
14 [ Updated translations ]
15
16=== modified file 'debian/control'
17--- debian/control 2010-05-18 20:15:06 +0000
18+++ debian/control 2011-07-04 15:37:10 +0000
19@@ -1,10 +1,13 @@
20 Source: preseed
21 Section: debian-installer
22 Priority: optional
23-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
24+Maintainer: Ubuntu Installer Team <ubuntu-installer@lists.ubuntu.com>
25+XSBC-Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
26 Uploaders: Philip Hands <phil@hands.com>
27 Build-Depends: debhelper (>= 7.3.10), dpkg-dev (>= 1.9)
28-Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/preseed
29+XS-Debian-Vcs-Browser: http://git.debian.org/?p=d-i/preseed.git
30+XS-Debian-Vcs-Git: git://git.debian.org/d-i/preseed.git
31+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/preseed/natty
32
33 Package: preseed-common
34 Architecture: all
35
36=== modified file 'debian/network-preseed.templates'
37--- debian/network-preseed.templates 2010-03-23 20:39:49 +0000
38+++ debian/network-preseed.templates 2011-07-04 15:37:10 +0000
39@@ -38,6 +38,6 @@
40
41 Template: auto-install/defaultroot
42 Type: string
43-Default: d-i/squeeze/./preseed.cfg
44+Default: d-i/natty/./preseed.cfg
45 Description: for internal use; can be preseeded
46 Path added to local server to give the preseed root

Subscribers

People subscribed via source and target branches