* DistUpgrade/Changelog, README, ReleaseAnnouncement

  - updated to reflect reality
* DistUpgrade/DistUpgradeControler.py:
  - set the permission for the apt.log file to 0644
* DistUpgrade/cdromupgrade:
  - updated and comments added
* po/*:
  - make update-po

5 files changed, 20 insertions, 17 deletions

diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog
index b07e9721..bda1d3a8 100644
--- a/DistUpgrade/Changelog
+++ b/DistUpgrade/Changelog
@@ -1,12 +1,15 @@
+2006-08-30:
+	- fixes to the cdromupgrade wrapper
 2006-08-29:
 	- always enable the "main" component to make sure it is available
-	- add download estimate
+	- add download estimated time
 	- add --cdrom switch to make cdrom based dist-upgrades possible
 	- better error reporting
 	- moved the logging into the /var/log/dist-upgrade/ dir
 	- change the obsoletes calculation when run without network and
           consider demotions as obsoletes then (because we can't really
 	  use the "pkg.downloadable" hint without network)
+	- uploaded
 2006-08-18: 
 	- sort the demoted software list
 2006-07-31:
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 69d4cefe..38d3b73e 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -113,7 +113,7 @@ class DistUpgradeControler(object):
         # turn on debuging in the cache
         apt_pkg.Config.Set("Debug::pkgProblemResolver","true")
         fd = os.open("/var/log/dist-upgrade/apt.log",
-                     os.O_RDWR|os.O_CREAT|os.O_TRUNC)
+                     os.O_RDWR|os.O_CREAT|os.O_TRUNC, 0644)
         os.dup2(fd,1)
         os.dup2(fd,2)
 
diff --git a/DistUpgrade/README b/DistUpgrade/README
index d519ef11..9d408f43 100644
--- a/DistUpgrade/README
+++ b/DistUpgrade/README
@@ -5,8 +5,9 @@ The dist-upgrader is designed to make upgrades for ubuntu (or similar
 distributions) easy and painless. It supports both network mode and
 cdrom upgrades. The cdromupgrade will ask if it should use the network
 or not. There is a wrapper script "cdromugprade" (that assumes the
-file of the upgrade life in CDROM_ROOT/upgrade/) that can be put onto
-the CD and it will support upgrades directly from the CD.
+file of the upgrade life in
+CDROM_ROOT/dists/stable/dist-upgrader/binary-all/) that can be put
+onto the CD and it will support upgrades directly from the CD.
 
 
 Configuration
diff --git a/DistUpgrade/ReleaseAnnouncement b/DistUpgrade/ReleaseAnnouncement
index 2d4e03a4..98eca455 100644
--- a/DistUpgrade/ReleaseAnnouncement
+++ b/DistUpgrade/ReleaseAnnouncement
@@ -8,17 +8,7 @@ The Ubuntu team is proud to announce Ubuntu 6.10 'Edgy Eft'.
 Ubuntu is a Linux distribution for your desktop or server, with a fast
 and easy install, regular releases, a tight selection of excellent
 applications installed by default, and almost any other software you
-can imagine available through the network. Ubuntu 6.06 LTS (Long Term
-Support) will be supported with security updates for 5 years on the
-server and 3 years on the desktop after its release, and professional
-technical support is available from many companies around the world.
-
-Visit https://wiki.ubuntu.com/DapperReleaseNotes for the latest
-information and frequently asked questions about the upgrade. 
-
-Please read these notes before, during, and after installation and
-configuration of Ubuntu 6.06 LTS, and before reporting bugs in
-https://launchpad.net/malone/distros/ubuntu
+can imagine available through the network. 
 
 We hope you enjoy Ubuntu.
 
diff --git a/DistUpgrade/cdromupgrade b/DistUpgrade/cdromupgrade
index d33c56c1..fcebe1c7 100755
--- a/DistUpgrade/cdromupgrade
+++ b/DistUpgrade/cdromupgrade
@@ -4,7 +4,16 @@
 # to make it possible to put it onto the top-level dir of a CD and
 # run it from there
 # 
+# Not that useful unfortunately when the CD is mounted "noexec",
+# but useful for the notification-daemon that will just run it
+# and be done with it
+#
+# WARNING: make sure to call it with a absolute path!
+#          (e.g. /cdrom/cdromugprade)
+
+UPGRADER_DIR=dists/stable/dist-upgrader/binary-all/
 
 cddirname=${0%\/*}
-cd $cddirname/upgrade
-$cddirname/upgrade/dist-upgrade.py --cdrom $cddirname
\ No newline at end of file
+fullpath=$cddirname/$UPGRADER_DIR
+cd $fullpath
+gksu -- python $fullpath/edgy --cdrom $cddirname