* aptsources/distro.py:

 - generalized some code, bringing it into the Distribution
   class, and wrote some missing methods for the DebianDistribution
   one (thanks to Gustavo Noronha Silva)
* debian/control:
 - updated for python-distutils-extra (>= 1.9.0)
* debian/python-apt.install:
 - fix i18n files
* python/indexfile.cc:
 - increase str buffer in PackageIndexFileRepr
* apt/package.py:
* apt/cache.py:

6 files changed, 24 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index ed2e78af..1fb7ba0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+python-apt (0.7.2ubuntu4) UNRELEASED; urgency=low
+
+  * aptsources/distro.py:
+   - generalized some code, bringing it into the Distribution
+     class, and wrote some missing methods for the DebianDistribution
+     one (thanks to Gustavo Noronha Silva)
+  * debian/control:
+   - updated for python-distutils-extra (>= 1.9.0)
+  * debian/python-apt.install:
+   - fix i18n files
+  * python/indexfile.cc:
+   - increase str buffer in PackageIndexFileRepr
+
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 30 Jul 2007 18:23:59 +0200
+
 python-apt (0.7.2ubuntu3) gutsy; urgency=low
 
   * Rebuild against libapt-pkg-libc6.6-6-4.4.
@@ -6,13 +22,13 @@ python-apt (0.7.2ubuntu3) gutsy; urgency=low
 
 python-apt (0.7.2ubuntu2) gutsy; urgency=low
 
-  * python/package.py:
+  * apt/package.py:
     - added Record class that can be accessed like a dictionary
       and return it in candidateRecord and installedRecord
       (thanks to Alexander Sack for discussing this with me)
   * doc/examples/records.py:
     - added example how to use the new Records class
-  * python/cache.py:
+  * apt/cache.py:
     - throw FetchCancelleException, FetchFailedException, 
       LockFailedException exceptions when something goes wrong
 
diff --git a/debian/control b/debian/control
index b97dd78f..2ffce5f6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
 Standards-Version: 3.7.2.2
 XS-Python-Version: all
-Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.0), apt-utils, python-all-dev, python-distutils-extra, cdbs, python-central (>= 0.5), python-all-dbg
+Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.0), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.5), python-all-dbg
 XS-Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/python-apt/ubuntu/
 
 Package: python-apt
diff --git a/debian/python-apt.install b/debian/python-apt.install
index 3e08ba50..4910e8ed 100644
--- a/debian/python-apt.install
+++ b/debian/python-apt.install
@@ -1,2 +1,3 @@
 debian/tmp/usr/lib/python*
+debian/tmp/usr/share/locale
 debian/tmp/usr/share/python-apt
diff --git a/python/indexfile.cc b/python/indexfile.cc
index ef6ffc8a..4e32f2ab 100644
--- a/python/indexfile.cc
+++ b/python/indexfile.cc
@@ -56,7 +56,7 @@ static PyObject *PackageIndexFileRepr(PyObject *Self)
 {
    pkgIndexFile *File = GetCpp<pkgIndexFile*>(Self);
    
-   char S[300];
+   char S[1024];
    snprintf(S,sizeof(S),"<pkIndexFile object: "
 			"Label:'%s' Describe='%s' Exists='%i' "
 	                "HasPackages='%i' Size='%i'  "
diff --git a/setup.cfg b/setup.cfg
index 718b6e23..c0c0440e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,3 @@
-[build]
-l10n=True
-
 [build_l10n]
 domain=python-apt
 
diff --git a/setup.py b/setup.py
index 99bc62c6..b8819b31 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 from distutils.core import setup, Extension
 from distutils.sysconfig import parse_makefile
-from DistUtilsExtra.distutils_extra import build_extra, build_l10n
+from DistUtilsExtra.command import *
 import glob, os, string
 
 # The apt_pkg module
@@ -40,8 +40,8 @@ setup(name="python-apt",
                     glob.glob('build/data/templates/*.info')),
                     ('share/python-apt/templates',
                     glob.glob('data/templates/*.mirrors'))],
-      cmdclass = { "build" : build_extra,
-                   "build_l10n" :  build_l10n },
+      cmdclass = { "build" : build_extra.build_extra,
+                   "build_i18n" :  build_i18n.build_i18n },
       license = 'GNU GPL',
       platforms = 'posix'
       )