summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog25
-rw-r--r--debian/control2
2 files changed, 23 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 718d45dd..5f47b713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,28 @@
-python-apt (0.7.100.1) UNRELEASED; urgency=low
+python-apt (0.7.100.1ubuntu1) UNRELEASEDnatty; urgency=low
+ * merged from debian
* apt/progress/text.py:
- only run ioctl for termios.TIOCGWINSZ if the fd is a tty
- -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Dec 2010 13:41:07 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 21 Dec 2010 17:49:23 +0100
+
+python-apt (0.7.100.1) unstable; urgency=low
+
+ [ Julian Andres Klode ]
+ * python/generic.h: Fix a memory leak (leaking on every unicode string).
+ * debian/control: add Replaces to python-apt-common, python3-apt; to
+ avoid file conflicts with files previously in python-apt (Closes: #605136).
+
+ [ Michael Vogt ]
+ * python/generic.h:
+ - set Object to NULL in CppDeallocPtr
+ * python/depcache.cc:
+ - don't run "actiongroup.release()" if the object was already
+ deallocated
+ * tests/test_apt_cache.py:
+ - fix tests to work if apt compressed indexes are enabled
+
+ -- Julian Andres Klode <jak@debian.org> Sun, 12 Dec 2010 14:30:33 +0100
python-apt (0.7.100ubuntu2) natty; urgency=low
@@ -103,8 +122,6 @@ python-apt (0.7.98) unstable; urgency=low
- do use PyString_FromFormat(), in python versions below 2.7 it
does not support long long (%llu), use strprintf() from libapt
instead
- * tests/test_apt_cache.py:
- - fix tests to work if apt compressed indexes are enabled
[ Kiwinote ]
* apt/debfile:
diff --git a/debian/control b/debian/control
index e7521c60..4b1b2d92 100644
--- a/debian/control
+++ b/debian/control
@@ -89,6 +89,7 @@ Architecture: all
Depends: ${misc:Depends}, python | python3
Enhances: python-apt, python3-apt
Breaks: python-apt (<< 0.7.98+nmu1)
+Replaces: python-apt (<< 0.7.98+nmu1)
Description: Python interface to libapt-pkg (locales)
The apt_pkg Python interface will provide full access to the internal
libapt-pkg structures allowing Python programs to easily perform a
@@ -122,6 +123,7 @@ Priority: extra
Architecture: any
Section: debug
Breaks: python-apt (<< 0.7.98+nmu1)
+Replaces: python-apt (<< 0.7.98+nmu1)
Depends: python3-dbg, python3-apt (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Description: Python 3 interface to libapt-pkg (debug extension)