[PATCH 1/4] Use 'installed-base' virtual package dependency instead of explicit 'base-installer' one
From: Otavio Salvador <otavio@ossystems.com.br>
To allow a better flexibility regarting the way of installer does the
system installation a new virtual package called
'installed-base'. base-installer package has been change to provide
this new virtual package and the other packages depending on it has
also been change.
The affected package are:
- aboot-installer
- apt-setup
- colo-installer
- elilo-installer
- finish-install
- flash-kernel
- nobootloader
- palo-installer
- sibyl-installer
- silo-installer
- zipl-installer
---
packages/apt-setup/debian/changelog | 7 +++++++
packages/apt-setup/debian/control | 2 +-
.../arch/alpha/aboot-installer/debian/changelog | 7 +++++++
packages/arch/alpha/aboot-installer/debian/control | 2 +-
packages/arch/hppa/palo-installer/debian/changelog | 7 +++++++
packages/arch/hppa/palo-installer/debian/control | 2 +-
.../arch/ia64/elilo-installer/debian/changelog | 7 +++++++
packages/arch/ia64/elilo-installer/debian/control | 2 +-
.../arch/mips/sibyl-installer/debian/changelog | 7 +++++++
packages/arch/mips/sibyl-installer/debian/control | 2 +-
.../arch/mipsel/colo-installer/debian/changelog | 7 +++++++
packages/arch/mipsel/colo-installer/debian/control | 2 +-
packages/arch/s390/zipl-installer/debian/changelog | 7 +++++++
packages/arch/s390/zipl-installer/debian/control | 2 +-
.../arch/sparc/silo-installer/debian/changelog | 7 +++++++
packages/arch/sparc/silo-installer/debian/control | 2 +-
packages/base-installer/debian/changelog | 7 +++++++
packages/base-installer/debian/control | 2 +-
packages/finish-install/debian/changelog | 7 +++++++
packages/finish-install/debian/control | 2 +-
packages/flash-kernel/debian/changelog | 7 +++++++
packages/flash-kernel/debian/control | 2 +-
packages/nobootloader/debian/changelog | 7 +++++++
packages/nobootloader/debian/control | 2 +-
24 files changed, 96 insertions(+), 12 deletions(-)
diff --git a/packages/apt-setup/debian/changelog b/packages/apt-setup/debian/changelog
index 0ffa0a8..ba6011d 100644
--- a/packages/apt-setup/debian/changelog
+++ b/packages/apt-setup/debian/changelog
@@ -1,3 +1,10 @@
+apt-setup (1:0.23) UNRELEASED; urgency=low
+
+ * Replace 'base-installer' dependency by 'installed-base' virtual
+ package. Needs base-installer 1.81.
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Sun, 17 Jun 2007 09:56:15 -0300
+
apt-setup (1:0.22) unstable; urgency=low
* 50mirror: default suite to codename, similar to what we already do for
diff --git a/packages/apt-setup/debian/control b/packages/apt-setup/debian/control
index 2497fb1..ef938ec 100644
--- a/packages/apt-setup/debian/control
+++ b/packages/apt-setup/debian/control
@@ -11,7 +11,7 @@ XC-Package-Type: udeb
Architecture: all
Priority: standard
XB-Installer-Menu-Item: 7000
-Depends: apt-mirror-setup, base-installer (>= 1.49), ${misc:Depends}
+Depends: apt-mirror-setup, installed-base, ${misc:Depends}
Description: Configure apt
Package: apt-mirror-setup
diff --git a/packages/arch/alpha/aboot-installer/debian/changelog b/packages/arch/alpha/aboot-installer/debian/changelog
index 888f85a..ae67eab 100644
--- a/packages/arch/alpha/aboot-installer/debian/changelog
+++ b/packages/arch/alpha/aboot-installer/debian/changelog
@@ -1,3 +1,10 @@
+aboot-installer (0.0.27) UNRELEASED; urgency=low
+
+ * Replace 'base-installer' dependency by 'installed-base' virtual
+ package. Needs base-installer 1.81.
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Sun, 17 Jun 2007 09:56:32 -0300
+
aboot-installer (0.0.26) unstable; urgency=low
[ Joey Hess ]
diff --git a/packages/arch/alpha/aboot-installer/debian/control b/packages/arch/alpha/aboot-installer/debian/control
index 4dc2471..9fad17b 100644
--- a/packages/arch/alpha/aboot-installer/debian/control
+++ b/packages/arch/alpha/aboot-installer/debian/control
@@ -11,7 +11,7 @@ Package: aboot-installer
XC-Package-Type: udeb
Architecture: alpha
Provides: bootable-system
-Depends: cdebconf-udeb, base-installer, chroot, partconf-find-partitions, di-utils-mapdevfs, parted-udeb
+Depends: cdebconf-udeb, installed-base, chroot, partconf-find-partitions, di-utils-mapdevfs, parted-udeb
XB-Installer-Menu-Item: 7300
Description: Install aboot on a hard disk
This udeb will install aboot on the hard disk.
diff --git a/packages/arch/hppa/palo-installer/debian/changelog b/packages/arch/hppa/palo-installer/debian/changelog
index b88a9eb..27cf38b 100644
--- a/packages/arch/hppa/palo-installer/debian/changelog
+++ b/packages/arch/hppa/palo-installer/debian/changelog
@@ -1,3 +1,10 @@
+palo-installer (0.0.11) UNRELEASED; urgency=low
+
+ * Replace 'base-installer' dependency by 'installed-base' virtual
+ package. Needs base-installer 1.81.
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Sun, 17 Jun 2007 09:57:05 -0300
+
palo-installer (0.0.10) unstable; urgency=low
* Merge from Ubuntu (LaMont Jones):
diff --git a/packages/arch/hppa/palo-installer/debian/control b/packages/arch/hppa/palo-installer/debian/control
index 2559f13..07f9423 100644
--- a/packages/arch/hppa/palo-installer/debian/control
+++ b/packages/arch/hppa/palo-installer/debian/control
@@ -10,6 +10,6 @@ Package: palo-installer
XC-Package-Type: udeb
Architecture: hppa
Provides: bootable-system
-Depends: cdebconf-udeb, base-installer, di-utils-mapdevfs
+Depends: cdebconf-udeb, installed-base, di-utils-mapdevfs
XB-Installer-Menu-Item: 7300
Description: Install PALO on a hard disk
diff --git a/packages/arch/ia64/elilo-installer/debian/changelog b/packages/arch/ia64/elilo-installer/debian/changelog
index ffe43c4..44cfa21 100644
--- a/packages/arch/ia64/elilo-installer/debian/changelog
+++ b/packages/arch/ia64/elilo-installer/debian/changelog
@@ -1,3 +1,10 @@
+elilo-installer (1.12) UNRELEASED; urgency=low
+
+ * Replace 'base-installer' dependency by 'installed-base' virtual
+ package. Needs base-installer 1.81.
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Sun, 17 Jun 2007 09:57:59 -0300
+
elilo-installer (1.11) unstable; urgency=low
[ Colin Watson ]
diff --git a/packages/arch/ia64/elilo-installer/debian/control b/packages/arch/ia64/elilo-installer/debian/control
index 8d09f43..17fa698 100644
--- a/packages/arch/ia64/elilo-installer/debian/control
+++ b/packages/arch/ia64/elilo-installer/debian/control
@@ -11,6 +11,6 @@ Package: elilo-installer
XC-Package-Type: udeb
Architecture: i386 ia64
Provides: bootable-system
-Depends: cdebconf-udeb, base-installer, partconf-find-partitions (>= 1.08), di-utils-mapdevfs, fat-modules, efi-modules
+Depends: cdebconf-udeb, installed-base, partconf-find-partitions (>= 1.08), di-utils-mapdevfs, fat-modules, efi-modules
XB-Installer-Menu-Item: 7600
Description: Install elilo on a hard disk
diff --git a/packages/arch/mips/sibyl-installer/debian/changelog b/packages/arch/mips/sibyl-installer/debian/changelog
index 608f2c8..e30c791 100644
--- a/packages/arch/mips/sibyl-installer/debian/changelog
+++ b/packages/arch/mips/sibyl-installer/debian/changelog
@@ -1,3 +1,10 @@
+sibyl-installer (1.10) UNRELEASED; urgency=low
+
+ * Replace 'base-installer' dependency by 'installed-base' virtual
+ package. Needs base-installer 1.81.
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Sun, 17 Jun 2007 09:58:32 -0300
+
sibyl-installer (1.9) unstable; urgency=low
[ Joey Hess ]
diff --git a/packages/arch/mips/sibyl-installer/debian/control b/packages/arch/mips/sibyl-installer/debian/control
index 7a45aa1..11b15f3 100644
--- a/packages/arch/mips/sibyl-installer/debian/control
+++ b/packages/arch/mips/sibyl-installer/debian/control
@@ -12,7 +12,7 @@ XC-Package-Type: udeb
Architecture: mips mipsel
XB-Subarchitecture: sb1-bcm91250a sb1a-bcm91480b
Provides: bootable-system
-Depends: cdebconf-udeb, base-installer (>= 1.23), di-utils-mapdevfs
+Depends: cdebconf-udeb, installed-base, di-utils-mapdevfs
XB-Installer-Menu-Item: 7300
Description: Install the SiByl boot loader on your disk
This udeb will install the SiByl loader colo on your hard disk.
diff --git a/packages/arch/mipsel/colo-installer/debian/changelog b/packages/arch/mipsel/colo-installer/debian/changelog
index 1654af3..86fc302 100644
--- a/packages/arch/mipsel/colo-installer/debian/changelog
+++ b/packages/arch/mipsel/colo-installer/debian/changelog
@@ -1,3 +1,10 @@
+colo-installer (1.10) UNRELEASED; urgency=low
+
+ * Replace 'base-installer' dependency by 'installed-base' virtual
+ package. Needs base-installer 1.81.
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Sun, 17 Jun 2007 09:59:12 -0300
+
colo-installer (1.9) unstable; urgency=low
[ Joey Hess ]
diff --git a/packages/arch/mipsel/colo-installer/debian/control b/packages/arch/mipsel/colo-installer/debian/control
index 14aaaba..feda592 100644
--- a/packages/arch/mipsel/colo-installer/debian/control
+++ b/packages/arch/mipsel/colo-installer/debian/control
@@ -11,6 +11,6 @@ XC-Package-Type: udeb
Architecture: mipsel
XB-Subarchitecture: cobalt
Provides: bootable-system
-Depends: cdebconf-udeb, base-installer (>= 1.23), di-utils-mapdevfs
+Depends: cdebconf-udeb, installed-base, di-utils-mapdevfs
XB-Installer-Menu-Item: 7300
Description: Install the Cobalt boot loader on your disk
diff --git a/packages/arch/s390/zipl-installer/debian/changelog b/packages/arch/s390/zipl-installer/debian/changelog
index 6f6ad9d..605c1df 100644
--- a/packages/arch/s390/zipl-installer/debian/changelog
+++ b/packages/arch/s390/zipl-installer/debian/changelog
@@ -1,3 +1,10 @@
+zipl-installer (0.0.13) UNRELEASED; urgency=low
+
+ * Replace 'base-installer' dependency by 'installed-base' virtual
+ package. Needs base-installer 1.81.
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Sun, 17 Jun 2007 09:59:38 -0300
+
zipl-installer (0.0.12) unstable; urgency=low
* Include debconf template (menu title) in udeb.
diff --git a/packages/arch/s390/zipl-installer/debian/control b/packages/arch/s390/zipl-installer/debian/control
index e8ec1b4..1cc322f 100644
--- a/packages/arch/s390/zipl-installer/debian/control
+++ b/packages/arch/s390/zipl-installer/debian/control
@@ -11,7 +11,7 @@ Package: zipl-installer
XC-Package-Type: udeb
Architecture: s390
Provides: bootable-system
-Depends: base-installer
+Depends: installed-base
XB-Installer-Menu-Item: 7300
Description: Make DASD bootable
This udeb will call zipl to make the DASD bootable.
diff --git a/packages/arch/sparc/silo-installer/debian/changelog b/packages/arch/sparc/silo-installer/debian/changelog
index 5095bd9..bdff3fd 100644
--- a/packages/arch/sparc/silo-installer/debian/changelog
+++ b/packages/arch/sparc/silo-installer/debian/changelog
@@ -1,3 +1,10 @@
+silo-installer (1.11) UNRELEASED; urgency=low
+
+ * Replace 'base-installer' dependency by 'installed-base' virtual
+ package. Needs base-installer 1.81.
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Sun, 17 Jun 2007 10:00:07 -0300
+
silo-installer (1.10) unstable; urgency=low
[ Joey Hess ]
diff --git a/packages/arch/sparc/silo-installer/debian/control b/packages/arch/sparc/silo-installer/debian/control
index 5bc3b4e..70a1e87 100644
--- a/packages/arch/sparc/silo-installer/debian/control
+++ b/packages/arch/sparc/silo-installer/debian/control
@@ -10,7 +10,7 @@ Package: silo-installer
XC-Package-Type: udeb
Architecture: sparc
Provides: bootable-system
-Depends: cdebconf-udeb, base-installer, di-utils-mapdevfs, archdetect
+Depends: cdebconf-udeb, installed-base, di-utils-mapdevfs, archdetect
XB-Installer-Menu-Item: 7300
Description: install silo on a hard disk
This udeb will install silo on the hard disk.
diff --git a/packages/base-installer/debian/changelog b/packages/base-installer/debian/changelog
index ccf8f4e..021d403 100644
--- a/packages/base-installer/debian/changelog
+++ b/packages/base-installer/debian/changelog
@@ -1,3 +1,10 @@
+base-installer (1.81) UNRELEASED; urgency=low
+
+ * Provides installed-base. This is need to be able to use alternative
+ ways of installing Debian.
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Sun, 17 Jun 2007 10:02:39 -0300
+
base-installer (1.80) unstable; urgency=low
[ Frans Pop ]
diff --git a/packages/base-installer/debian/control b/packages/base-installer/debian/control
index 64f3882..c8e3d38 100644
--- a/packages/base-installer/debian/control
+++ b/packages/base-installer/debian/control
@@ -10,6 +10,6 @@ Package: base-installer
XC-Package-Type: udeb
Architecture: any
Depends: ${shlibs:Depends}, mounted-partitions, debootstrap-udeb (>= 0.3.1), created-fstab, archdetect, di-utils-mapdevfs, di-utils (>= 1.48), rootskel (>= 1.19), gpgv-udeb, debian-archive-keyring-udeb
-Provides: kernel-installer
+Provides: kernel-installer, installed-base
XB-Installer-Menu-Item: 6500
Description: Install the base system
diff --git a/packages/finish-install/debian/changelog b/packages/finish-install/debian/changelog
index b21189b..56a6689 100644
--- a/packages/finish-install/debian/changelog
+++ b/packages/finish-install/debian/changelog
@@ -1,3 +1,10 @@
+finish-install (2.11) UNRELEASED; urgency=low
+
+ * Replace 'base-installer' dependency by 'installed-base' virtual
+ package. Needs base-installer 1.81.
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Sun, 17 Jun 2007 10:00:36 -0300
+
finish-install (2.10) unstable; urgency=low
[ Joey Hess ]
diff --git a/packages/finish-install/debian/control b/packages/finish-install/debian/control
index f335f5b..7d8be5d 100644
--- a/packages/finish-install/debian/control
+++ b/packages/finish-install/debian/control
@@ -9,6 +9,6 @@ XS-Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/finish-install
Package: finish-install
XC-Package-Type: udeb
Architecture: all
-Depends: ${misc:Depends}, archdetect, base-installer, created-fstab, bootable-system
+Depends: ${misc:Depends}, archdetect, installed-base, created-fstab, bootable-system
XB-Installer-Menu-Item: 7800
Description: Finish the installation and reboot
diff --git a/packages/flash-kernel/debian/changelog b/packages/flash-kernel/debian/changelog
index fdaeeea..9e3754e 100644
--- a/packages/flash-kernel/debian/changelog
+++ b/packages/flash-kernel/debian/changelog
@@ -1,3 +1,10 @@
+flash-kernel (1.3) UNRELEASED; urgency=low
+
+ * Replace 'base-installer' dependency by 'installed-base' virtual
+ package. Needs base-installer 1.81.
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Sun, 17 Jun 2007 10:01:01 -0300
+
flash-kernel (1.2) unstable; urgency=low
[ Martin Michlmayr ]
diff --git a/packages/flash-kernel/debian/control b/packages/flash-kernel/debian/control
index 8d947b8..77c7d3b 100644
--- a/packages/flash-kernel/debian/control
+++ b/packages/flash-kernel/debian/control
@@ -22,6 +22,6 @@ XC-Package-Type: udeb
Architecture: arm armel armeb
XB-Subarchitecture: iop32x ixp4xx
Provides: bootable-system
-Depends: cdebconf-udeb, base-installer
+Depends: cdebconf-udeb, installed-base
XB-Installer-Menu-Item: 73
Description: Configure flash to boot the system
diff --git a/packages/nobootloader/debian/changelog b/packages/nobootloader/debian/changelog
index 13757cd..a2e9ca3 100644
--- a/packages/nobootloader/debian/changelog
+++ b/packages/nobootloader/debian/changelog
@@ -1,3 +1,10 @@
+nobootloader (1.19) UNRELEASED; urgency=low
+
+ * Do not depends of a specific base-installer version so we can provide
+ an alternative module for it.
+
+ -- Otavio Salvador <otavio@debian.org> Sat, 16 Jun 2007 17:33:19 -0300
+
nobootloader (1.18) unstable; urgency=low
[ Colin Watson ]
diff --git a/packages/nobootloader/debian/control b/packages/nobootloader/debian/control
index c66cadd..5ae0b03 100644
--- a/packages/nobootloader/debian/control
+++ b/packages/nobootloader/debian/control
@@ -10,7 +10,7 @@ Package: nobootloader
XC-Package-Type: udeb
Architecture: all
Provides: bootable-system
-Depends: cdebconf-udeb, base-installer (>= 1.23), di-utils-mapdevfs
+Depends: cdebconf-udeb, installed-base, di-utils-mapdevfs
XB-Installer-Menu-Item: 7700
Description: Don't install any bootloader.
This package will skip installing a boot-loader
Reply to: