* merge with debian branch

5 files changed, 4 insertions, 7 deletions

diff --git a/AptSources/aptsources.py b/AptSources/aptsources.py
index 713b0ff8..e29114e1 100644
--- a/AptSources/aptsources.py
+++ b/AptSources/aptsources.py
@@ -543,6 +543,7 @@ class Distribution:
 
     # try to guess the nearest mirror from the locale
     # FIXME: for debian we need something different
+    self.country = None
     if self.id == "Ubuntu":
         locale = os.getenv("LANG", default="en.UK")
         a = locale.find("_")
@@ -554,8 +555,6 @@ class Distribution:
                               country_code
         if self.countries.has_key(country_code):
             self.country = self.countries[country_code]
-        else:
-            self.country = None
 
     # other used servers
     for medium in self.used_media:
diff --git a/debian/changelog b/debian/changelog
index dc89f8be..99cfc55e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-aptsources (0.0.1) unstable; urgency=low
+python-aptsources (0.0.1) feisty; urgency=low
 
   * Initial Release.
 
diff --git a/debian/control b/debian/control
index 1ede02b3..5f661bc6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: python-aptsources
-Section: unknown
+Section: python
 Priority: optional
 XS-Python-Version: all
 Maintainer: Sebastian Heinlein <glatzor@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 5.0.37.2), python-central (>= 0.5), python-distutils-extra
+Build-Depends: cdbs, debhelper (>= 5.0.37.2), python-central (>= 0.5), python-distutils-extra, python-all-dev
 Standards-Version: 3.7.2
 
 Package: python-aptsources
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bbb..00000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e69de29b..00000000
--- a/debian/docs
+++ /dev/null