* 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

3 files changed, 19 insertions, 2 deletions

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 00000000..8a0feb1d
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,3 @@
+jgg Jason Gunthorpe <jgg@debian.org>
+mdz Matt Zimmerman <mdz@debian.org>
+mvo Michael Vogt <mvo@debian.org>
diff --git a/debian/changelog b/debian/changelog
index d6260709..2541278b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
-python-apt (0.6.12) hoary; urgency=low
+python-apt (0.6.12ubuntu1) experimental; urgency=low
+
+  * Greek0@gmx.net--2005-main/python-apt--debian--0.6:
+    - python2.{3,4}-apt conflicts with python-apt (<< 0.6.11)
+      (closes: #308586)
+      (closes ubuntu: #11380)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 12 May 2005 11:34:05 +0200
+
+python-apt (0.6.12) breezy; urgency=low
   
   * added a tests/ directory
   * added tests/pkgsrcrecords.py that will check if the pkgsrcrecords
     interface does not segfault
+  * new native python "apt" interface that hides the details of apt_pkg
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  6 May 2005 10:11:52 +0200
   
@@ -13,6 +23,8 @@ python-apt (0.6.11) experimental; urgency=low
   * DepCache.Init() is never called implicit now
   * merged with python-apt tree from Greek0@gmx.net--2005-main
 
+ -- Michael Vogt <mvo@debian.org>  Fri,  6 May 2005 10:04:38 +0200
+
 python-apt (0.5.36ubuntu2) hoary; urgency=low
 
   * return "None" in GetCandidateVer() if no Candidate is found
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 <deity@lists.debian.org>
-Uploaders: Matt Zimmerman <mdz@debian.org>
+Uploaders: Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
 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