Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/update-manager/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- Makefile.am	9 Jul 2005 04:03:43 -0000	1.5
+++ Makefile.am	11 Oct 2005 22:13:01 -0000
@@ -1,4 +1,4 @@
-SUBDIRS = UpdateManager src po data help SoftwareProperties Common
+SUBDIRS = UpdateManager src distribution-data po data help SoftwareProperties Common
 
 exedir = $(prefix)/bin
 exe_SCRIPTS = update-manager  \
Index: configure.in
===================================================================
RCS file: /cvs/gnome/update-manager/configure.in,v
retrieving revision 1.25
diff -u -r1.25 configure.in
--- configure.in	15 Sep 2005 12:10:36 -0000	1.25
+++ configure.in	11 Oct 2005 22:13:01 -0000
@@ -31,7 +31,8 @@
 UpdateManager/Makefile 
 SoftwareProperties/Makefile
 SoftwareProperties/SoftwareProperties.py
-data/Makefile 
+distribution-data/Makefile
+data/Makefile
 Common/Makefile
 update-manager
 gnome-software-properties
Index: gnome-software-properties.in
===================================================================
RCS file: /cvs/gnome/update-manager/gnome-software-properties.in,v
retrieving revision 1.1
diff -u -r1.1 gnome-software-properties.in
--- gnome-software-properties.in	5 Jul 2005 03:08:34 -0000	1.1
+++ gnome-software-properties.in	11 Oct 2005 22:13:01 -0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.4
 # update-manager.in - easy updating application
 #  
 #  Copyright (c) 2004,2005 Canonical
@@ -63,5 +63,14 @@
                      
   (options, args) = parser.parse_args()
                      
+
+  APP="update-manager"
+  DIR="@prefix@/share/locale"
+  gettext.bindtextdomain(APP, DIR)
+  gettext.textdomain(APP)
+  gtk.glade.bindtextdomain(APP, DIR)
+  gtk.glade.textdomain(APP)
+  _ = gettext.gettext
+
   app = SoftwareProperties("@prefix@/share/update-manager/SoftwareProperties.glade", "window1", "update-manager", options)
   app.run()
Index: update-manager.in
===================================================================
RCS file: /cvs/gnome/update-manager/update-manager.in,v
retrieving revision 1.1
diff -u -r1.1 update-manager.in
--- update-manager.in	10 Jun 2005 17:09:39 -0000	1.1
+++ update-manager.in	11 Oct 2005 22:13:01 -0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.4
 # update-manager.in - easy updating application
 #  
 #  Copyright (c) 2004,2005 Canonical
Index: Common/Makefile.am
===================================================================
RCS file: /cvs/gnome/update-manager/Common/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- Common/Makefile.am	5 Jul 2005 03:08:34 -0000	1.1
+++ Common/Makefile.am	11 Oct 2005 22:13:01 -0000
@@ -1,4 +1,4 @@
-modules_DATA = SimpleGladeApp.py
+modules_DATA = SimpleGladeApp.py DistInfo.py
 modulesdir = $(datadir)/update-manager/python
 
 
Index: SoftwareProperties/aptsources.py
===================================================================
RCS file: /cvs/gnome/update-manager/SoftwareProperties/aptsources.py,v
retrieving revision 1.1
diff -u -r1.1 aptsources.py
--- SoftwareProperties/aptsources.py	5 Jul 2005 18:44:12 -0000	1.1
+++ SoftwareProperties/aptsources.py	11 Oct 2005 22:13:02 -0000
@@ -25,6 +25,8 @@
 import gettext
 import re
 
+from DistInfo import DistInfo
+
 # actual source.list entries
 class SourceEntry:
 
@@ -229,46 +231,18 @@
     _ = gettext.gettext
     self.templates = []
 
-    # ubuntu components templates
-    ubuntu_comps = []
-    ubuntu_comps.append(SourceCompTemplate("main",_("Officially supported"),True))
-    ubuntu_comps.append(SourceCompTemplate("restricted",_("Restricted copyright"),True))
-    ubuntu_comps.append(SourceCompTemplate("universe",_("Community maintained (Universe)"),False))
-    ubuntu_comps.append(SourceCompTemplate("multiverse",_("Non-free (Multiverse)"),False))
-    
-    # ubuntu distro
-    self.templates.append(SourceEntryTemplate("deb",
-                                         "http://archive.ubuntu.com/ubuntu/",
-                                         "hoary",
-                                         "Ubuntu 5.04 \"Hoary Hedgehog\"",
-                                         ubuntu_comps ))
-    self.templates.append(SourceEntryTemplate("deb",
-                                         "http://security.ubuntu.com/ubuntu/",
-                                         "hoary-security",
-                                         _("Ubuntu 5.04 Security Updates"),
-                                         ubuntu_comps))
-    self.templates.append(SourceEntryTemplate("deb",
-                                         "http://archive.ubuntu.com/ubuntu/",
-                                         "hoary-updates",
-					 _("Ubuntu 5.04 Updates"),
-                                         ubuntu_comps))
-    # breezy ;)
-    self.templates.append(SourceEntryTemplate("deb",
-                                         "http://archive.ubuntu.com/ubuntu/",
-                                         "breezy",
-                                         "Breezy 5.10 \"Breezy Badger\"",
-                                         ubuntu_comps ))
-    self.templates.append(SourceEntryTemplate("deb",
-                                         "http://security.ubuntu.com/ubuntu/",
-                                         "breezy-security",
-                                         _("Ubuntu 5.10 Security Updates"),
-                                         ubuntu_comps))
-    self.templates.append(SourceEntryTemplate("deb",
-                                         "http://archive.ubuntu.com/ubuntu/",
-                                         "breezy-updates",
-                                         _("Ubuntu 5.10 Updates"),
-                                         ubuntu_comps))
-                                             
+    dinfo = DistInfo ()
+
+    for suite in dinfo.suites:
+      comps = []
+      for comp in suite.components:
+        comps.append(SourceCompTemplate(comp.name, _(comp.description),
+                                        comp.enabled))
+      self.templates.append (SourceEntryTemplate("deb",
+                                                 suite.base_uri,
+                                                 suite.name,
+                                                 suite.description,
+                                                 comps))
 
 # matcher class to make a source entry look nice
 # lots of predefined matchers to make it i18n/gettext friendly
