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	4 Oct 2005 02:26:42 -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	4 Oct 2005 02:26:43 -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
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	4 Oct 2005 02:26:45 -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: data/Makefile.am
===================================================================
RCS file: /cvs/gnome/update-manager/data/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- data/Makefile.am	9 Jul 2005 04:13:46 -0000	1.6
+++ data/Makefile.am	4 Oct 2005 02:26:45 -0000
@@ -12,11 +12,16 @@
 				   gnome-software-properties.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
+%.info: %.info.in
+	LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+
+dinfodir = $(datadir)/dists
+dinfo_DATA = Debian.info
 
 appicondir = $(prefix)/share/pixmaps
 appicon_DATA = update-manager.png 
 
 
-EXTRA_DIST= $(data_DATA) $(appicon_DATA) $(desktop_in_files) 
+EXTRA_DIST= $(data_DATA) $(appicon_DATA) $(desktop_in_files) $(dinfo_DATA)
 
 CLEANFILES = $(desktop_DATA)