summaryrefslogtreecommitdiff
path: root/DistUpgrade
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-10-16 19:56:05 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-10-16 19:56:05 +0200
commitaa9516dc024de03167135566cd87449e37b62535 (patch)
treecca81d51a6f3fddb6741e38d2a4d9d7092203c81 /DistUpgrade
parenta8d0e42d7bfc302dcd09c41a353b916687a7537c (diff)
downloadpython-apt-aa9516dc024de03167135566cd87449e37b62535.tar.gz
* DistUpgrade/DistUpgrade.cfg:
- add ubuntu-standard to the base packages * DistUpgrade/removal_blacklist.cfg: - ubuntu-base is save to remove - ubuntu-minimial and ubuntu-standard shouldn't be removed
Diffstat (limited to 'DistUpgrade')
-rw-r--r--DistUpgrade/Changelog4
-rw-r--r--DistUpgrade/DistUpgrade.cfg2
-rw-r--r--DistUpgrade/removal_blacklist.cfg3
3 files changed, 7 insertions, 2 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog
index 94da18d3..d9176f0b 100644
--- a/DistUpgrade/Changelog
+++ b/DistUpgrade/Changelog
@@ -1,3 +1,7 @@
+2006-10-16:
+ - backup cdroms.list only if actually available
+ - remove leftover references to ubuntu-base and
+ use ubuntu-minimal and ubuntu-standard instead
2006-10-13:
- log held-back as well
2006-10-12:
diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg
index f399a1f5..c39cb9e5 100644
--- a/DistUpgrade/DistUpgrade.cfg
+++ b/DistUpgrade/DistUpgrade.cfg
@@ -7,7 +7,7 @@ View=DistUpgradeViewGtk
[Distro]
# the meta-pkgs we support
MetaPkgs=ubuntu-desktop, kubuntu-desktop, edubuntu-desktop, xubuntu-desktop
-BaseMetaPkgs=ubuntu-minimal
+BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
PostUpgradePurge=xorg-common, libgl1-mesa
Demotions=demoted.cfg
RemoveEssentialOk=sysvinit
diff --git a/DistUpgrade/removal_blacklist.cfg b/DistUpgrade/removal_blacklist.cfg
index 773395be..7bfb114b 100644
--- a/DistUpgrade/removal_blacklist.cfg
+++ b/DistUpgrade/removal_blacklist.cfg
@@ -1,5 +1,6 @@
# blacklist of packages that should never be removed
-ubuntu-base
+ubuntu-standard
+ubuntu-minimal
ubuntu-desktop
kubuntu-destkop
edubuntu-desktop