huge merge from mvo

6 files changed, 56 insertions, 8 deletions

diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 6ee2fb97..17ba46ee 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -30,7 +30,7 @@ import re
 import statvfs
 from DistUpgradeConfigParser import DistUpgradeConfig
 
-from SoftwareProperties.aptsources import SourcesList, SourceEntry
+from aptsources import SourcesList, SourceEntry, is_mirror
 from gettext import gettext as _
 from DistUpgradeCache import MyCache
 
@@ -82,7 +82,7 @@ class DistUpgradeControler(object):
             # check if it's a mirror (or offical site)
             validMirror = False
             for mirror in valid_mirrors:
-                if self.sources.is_mirror(mirror,entry.uri):
+                if is_mirror(mirror,entry.uri):
                     validMirror = True
                     if entry.dist in toDists:
                         # so the self.sources.list is already set to the new
diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py
index 02894939..57b94636 100644
--- a/DistUpgrade/DistUpgradeView.py
+++ b/DistUpgrade/DistUpgradeView.py
@@ -20,7 +20,7 @@
 #  USA
 
 class DumbTerminal(object):
-    def run(self, cmd):
+    def call(self, cmd):
         " expects a command in the subprocess style (as a list) "
         subprocess.call(cmd)
         
@@ -54,7 +54,7 @@ class DistUpgradeView(object):
         5. Complete
         """
         pass
-    def confirmChanges(self, summary, changes, downloadSize):
+    def confirmChanges(self, summary, changes, downloadSize, actions=None):
         """ display the list of changed packages (apt.Package) and
             return if the user confirms them
         """
diff --git a/DistUpgrade/DistUpgradeViewNonInteractive.py b/DistUpgrade/DistUpgradeViewNonInteractive.py
index 7a8fa7eb..dbf38387 100644
--- a/DistUpgrade/DistUpgradeViewNonInteractive.py
+++ b/DistUpgrade/DistUpgradeViewNonInteractive.py
@@ -60,8 +60,8 @@ class DistUpgradeViewNonInteractive(DistUpgradeView):
         5. Complete
         """
         pass
-    def confirmChanges(self, summary, changes, downloadSize):
-        DistUpgradeView.confirmChanges(self, summary, changes, downloadSize)
+    def confirmChanges(self, summary, changes, downloadSize, actions=None):
+        DistUpgradeView.confirmChanges(self, summary, changes, downloadSize, actions)
 	logging.debug("toinstall: '%s'" % self.toInstall)
         logging.debug("toupgrade: '%s'" % self.toUpgrade)
         logging.debug("toremove: '%s'" % self.toRemove)
diff --git a/DistUpgrade/ReleaseAnnouncement b/DistUpgrade/ReleaseAnnouncement
new file mode 100644
index 00000000..b34d1e76
--- /dev/null
+++ b/DistUpgrade/ReleaseAnnouncement
@@ -0,0 +1,48 @@
+The Ubuntu team is proud to announce a test version of Ubuntu 6.04. 
+
+* THIS IS A DEVELOPMENT SNAPSHOT *
+
+Ubuntu is a Linux distribution for your desktop or server, with a 
+fast and easy install, regular releases, a tight selection of 
+excellent packages installed by default, every other package you can
+imagine available from the network, a commitment to security updates 
+for 18 months after each release and professional technical support 
+from many companies around the world.
+
+
+Feedback and Helping
+--------------------
+
+If you would like to help shape Ubuntu, take a look at the list of 
+ways you can participate at
+
+  http://www.ubuntu.com/community/participate/
+
+Your comments, bug reports, patches and suggestions will help ensure
+that our next release is the best release of Ubuntu ever.  Please 
+report bugs through Launchpad:
+
+  http://launchpad.net/distros/ubuntu/+bugs
+
+If you have a question, or if you think you may have found a bug but 
+aren't sure, first try asking on the #ubuntu IRC channel on Freenode, 
+on the Ubuntu Users mailing list, or on the Ubuntu forums:
+
+  http://lists.ubuntu.com/mailman/listinfo/ubuntu-users
+  http://www.ubuntuforums.org/
+
+
+More Information
+----------------
+
+You can find out more about Ubuntu on our website, IRC channel and wiki.
+If you're new to Ubuntu, please visit:
+
+  http://www.ubuntu.com/
+
+
+To sign up for future Ubuntu announcements, please subscribe to Ubuntu's 
+very low volume announcement list at:
+
+  http://lists.ubuntu.com/mailman/listinfo/ubuntu-announce
+
diff --git a/DistUpgrade/build-dist.sh b/DistUpgrade/build-dist.sh
index f48c4e39..fd06fede 100755
--- a/DistUpgrade/build-dist.sh
+++ b/DistUpgrade/build-dist.sh
@@ -11,7 +11,7 @@ TARGETDIR=../dist-upgrade-build
 SOURCEDIR=`pwd`
 DIST=dapper
 MAINTAINER="Michael Vogt <michael.vogt@ubuntu.com>"
-NOTES=ReleaseAnouncement
+NOTES=ReleaseAnnouncement
 version=$(date +%Y%m%d.%H%M)
 
 # create targetdir
diff --git a/DistUpgrade/build-tarball.sh b/DistUpgrade/build-tarball.sh
index 9f01b87c..a30e40a0 100755
--- a/DistUpgrade/build-tarball.sh
+++ b/DistUpgrade/build-tarball.sh
@@ -3,7 +3,7 @@
 DIST=dapper
 
 # cleanup
-rm -f *~ *.bak *.pyc
+rm -f *~ *.bak *.pyc *.moved '#'*
 
 # update po
 (cd ../po; make update-po)