From e451655d9d837fcc5ade3d336012f2bb04700c56 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 1 Jun 2005 07:05:20 +0000 Subject: * added conflicts, merged with python-apt--pkgDepCache--0 Patches applied: * Greek0@gmx.net--2005-main/python-apt--debian--0.6--patch-11 Merge from python-apt--main--0 * Greek0@gmx.net--2005-main/python-apt--debian--0.6--patch-12 Same fix again as in patch-2, replayed after merge * Greek0@gmx.net--2005-main/python-apt--debian--0.6--patch-13 Fix for Debian #308586 * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-22 * added mvo@debian.org to uploaders and changed to mvo@debian.org in the changelog * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-23 * added AUTHORS file * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-24 * synced changelog/control with the experimental upload * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-25 * merge with mainline * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-26 * merged conflict and typo fix from christian * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-27 * started 0.6.12 and conflict with older python-apt in python2.4-apt too * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-28 * proper credit Christian for the fixes, finalized changelog --- debian/control | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 69112768..b2d00881 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: python-apt Section: python Priority: optional Maintainer: APT Development Team -Uploaders: Matt Zimmerman +Uploaders: Matt Zimmerman , Michael Vogt Standards-Version: 3.6.1.1 Build-Depends: debhelper (>= 4.2.28), libapt-pkg-dev (>= 0.6.35), apt-utils, python-dev, python2.4-dev, python2.3-dev @@ -23,6 +23,7 @@ Description: Python interface to libapt-pkg Package: python2.3-apt Architecture: any Depends: python2.3, ${shlibs:Depends} +Conflicts: python-apt (<< 0.6.11) Priority: optional Description: Python interface to libapt-pkg The apt-pkg Python interface will provide full access to the internal @@ -37,6 +38,7 @@ Description: Python interface to libapt-pkg Package: python2.4-apt Architecture: any Depends: python2.4, ${shlibs:Depends} +Conflicts: python-apt (<< 0.6.11) Priority: optional Description: Python interface to libapt-pkg The apt-pkg Python interface will provide full access to the internal -- cgit v1.2.3