merged glatzors python-apt branch that includes the new aptsource module

3 files changed, 12 insertions, 76 deletions

diff --git a/debian/control b/debian/control
index 765c3914..4ea3a31c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,18 @@ Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
 Standards-Version: 3.7.2
 XS-Python-Version: all
-Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.6.45ubuntu3), apt-utils, python-all-dev, python-central
+Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.6.45), apt-utils, python-all-dev, python-central, python-distutils-extra, cdbs
 
 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}
 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 +24,6 @@ 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.
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/rules b/debian/rules
index 7299f554..6367c02f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,76 +1,8 @@
 #!/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)
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-PYTHON=$(shell pyversions -r debian/control)
-
-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
-
-	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
-
-# 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; \
-	done
-
-	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: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+# 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