On Tue, Mar 16, 2004 at 04:18:26PM +0100, Petter Reinholdtsen wrote:
> [Ian Murdock]
> > That's correct. We can upload Discover 2 whenever you are ready to
> > do the transition. I actually don't have an up to date key in the
> > keyring, so Jeff Licquia will be uploading Discover 2 for us for
> > now.
> Sounds good. I'll leave the uploading to Jeff, assuming it happens
> fairly fast after the discover1 packages are uploaded. I do not want
> the discover1 packages to hit the archive without the discover 2
> packages following shortly after. :)
Ok, everything looks good to me on the discover1 front. I haven't looked
at what's going on with discover2, but I'm sure you guys have it well in
hand. All of Petter's changes look good from here, thanks a ton for
handling this. I've attached a patch to the d-i build system that'll
have to be applied when both uploads are made to unstable. Petter
suggested a Tuesday upload time, which I think is a good idea if Progeny
is ready. Is that good for all involved (including someone to apply the
attached patch to the d-i repository)?
- David Nusinow
diff -u -r debian-installer/installer/build/pkg-lists/access/i386
debian-installer.work/installer/build/pkg-lists/access/i386
--- debian-installer/installer/build/pkg-lists/access/i386 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/access/i386 2004-03-22
02:32:03.000000000 -0500
@@ -12,7 +12,7 @@
console-keymaps-at
console-keymaps-usb
-discover-udeb
-discover-data-udeb
+discover1-udeb
+discover1-data-udeb
dhcp-client-udeb
diff -u -r debian-installer/installer/build/pkg-lists/cdrom/alpha
debian-installer.work/installer/build/pkg-lists/cdrom/alpha
--- debian-installer/installer/build/pkg-lists/cdrom/alpha 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/cdrom/alpha 2004-03-22
02:33:35.000000000 -0500
@@ -3,8 +3,8 @@
socket-modules-${kernel:Version}
console-keymaps-at
console-keymaps-usb
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
cdrom-core-modules-${kernel:Version}
cdrom-modules-${kernel:Version}
ide-modules-${kernel:Version}
diff -u -r debian-installer/installer/build/pkg-lists/cdrom/arm
debian-installer.work/installer/build/pkg-lists/cdrom/arm
--- debian-installer/installer/build/pkg-lists/cdrom/arm 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/cdrom/arm 2004-03-22
02:33:42.000000000 -0500
@@ -1,6 +1,6 @@
console-keymaps-acorn
console-keymaps-at
console-keymaps-usb
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
kbd-chooser
diff -u -r debian-installer/installer/build/pkg-lists/cdrom/hppa
debian-installer.work/installer/build/pkg-lists/cdrom/hppa
--- debian-installer/installer/build/pkg-lists/cdrom/hppa 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/cdrom/hppa 2004-03-22
02:34:02.000000000 -0500
@@ -1,7 +1,7 @@
cdebconf-text-udeb
console-keymaps-at
console-keymaps-usb
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
kbd-chooser
fdisk-udeb
diff -u -r debian-installer/installer/build/pkg-lists/cdrom/i386
debian-installer.work/installer/build/pkg-lists/cdrom/i386
--- debian-installer/installer/build/pkg-lists/cdrom/i386 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/cdrom/i386 2004-03-22
02:34:09.000000000 -0500
@@ -2,8 +2,8 @@
socket-modules-${kernel:Version}
console-keymaps-at
console-keymaps-usb
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
floppy-modules-${kernel:Version}
fat-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
diff -u -r debian-installer/installer/build/pkg-lists/cdrom/ia64
debian-installer.work/installer/build/pkg-lists/cdrom/ia64
--- debian-installer/installer/build/pkg-lists/cdrom/ia64 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/cdrom/ia64 2004-03-22
02:34:22.000000000 -0500
@@ -4,8 +4,8 @@
cdebconf-text-udeb
console-keymaps-at
console-keymaps-usb
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
kbd-chooser
usb-discover
nic-modules-${kernel:Version}
diff -u -r debian-installer/installer/build/pkg-lists/cdrom/m68k
debian-installer.work/installer/build/pkg-lists/cdrom/m68k
--- debian-installer/installer/build/pkg-lists/cdrom/m68k 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/cdrom/m68k 2004-03-22
02:34:39.000000000 -0500
@@ -4,8 +4,8 @@
console-keymaps-amiga
console-keymaps-mac
console-keymaps-at
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
kbd-chooser
archdetect
userdevfs
diff -u -r debian-installer/installer/build/pkg-lists/cdrom/powerpc
debian-installer.work/installer/build/pkg-lists/cdrom/powerpc
--- debian-installer/installer/build/pkg-lists/cdrom/powerpc 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/cdrom/powerpc 2004-03-22
02:34:54.000000000 -0500
@@ -3,8 +3,8 @@
console-keymaps-amiga
console-keymaps-at
console-keymaps-usb
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
kbd-chooser
# The following can be removed once unix socket support is compiled
# in to the kernel.
diff -u -r debian-installer/installer/build/pkg-lists/cdrom/sparc
debian-installer.work/installer/build/pkg-lists/cdrom/sparc
--- debian-installer/installer/build/pkg-lists/cdrom/sparc 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/cdrom/sparc 2004-03-22
02:35:02.000000000 -0500
@@ -1,5 +1,5 @@
console-keymaps-usb
console-keymaps-sun
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
kbd-chooser
diff -u -r debian-installer/installer/build/pkg-lists/demo/i386
debian-installer.work/installer/build/pkg-lists/demo/i386
--- debian-installer/installer/build/pkg-lists/demo/i386 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/demo/i386 2004-03-22
02:35:23.000000000 -0500
@@ -6,8 +6,8 @@
console-keymaps-at
console-keymaps-usb
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
fb-modules-${kernel:Version}
nic-shared-modules-${kernel:Version}
diff -u -r debian-installer/installer/build/pkg-lists/demo/m68k
debian-installer.work/installer/build/pkg-lists/demo/m68k
--- debian-installer/installer/build/pkg-lists/demo/m68k 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/demo/m68k 2004-03-22
02:35:36.000000000 -0500
@@ -2,8 +2,8 @@
console-keymaps-amiga
console-keymaps-mac
console-keymaps-at
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
kbd-chooser
userdevfs
cdebconf-priority
diff -u -r debian-installer/installer/build/pkg-lists/floppy/hppa
debian-installer.work/installer/build/pkg-lists/floppy/hppa
--- debian-installer/installer/build/pkg-lists/floppy/hppa 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/floppy/hppa 2004-03-22
02:36:01.000000000 -0500
@@ -1,7 +1,7 @@
countrychooser
iso-3166-udeb
-discover-udeb
-discover-data-udeb
+discover1-udeb
+discover1-data-udeb
# This is dhcp client we're using on hppa, but it may vary for other
# arches, which is why it is not in common.
dhcp-client-udeb
diff -u -r debian-installer/installer/build/pkg-lists/floppy/i386
debian-installer.work/installer/build/pkg-lists/floppy/i386
--- debian-installer/installer/build/pkg-lists/floppy/i386 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/floppy/i386 2004-03-22
02:36:17.000000000 -0500
@@ -2,8 +2,8 @@
console-keymaps-at
console-keymaps-usb
-discover-udeb
-discover-data-udeb
+discover1-udeb
+discover1-data-udeb
# This is needed for proper display of utf-8.
fb-modules-${kernel:Version}
diff -u -r debian-installer/installer/build/pkg-lists/floppy/ia64
debian-installer.work/installer/build/pkg-lists/floppy/ia64
--- debian-installer/installer/build/pkg-lists/floppy/ia64 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/floppy/ia64 2004-03-22
02:36:29.000000000 -0500
@@ -5,5 +5,5 @@
# This is dhcp client we're using on ia64, but it may vary for other
# arches, which is why it is not in common.
dhcp-client-udeb
-discover-udeb
-discover-data-udeb
+discover1-udeb
+discover1-data-udeb
diff -u -r debian-installer/installer/build/pkg-lists/floppy/m68k
debian-installer.work/installer/build/pkg-lists/floppy/m68k
--- debian-installer/installer/build/pkg-lists/floppy/m68k 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/floppy/m68k 2004-03-22
02:36:40.000000000 -0500
@@ -4,8 +4,8 @@
console-keymaps-amiga
console-keymaps-mac
console-keymaps-at
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
kbd-chooser
userdevfs
dhcp-client-udeb
diff -u -r debian-installer/installer/build/pkg-lists/floppy/powerpc
debian-installer.work/installer/build/pkg-lists/floppy/powerpc
--- debian-installer/installer/build/pkg-lists/floppy/powerpc 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/floppy/powerpc 2004-03-22
02:36:47.000000000 -0500
@@ -10,7 +10,7 @@
console-keymaps-amiga
console-keymaps-at
console-keymaps-usb
-discover-udeb
-discover-data-udeb
+discover1-udeb
+discover1-data-udeb
kbd-chooser
dhcp-client-udeb
diff -u -r debian-installer/installer/build/pkg-lists/hd-media/i386
debian-installer.work/installer/build/pkg-lists/hd-media/i386
--- debian-installer/installer/build/pkg-lists/hd-media/i386 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/hd-media/i386 2004-03-22
02:37:06.000000000 -0500
@@ -2,8 +2,8 @@
socket-modules-${kernel:Version}
console-keymaps-at
console-keymaps-usb
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
input-modules-${kernel:Version}
fb-modules-${kernel:Version}
kbd-chooser
diff -u -r debian-installer/installer/build/pkg-lists/hd-media/m68k
debian-installer.work/installer/build/pkg-lists/hd-media/m68k
--- debian-installer/installer/build/pkg-lists/hd-media/m68k 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/hd-media/m68k 2004-03-22
02:37:12.000000000 -0500
@@ -4,8 +4,8 @@
console-keymaps-amiga
console-keymaps-mac
console-keymaps-at
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
kbd-chooser
archdetect
userdevfs
diff -u -r debian-installer/installer/build/pkg-lists/nativehd/m68k
debian-installer.work/installer/build/pkg-lists/nativehd/m68k
--- debian-installer/installer/build/pkg-lists/nativehd/m68k 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/nativehd/m68k 2004-03-22
02:37:36.000000000 -0500
@@ -2,8 +2,8 @@
console-keymaps-amiga
console-keymaps-mac
console-keymaps-at
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
kbd-chooser
userdevfs
dhcp-client-udeb
diff -u -r debian-installer/installer/build/pkg-lists/netboot/i386
debian-installer.work/installer/build/pkg-lists/netboot/i386
--- debian-installer/installer/build/pkg-lists/netboot/i386 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/netboot/i386 2004-03-22
02:37:59.000000000 -0500
@@ -3,8 +3,8 @@
bogl-bterm-udeb
-discover-udeb
-discover-data-udeb
+discover1-udeb
+discover1-data-udeb
usb-discover
nic-shared-modules-${kernel:Version}
socket-modules-${kernel:Version}
diff -u -r debian-installer/installer/build/pkg-lists/netboot/ia64
debian-installer.work/installer/build/pkg-lists/netboot/ia64
--- debian-installer/installer/build/pkg-lists/netboot/ia64 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/netboot/ia64 2004-03-22
02:38:06.000000000 -0500
@@ -8,8 +8,8 @@
scsi-modules-${kernel:Version}
usb-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
-discover-udeb
-discover-data-udeb
+discover1-udeb
+discover1-data-udeb
usb-discover
dhcp-client-udeb
input-modules-${kernel:Version}
diff -u -r debian-installer/installer/build/pkg-lists/netboot/m68k
debian-installer.work/installer/build/pkg-lists/netboot/m68k
--- debian-installer/installer/build/pkg-lists/netboot/m68k 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/netboot/m68k 2004-03-22
02:38:16.000000000 -0500
@@ -2,8 +2,8 @@
console-keymaps-amiga
console-keymaps-mac
console-keymaps-at
-discover-data-udeb
-discover-udeb
+discover1-data-udeb
+discover1-udeb
userdevfs
dhcp-client-udeb
cdebconf-priority
diff -u -r debian-installer/installer/build/pkg-lists/netboot/powerpc
debian-installer.work/installer/build/pkg-lists/netboot/powerpc
--- debian-installer/installer/build/pkg-lists/netboot/powerpc 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/netboot/powerpc 2004-03-22
02:38:31.000000000 -0500
@@ -1,7 +1,7 @@
console-keymaps-at
console-keymaps-usb
-discover-udeb
-discover-data-udeb
+discover1-udeb
+discover1-data-udeb
usb-discover
ide-modules-${kernel:Version}
#nic-shared-modules-${kernel:Version}
diff -u -r debian-installer/installer/build/pkg-lists/netboot/sparc
debian-installer.work/installer/build/pkg-lists/netboot/sparc
--- debian-installer/installer/build/pkg-lists/netboot/sparc 2004-03-21
22:53:24.000000000 -0500
+++ debian-installer.work/installer/build/pkg-lists/netboot/sparc 2004-03-22
02:38:41.000000000 -0500
@@ -1,8 +1,8 @@
console-keymaps-usb
console-keymaps-sun
dhcp-client-udeb
-discover-udeb
-discover-data-udeb
+discover1-udeb
+discover1-data-udeb
kbd-chooser
bogl-bterm-udeb
