* merged with matts tree, resolved lots of conflicts

Patches applied:

 * apt@packages.debian.org/python-apt--main--0--base-0
   tag of apt@arch.ubuntu.com/python-apt--MAIN--0--patch-44

 * apt@packages.debian.org/python-apt--main--0--patch-1
   Merge michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0

 * apt@packages.debian.org/python-apt--main--0--patch-2
   0.5.33

 * apt@packages.debian.org/python-apt--main--0--patch-3
   Add arch-build target to rules

 * apt@packages.debian.org/python-apt--main--0--patch-4
   Fix typo (fund->find)

 * apt@packages.debian.org/python-apt--main--0--patch-5
   Restore Ubuntu changes

 * apt@packages.debian.org/python-apt--main--0--patch-6
   0.5.35 -> hoary

 * apt@packages.debian.org/python-apt--main--0--patch-7
   Fix build-depends, somehow lost in merge

 * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--base-0
   tag of apt@arch.ubuntu.com/python-apt--MAIN--0--patch-44

 * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-1
   * merged from my mvo tree, removed all non-pkgDepCache releated stuff and cleaned up the code

 * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-2
   * beefed up the example code, added DepCache.Upgrade()

 * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-3
   * implemented the marking interface

 * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-4
   * state information and marking interface

 * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-5
   * fixed wrong types for "UsrSize" and "DebSize"

 * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-6
   * added DepCache.FixBroken()

 * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-7
   * example code how a overview about the changes can be computed

4 files changed, 52 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index e8dbbb37..69831041 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,29 @@
+python-apt (0.5.36) hoary; urgency=low
+
+  * Fix build-depends, somehow lost in merge
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Sat, 26 Feb 2005 18:53:54 -0800
+
+python-apt (0.5.35) hoary; urgency=low
+
+  * Target hoary this time
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Sat, 26 Feb 2005 15:57:21 -0800
+
+python-apt (0.5.34) unstable; urgency=low
+
+  * Restore Ubuntu changes
+    - Build python 2.4 as default, add python2.3-apt
+    - Typo fix (Ubuntu #4677)
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Sat, 26 Feb 2005 15:53:30 -0800
+
 python-apt (0.5.33) unstable; urgency=low
 
-  * added basic support for the depcache (python/depcache.cc)
+  * Merge michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0
+    - Basic depcache API (Ubuntu #6889)
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Feb 2005 12:02:44 +0100
+ -- Matt Zimmerman <mdz@ubuntu.com>  Sat, 26 Feb 2005 15:37:48 -0800
 
 python-apt (0.5.32) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 0cc070e7..1d3e1314 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Matt Zimmerman <mdz@debian.org>
 Standards-Version: 3.1.1
-Build-Depends: debhelper, libapt-pkg-dev (>= 0.5.32), apt-utils, python-dev (>= 2.4)
+Build-Depends: debhelper (>= 4.2.28), libapt-pkg-dev (>= 0.5.32), apt-utils, python, python-dev (>= 2.4), python2.3-dev
 
 Package: python-apt
 Architecture: any
@@ -19,3 +19,17 @@ Description: Python interface to libapt-pkg
   - Access to the APT package information database
   - Parsing of Debian package control files, and other files with a
     similar structure
+
+Package: python2.3-apt
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}
+Priority: optional
+Description: Python interface to libapt-pkg
+ The apt-pkg Python interface will provide full access to the internal 
+ libapt-pkg structures allowing Python programs to easily perform a
+ variety of functions, such as:
+ .
+  - Access to the APT configuration system
+  - Access to the APT package information database
+  - Parsing of Debian package control files, and other files with a
+    similar structure
diff --git a/debian/python-dep b/debian/python-dep
deleted file mode 100644
index bc688ef8..00000000
--- a/debian/python-dep
+++ /dev/null
@@ -1,6 +0,0 @@
-import sys;
-
-if sys.version[:3] != "1.5":
-	print "python:Depends=python (>= %s), python (<< %s)" % (sys.version[:3],float(sys.version[:3])+0.1)
-else:
-	print "python:Depends=python-base (>= 1.5) | python1.5"
diff --git a/debian/rules b/debian/rules
index 2716f760..8180834a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,9 @@
 
 PYTHON=/usr/bin/python2.4
 
+DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
+DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
+
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -19,9 +22,10 @@ build-stamp:
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -rf build-stamp debian/arch-build
 
 	$(PYTHON) setup.py clean --all
+	/usr/bin/python2.3 setup.py clean --all
 
 	dh_clean
 
@@ -37,6 +41,7 @@ binary-arch: build
 	dh_clean -k
 
 	$(PYTHON) setup.py install --prefix=`pwd`/debian/tmp/usr
+	/usr/bin/python2.3 setup.py install --prefix=`pwd`/debian/python2.3-apt/usr
 
 	dh_installdocs
 	# Hooks for doc-base. doc-base doesn't support `pdf' yet,
@@ -55,7 +60,7 @@ binary-arch: build
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	$(PYTHON) debian/python-dep >> debian/substvars
+	dh_python
 	dh_gencontrol
 #	dh_makeshlibs
 	dh_md5sums
@@ -64,5 +69,12 @@ binary-arch: build
 source diff:                                                                  
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
+arch-build:
+	rm -rf debian/arch-build
+	mkdir -p debian/arch-build/python-apt-$(DEBVER)
+	baz inventory -s | xargs cp -a --parents --target=debian/arch-build/python-apt-$(DEBVER)
+	(cd debian/arch-build/python-apt-$(DEBVER); $(DEB_BUILD_PROG))
+
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary