3 files changed, 60 insertions, 1 deletions
diff --git a/aptsources/distro.py b/aptsources/distro.py
index debbb12a..6d3b453f 100644
--- a/aptsources/distro.py
+++ b/aptsources/distro.py
@@ -167,7 +167,7 @@ class Distribution:
     # try to guess the nearest mirror from the locale
     self.country = None
     self.country_code = None
-    locale = os.getenv("LANG", default="en.UK")
+    locale = os.getenv("LANG", default="en_UK")
     a = locale.find("_")
     z = locale.find(".")
     if z == -1:
diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in
index 47ab53de..5561862d 100644
--- a/data/templates/Ubuntu.info.in
+++ b/data/templates/Ubuntu.info.in
@@ -1,5 +1,57 @@
 _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog
 
+Suite: intrepid
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
+_Description: Ubuntu 8.10 'Intrepid Ibex'
+Component: main
+_CompDescription: Officially supported
+_CompDescriptionLong: Canonical-supported Open Source software
+Component: universe
+_CompDescription: Community-maintained
+_CompDescriptionLong: Community-maintained Open Source software
+Component: restricted
+_CompDescription: Non-free drivers
+_CompDescriptionLong: Proprietary drivers for devices
+Component: multiverse
+_CompDescription: Restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
+
+Suite: intrepid
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*8.10
+_Description: Cdrom with Ubuntu 8.10 'Intrepid Ibex'
+Available: False
+Component: main
+_CompDescription: Officially supported
+Component: restricted
+_CompDescription: Restricted copyright
+
+Suite: intrepid-security
+ParentSuite: intrepid
+RepositoryType: deb
+BaseURI: http://security.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
+_Description: Important security updates
+
+Suite: intrepid-updates
+ParentSuite: intrepid
+RepositoryType: deb
+_Description: Recommended updates
+
+Suite: intrepid-proposed
+ParentSuite: intrepid
+RepositoryType: deb
+_Description: Pre-released updates
+
+Suite: intrepid-backports
+ParentSuite: intrepid
+RepositoryType: deb
+_Description: Unsupported updates
+
+
 Suite: hardy
 RepositoryType: deb
 BaseURI: http://archive.ubuntu.com/ubuntu/
diff --git a/debian/changelog b/debian/changelog
index 183020e2..bec5c680 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-apt (0.7.4ubuntu8) intrepid; urgency=low
+
+  * data/templates/Ubuntu.info.in:
+    - added ubuntu 'intrepid'
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 05 May 2008 10:40:58 +0200
+
 python-apt (0.7.4ubuntu7) hardy; urgency=low
 
   * data/templates/Ubuntu.mirrors: