* merged http://glatzor.de/bzr/python-apt/sebi:

  - this means that the new aptsources modules is available

7 files changed, 64 insertions, 69 deletions

diff --git a/debian/changelog b/debian/changelog
index 1b232151..6754a724 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-apt (0.7.1) experimental; urgency=low
+
+  * merged http://glatzor.de/bzr/python-apt/sebi:
+    - this means that the new aptsources modules is available
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 14 May 2007 13:33:42 +0200
+
 python-apt (0.7.0) experimental; urgency=low
 
   * support translated pacakge descriptions
diff --git a/debian/compat b/debian/compat
index 7813681f..7ed6ff82 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
\ No newline at end of file
+5
diff --git a/debian/control b/debian/control
index f8d9dc93..2a30ee81 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,22 @@ Section: python
 Priority: optional
 Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
-Standards-Version: 3.6.2.0
+Standards-Version: 3.7.2
 XS-Python-Version: all
-Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.6.45), apt-utils, python-all-dev, python-central (>= 0.5)
+Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.0), apt-utils, python-all-dev, python-distutils-extra, cdbs, python-central (>= 0.5), python-all-dbg
+XS-Vcs-Bzr: http://people.debian.org/~mvo/bzr/python-apt/debian-experimental
 
 Package: python-apt
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, lsb-release
 Priority: optional
 Replaces: python2.3-apt (<< 0.6.18), python2.4-apt (<< 0.6.18)
 Conflicts: python2.3-apt (<< 0.6.18), python2.4-apt (<< 0.6.18)
 Provides: ${python:Provides}
+Suggests: python-apt-dbg
 XB-Python-Version: ${python:Versions}
 Description: Python interface to libapt-pkg
- The apt-pkg Python interface will provide full access to the internal 
+ 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:
  .
@@ -24,3 +26,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
+ .
+ The included 'aptsources' Python interface provides an abstraction of 
+ the sources.list configuration on the repository and the distro level.
+
+Package: python-apt-dbg
+Priority: extra
+Architecture: any
+Depends: python-dbg, python-apt (= ${Source-Version}), ${shlibs:Depends}
+Description: Python interface to libapt-pkg (debug extension)
+ 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.
+ .
+ This package contains the extension built for the python debug interpreter.
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/python-apt.docs b/debian/python-apt.docs
index f7756d28..208050c5 100644
--- a/debian/python-apt.docs
+++ b/debian/python-apt.docs
@@ -1,2 +1,3 @@
 README
 apt/README.apt
+data/templates/README.templates
diff --git a/debian/python-apt.install b/debian/python-apt.install
new file mode 100644
index 00000000..3e08ba50
--- /dev/null
+++ b/debian/python-apt.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/python*
+debian/tmp/usr/share/python-apt
diff --git a/debian/rules b/debian/rules
index 7299f554..33d04a21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,76 +1,44 @@
 #!/usr/bin/make -f
-# 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
+DEB_AUTO_CLEANUP_RCS := yes
+DEB_PYTHON_SYSTEM=pycentral
 
-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)
+export DH_PYCENTRAL=nomove
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+DEB_PYTHON_PACKAGES_EXCLUDE=python-apt-dbg
 
-PYTHON=$(shell pyversions -r debian/control)
+# Add here any variable or target overrides you need
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-
-	for PY in $(PYTHON); do \
-		/usr/bin/$$PY setup.py build; \
-	done
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
+PKG=python-apt
+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)
 
-	for PY in $(PYTHON); do \
-		/usr/bin/$$PY setup.py clean --all; \
+arch-build::
+	rm -rf debian/arch-build
+	mkdir -p debian/arch-build/$(PKG)-$(DEBVER)
+	tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` \
+	  | (cd debian/arch-build/$(PKG)-$(DEBVER);tar xf -)
+	(cd debian/arch-build/$(PKG)-$(DEBVER) && $(DEB_BUILD_PROG))
+
+build/python-apt-dbg::
+	set -e; \
+	for i in $(cdbs_python_build_versions); do \
+	  python$$i-dbg ./setup.py build; \
 	done
 
-	dh_clean
-
-# Build architecture-independent files here.
-binary-indep: DH_OPTIONS=-i
-binary-indep: build
-
-# Build architecture-dependent files here.
-binary-arch: DH_OPTIONS=-a
-binary-arch: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	
-	for PY in $(PYTHON); do \
-		/usr/bin/$$PY setup.py install --prefix=`pwd`/debian/python-apt/usr; \
+install/python-apt-dbg::
+	for i in $(cdbs_python_build_versions); do \
+	  python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-apt-dbg; \
 	done
+	find debian/python-apt-dbg \
+		! -type d ! -name '*_d.so' | xargs rm -f
+	find debian/python-apt-dbg -depth -empty -exec rmdir {} \;
 
-	dh_installdocs
-	dh_installchangelogs
-	dh_installexamples
-	dh_pycentral
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-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)
-	tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/python-apt-$(DEBVER);tar xf -)
-	(cd debian/arch-build/python-apt-$(DEBVER); $(DEB_BUILD_PROG))
+binary-predeb/python-apt-dbg::
+	rm -rf debian/python-apt-dbg/usr/share/doc/python-apt-dbg
+	ln -s python-apt debian/python-apt-dbg/usr/share/doc/python-apt-dbg
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+clean::
+	rm -rf build/lib* build/temp*