diff options
| -rw-r--r-- | data/templates/Ubuntu.info.in | 15 | ||||
| -rw-r--r-- | debian/changelog | 26 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/python-apt-doc.examples (renamed from debian/examples) | 0 | ||||
| -rwxr-xr-x | debian/rules | 10 | ||||
| -rw-r--r-- | python/generic.cc | 6 | ||||
| -rw-r--r-- | tests/test_all.py | 2 | ||||
| -rw-r--r-- | tests/test_aptsources.py | 2 |
8 files changed, 52 insertions, 15 deletions
diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index a84cbc2b..1ca76927 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -8,7 +8,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com -MirrorsFile: Ubuntu.mirrors +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 10.04 'Lucid Lynx' Component: main _CompDescription: Officially supported @@ -68,7 +69,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com -MirrorsFile: Ubuntu.mirrors +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 9.10 'Karmic Koala' Component: main _CompDescription: Officially supported @@ -128,7 +130,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com -MirrorsFile: Ubuntu.mirrors +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 9.04 'Jaunty Jackalope' Component: main _CompDescription: Officially supported @@ -188,7 +191,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com -MirrorsFile: Ubuntu.mirrors +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 8.10 'Intrepid Ibex' Component: main _CompDescription: Officially supported @@ -249,7 +253,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com -MirrorsFile: Ubuntu.mirrors +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 8.04 'Hardy Heron' Component: main _CompDescription: Officially supported diff --git a/debian/changelog b/debian/changelog index d55c6246..b7617f90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,30 @@ -python-apt (0.7.94.1) UNRELEASED; urgency=low +python-apt (0.7.94.3) UNRELEASED; urgency=low + + * python/generic.cc: + - Fix a memory leak when using old attribute names. + * debian/control: + - Change priority to standard, keep -doc and -dev on optional. + + -- Julian Andres Klode <jak@debian.org> Mon, 15 Mar 2010 17:04:49 +0100 + +python-apt (0.7.94.2) unstable; urgency=low + + * Revert 0.7.93.3 and just set APT::Architecture to i386 for + test_aptsources; fixes FTBFS on powerpc. + + -- Julian Andres Klode <jak@debian.org> Fri, 12 Mar 2010 19:22:57 +0100 + +python-apt (0.7.94.1) unstable; urgency=low * Pass --exclude=migrate-0.8.py to dh_pycentral; in order to not depend - on python2.6. + on python2.6; but recommend python2.6. * Use dh_link instead of ln for python-apt-doc (Closes: #573523). + * Pass --link-doc=python-apt to dh_installdocs. + * Install examples to python-apt-doc instead of python-apt. + * tests/test_all.py: Write information header to stderr, not stdout. + * Build documentation only when needed (when building python-apt-doc). - -- Julian Andres Klode <jak@debian.org> Thu, 11 Mar 2010 19:33:26 +0100 + -- Julian Andres Klode <jak@debian.org> Fri, 12 Mar 2010 14:36:48 +0100 python-apt (0.7.94) unstable; urgency=low diff --git a/debian/control b/debian/control index af7aa055..a3decb78 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: python-apt Section: python -Priority: optional +Priority: standard Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org> Standards-Version: 3.8.4 @@ -23,7 +23,7 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes Package: python-apt Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Recommends: lsb-release, iso-codes +Recommends: lsb-release, iso-codes, python2.6 Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4) Provides: ${python:Provides} Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc @@ -42,6 +42,7 @@ Description: Python interface to libapt-pkg the sources.list configuration on the repository and the distro level. Package: python-apt-doc +Priority: optional Architecture: all Section: doc Depends: libjs-jquery, ${misc:Depends} @@ -69,6 +70,7 @@ Description: Python interface to libapt-pkg (debug extension) This package contains the extension built for the Python debug interpreter. Package: python-apt-dev +Priority: optional Architecture: all Depends: python-apt (>= ${source:Version}), libapt-pkg-dev (>= 0.7.10), ${misc:Depends} diff --git a/debian/examples b/debian/python-apt-doc.examples index e4a93ea1..e4a93ea1 100644 --- a/debian/examples +++ b/debian/python-apt-doc.examples diff --git a/debian/rules b/debian/rules index 6d1f07bf..a65c5cfd 100755 --- a/debian/rules +++ b/debian/rules @@ -9,12 +9,14 @@ export CFLAGS=-Wno-write-strings -DCOMPAT_0_7 override_dh_auto_build: dh_auto_build - python setup.py build_sphinx override_dh_installdocs: - dh_installdocs - rm -rf debian/python-apt-dbg/usr/share/doc/python-apt-dbg - ln -s python-apt debian/python-apt-dbg/usr/share/doc/python-apt-dbg + set -e; if [ -z $(filter -a,$(DH_INTERNAL_OPTIONS)) ]; then \ + python setup.py build_sphinx; \ + dh_installdirs -ppython-apt-doc usr/share/doc/python-apt; \ + fi + dh_installdirs -ppython-apt-dev usr/share/doc/python-apt + dh_installdocs --link-doc=python-apt override_dh_strip: dh_strip --dbg-package=python-apt-dbg diff --git a/python/generic.cc b/python/generic.cc index 5db1e490..f0980f2b 100644 --- a/python/generic.cc +++ b/python/generic.cc @@ -104,9 +104,15 @@ PyObject *_PyAptObject_getattro(PyObject *self, PyObject *attr) { PyErr_WarnEx(PyExc_DeprecationWarning, warning_string, 1); delete[] warning_string; } else { + Py_XINCREF(ptype); + Py_XINCREF(pvalue); + Py_XINCREF(ptraceback); PyErr_Restore(ptype, pvalue, ptraceback); } Py_DECREF(newattr); + Py_XDECREF(ptype); + Py_XDECREF(pvalue); + Py_XDECREF(ptraceback); } return value; } diff --git a/tests/test_all.py b/tests/test_all.py index dc603dfd..d561a9ae 100644 --- a/tests/test_all.py +++ b/tests/test_all.py @@ -10,7 +10,7 @@ import unittest import sys if __name__ == '__main__': - print("[tests] Running on %s" % sys.version.replace("\n", "")) + sys.stderr.write("[tests] Running on %s\n" % sys.version.replace("\n", "")) os.chdir(os.path.dirname(__file__)) # Find the path to the built apt_pkg and apt_inst extensions if os.path.exists("../build"): diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index 0f7f078b..767f5244 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -14,6 +14,8 @@ class TestAptSources(unittest.TestCase): def setUp(self): apt_pkg.init_config() apt_pkg.init_system() + if apt_pkg.config["APT::Architecture"] not in ('i386', 'amd64'): + apt_pkg.config.set("APT::Architecture", "i386") apt_pkg.config.set("Dir::Etc", os.getcwd()) apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx") if os.path.exists("../build/data/templates"): |