summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog13
-rw-r--r--debian/control4
2 files changed, 8 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index eb4a1b36..d1cc10ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
python-apt (0.8.9.2) UNRELEASED; urgency=low
- * some fixes from a coverity scan run
+ * some fixes from the "coverity" scan
+ * merge from Ubuntu:
+ - data/templates/Ubuntu.info.in: add "Saucy Salamander" to
+ - debian/control: add "Multi-Arch: allowed"
-- Michael Vogt <mvo@debian.org> Mon, 05 Aug 2013 22:55:02 +0200
@@ -91,14 +94,6 @@ python-apt (0.8.9~exp1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Wed, 13 Mar 2013 18:36:37 +0100
-python-apt (0.8.8.3) UNRELEASED; urgency=low
-
- * aptsources/distro.py:
- - include the missing ID in the NoDistroTemplateException() error,
- thanks to Brian Murray
-
- -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 30 Apr 2013 18:37:24 +0200
-
python-apt (0.8.8.2) unstable; urgency=low
[ David Prévot ]
diff --git a/debian/control b/debian/control
index 945d49d5..ea80e940 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ XS-Testsuite: autopkgtest
Package: python-apt
Architecture: any
+Multi-Arch: allowed
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common
Recommends: lsb-release, iso-codes, xz-utils
Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4),
@@ -88,6 +89,7 @@ Description: Python interface to libapt-pkg (API documentation)
Package: python-apt-dbg
Priority: extra
Architecture: any
+Multi-Arch: allowed
Section: debug
Depends: python-dbg, python-apt (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
@@ -130,6 +132,7 @@ Description: Python interface to libapt-pkg (locales)
Package: python3-apt
Priority: optional
Architecture: any
+Multi-Arch: allowed
Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common
Recommends: lsb-release, iso-codes
Provides: ${python3:Provides}
@@ -152,6 +155,7 @@ Description: Python 3 interface to libapt-pkg
Package: python3-apt-dbg
Priority: extra
Architecture: any
+Multi-Arch: allowed
Section: debug
Breaks: python-apt (<< 0.7.98+nmu1)
Replaces: python-apt (<< 0.7.98+nmu1)