* merge with main

7 files changed, 13 insertions, 13 deletions

diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg
index c594f296..9d6001fb 100644
--- a/DistUpgrade/DistUpgrade.cfg
+++ b/DistUpgrade/DistUpgrade.cfg
@@ -32,8 +32,8 @@ KeyDependencies=xubuntu-artwork-usplash, xubuntu-default-settings, xfce4
 BackupExt=distUpgrade
 
 [Sources]
-From=breezy
-To=dapper
+From=dapper
+To=edgy
 ValidOrigin=Ubuntu
 ValidMirrors = mirrors.txt
 
diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade
index 91d5b33f..a31df120 100644
--- a/DistUpgrade/DistUpgrade.glade
+++ b/DistUpgrade/DistUpgrade.glade
@@ -38,7 +38,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label_title">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot; size=&quot;x-large&quot;&gt;Upgrading to Ubuntu 6.06 LTS&lt;/span&gt;</property>
+	      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot; size=&quot;x-large&quot;&gt;Upgrading to Ubuntu 6.10&lt;/span&gt;</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index b6b52c72..9842484d 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -143,7 +143,7 @@ class DistUpgradeControler(object):
 
     def updateSourcesList(self):
         logging.debug("updateSourcesList()")
-        self.sources = SourcesList()
+        self.sources = SourcesList(withMatcher=False)
         if not self.rewriteSourcesList(mirror_check=True):
             logging.error("No valid mirror found")
             res = self._view.askYesNoQuestion(_("No valid mirror found"),
@@ -446,7 +446,7 @@ class DistUpgradeControler(object):
 
     
     # this is the core
-    def dapperUpgrade(self):
+    def edgyUpgrade(self):
         # sanity check (check for ubuntu-desktop, brokenCache etc)
         self._view.updateStatus(_("Checking package manager"))
         self._view.setStep(1)
@@ -516,6 +516,6 @@ class DistUpgradeControler(object):
             subprocess.call(["reboot"])
         
     def run(self):
-        self.dapperUpgrade()
+        self.edgyUpgrade()
 
 
diff --git a/DistUpgrade/ReleaseAnnouncement b/DistUpgrade/ReleaseAnnouncement
index baa35883..2d4e03a4 100644
--- a/DistUpgrade/ReleaseAnnouncement
+++ b/DistUpgrade/ReleaseAnnouncement
@@ -1,9 +1,9 @@
-Welcome to Ubuntu 6.06 LTS
---------------------------
+Welcome to Ubuntu 6.10 'Edgy Eft'
+---------------------------------
 
+*WARNING: THIS IS A DEVELOPMENT SNAPSHOT*
 
-The Ubuntu team is proud to announce Ubuntu 6.06 LTS (Long Term
-Support).
+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
diff --git a/DistUpgrade/aptsources.py b/DistUpgrade/aptsources.py
index 2f041121..3cadeee7 120000
--- a/DistUpgrade/aptsources.py
+++ b/DistUpgrade/aptsources.py
@@ -1 +1 @@
-../SoftwareProperties/aptsources.py
\ No newline at end of file
+../UpdateManager/Common/aptsources.py
\ No newline at end of file
diff --git a/DistUpgrade/build-dist.sh b/DistUpgrade/build-dist.sh
index fd06fede..4af768ef 100755
--- a/DistUpgrade/build-dist.sh
+++ b/DistUpgrade/build-dist.sh
@@ -9,7 +9,7 @@
 
 TARGETDIR=../dist-upgrade-build
 SOURCEDIR=`pwd`
-DIST=dapper
+DIST=edgy
 MAINTAINER="Michael Vogt <michael.vogt@ubuntu.com>"
 NOTES=ReleaseAnnouncement
 version=$(date +%Y%m%d.%H%M)
diff --git a/DistUpgrade/build-tarball.sh b/DistUpgrade/build-tarball.sh
index a30e40a0..4f88b848 100755
--- a/DistUpgrade/build-tarball.sh
+++ b/DistUpgrade/build-tarball.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DIST=dapper
+DIST=edgy
 
 # cleanup
 rm -f *~ *.bak *.pyc *.moved '#'*