* merged with Greek0@gmx.net--2005-main, native apt interface added, fixed a refcount problem, added tests/ directory

* apt/package.py, apt/__init__.py:
  - started a native python interface that will wrap the uglier
    bits of python-apt in the future
* tests/pkgsrcrecords.py:
  - started a test directory
* python/pkgsrcrecords.cc:
  - fixed a refcount problem
  - merged with Greek0s tree

Patches applied:

 * Greek0@gmx.net--2005-main/python-apt--debian--0.6--base-0
   tag of apt@packages.debian.org/python-apt--main--0--patch-8

 * Greek0@gmx.net--2005-main/python-apt--debian--0.6--patch-1
   Minor typo fix in debian/rules

 * Greek0@gmx.net--2005-main/python-apt--debian--0.6--patch-2
   Typo fix in depcache.cc which caused wrong function to be called

 * Greek0@gmx.net--2005-main/python-apt--debian--0.6--patch-3
   Improved CppPyObject, leading to a better PkgDepCacheStruct

 * Greek0@gmx.net--2005-main/python-apt--debian--0.6--patch-4
   Improved build system

 * Greek0@gmx.net--2005-main/python-apt--debian--0.6--patch-5
   Restored the old tar.cc to work with the older apt in debian again

 * Greek0@gmx.net--2005-main/python-apt--debian--0.6--patch-6
   Fix for Debian #304296 (Segfault in CppOwnedDealloc)

 * Greek0@gmx.net--2005-main/python-apt--debian--0.6--patch-7
   Fix for Debian #304903 (FD leak)

 * Greek0@gmx.net--2005-main/python-apt--debian--0.6--patch-8
   Fixed the compilation error introduced in patch-6

 * Greek0@gmx.net--2005-main/python-apt--debian--0.6--patch-9
   New debian/changelog from Debians python-apt 0.6.10

 * Greek0@gmx.net--2005-main/python-apt--debian--0.6--patch-10
   Minor changes to make the packages lintian/linda clean

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

1 files changed, 32 insertions, 24 deletions

diff --git a/debian/rules b/debian/rules
index 8180834a..16d26380 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,59 +1,68 @@
 #!/usr/bin/make -f
-# MAde with the aid of dh_make, by Craig Small
+# Made with the aid of dh_make, by Craig Small
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Cristoph Lameter.
 
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=3
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-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)
+PYTHON=python2.3 python2.4
 
 build: build-stamp
 build-stamp:
 	dh_testdir
 
-	$(PYTHON) setup.py build
+	for PY in $(PYTHON); do \
+		/usr/bin/$$PY setup.py build; \
+	done
 
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -rf build-stamp debian/arch-build
+	rm -f build-stamp
 
-	$(PYTHON) setup.py clean --all
-	/usr/bin/python2.3 setup.py clean --all
+	for PY in $(PYTHON); do \
+		/usr/bin/$$PY setup.py clean --all; \
+	done
 
 	dh_clean
 
 # Build architecture-independent files here.
+binary-indep: DH_OPTIONS=-i
 binary-indep: build
-# We have nothing to do by default.
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installexamples doc/examples/*.py
+	dh_installchangelogs
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_python
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 # Build architecture-dependent files here.
+binary-arch: DH_OPTIONS=-a
 binary-arch: build
-#	dh_testversion
 	dh_testdir
 	dh_testroot
 	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
+	for PY in $(PYTHON); do \
+		/usr/bin/$$PY setup.py install --prefix=`pwd`/debian/$${PY}-apt/usr; \
+	done
 
 	dh_installdocs
-	# Hooks for doc-base. doc-base doesn't support `pdf' yet,
-	# therefore this is still disabled.
-	##XX install -d `pwd`/debian/tmp/usr/share/doc-base
-	##XX cp debian/doc-base `pwd`/debian/tmp/usr/share/doc-base/python-ldap
-	dh_installexamples doc/examples/*.py
-	dh_installmenu
-#	dh_installinit
-	dh_installcron
-	dh_installmanpages
-#	dh_undocumented
 	dh_installchangelogs
 	dh_strip
 	dh_compress
@@ -62,7 +71,6 @@ binary-arch: build
 	dh_shlibdeps
 	dh_python
 	dh_gencontrol
-#	dh_makeshlibs
 	dh_md5sums
 	dh_builddeb