@@ -450,5 +424,3 @@
       
       
     return (type_description,dist_description,comp_description)
-    
-
Index: UpdateManager/UpdateManager.py
===================================================================
RCS file: /cvs/gnome/update-manager/UpdateManager/UpdateManager.py,v
retrieving revision 1.6
diff -u -r1.6 UpdateManager.py
--- UpdateManager/UpdateManager.py	20 Sep 2005 12:36:23 -0000	1.6
+++ UpdateManager/UpdateManager.py	11 Oct 2005 22:13:04 -0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.4
 # UpdateManager - easy updating application
 #  
 #  Copyright (c) 2004,2005 Canonical
@@ -66,9 +66,6 @@
 METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release"
 #METARELEASE_URI = "http://people.ubuntu.com/~mvo/meta-release-test"
 METARELEASE_FILE = "/var/lib/update-manager/meta-release"
-
-
-
 
 class UpgradesFilter(apt.cache.Filter):
     """ a filter that returns everything that is upgradable """
Index: UpdateManager/Utils.py
===================================================================
RCS file: /cvs/gnome/update-manager/UpdateManager/Utils.py,v
retrieving revision 1.2
diff -u -r1.2 Utils.py
--- UpdateManager/Utils.py	3 Oct 2005 22:44:05 -0000	1.2
+++ UpdateManager/Utils.py	11 Oct 2005 22:13:04 -0000
@@ -2,6 +2,7 @@
 pygtk.require('2.0')
 import gtk
 
+import sys
 import apt
 import string
 import urllib2
@@ -32,8 +33,14 @@
     self._progressbar.hide()
 
 
-CHANGELOGS_URI="http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-
+CHANGELOGS_URI = None
+sys.path.insert (0, "/usr/share/update-manager/python/")
+from DistInfo import DistInfo
+dinfo = DistInfo ()
+CHANGELOGS_URI = dinfo.changelogs_uri
+del DistInfo, dinfo
+if not CHANGELOGS_URI:
+  CHANGELOGS_URI="http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 def get_changelog(pkg, lock, all_changes):
     srcpkg = pkg.sourcePackageName
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/gnome/update-manager/po/POTFILES.in,v
retrieving revision 1.7
diff -u -r1.7 POTFILES.in
--- po/POTFILES.in	5 Jul 2005 18:57:32 -0000	1.7
+++ po/POTFILES.in	11 Oct 2005 22:13:04 -0000
@@ -5,6 +5,7 @@
 data/SoftwarePropertiesDialogs.glade
 data/UpdateManager.glade
 data/update-manager.desktop.in
+distribution-data/Debian.info.in.h
 gnome-software-properties.in
 SoftwareProperties/aptsources.py
 SoftwareProperties/dialog_add.py
Index: src/PkgView.py
===================================================================
RCS file: /cvs/gnome/update-manager/src/PkgView.py,v
retrieving revision 1.4
diff -u -r1.4 PkgView.py
--- src/PkgView.py	3 Oct 2005 22:44:06 -0000	1.4
+++ src/PkgView.py	11 Oct 2005 22:13:41 -0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.4
 
 import apt
 
Index: src/PkgView2.py
===================================================================
RCS file: /cvs/gnome/update-manager/src/PkgView2.py,v
retrieving revision 1.3
diff -u -r1.3 PkgView2.py
--- src/PkgView2.py	3 Oct 2005 22:44:06 -0000	1.3
+++ src/PkgView2.py	11 Oct 2005 22:13:42 -0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.4
 
 import apt
 
Index: src/gnome-software-properties.in
===================================================================
RCS file: /cvs/gnome/update-manager/src/gnome-software-properties.in,v
retrieving revision 1.11
diff -u -r1.11 gnome-software-properties.in
--- src/gnome-software-properties.in	10 Jun 2005 17:20:02 -0000	1.11
+++ src/gnome-software-properties.in	11 Oct 2005 22:13:43 -0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.4
 # gnome-software-properties.in - edit /etc/apt/sources.list
 #  
 #  Copyright (c) 2004 Canonical