From 5e4d32fbdcb6ab0bfe5326e09fea1c9ecd7ef98d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 6 May 2005 09:11:15 +0000 Subject: * merged with matts mainline Patches applied: * apt@packages.debian.org/python-apt--main--0--patch-9 Merge michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0 * apt@packages.debian.org/python-apt--main--0--patch-10 Merge minor changes from michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0 * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-16 * merged with Greek0@gmx.net--2005-main/python-apt--debian--0.6 * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-17 * python/pkgsrcrecords.cc: fix a refcount problem * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-18 * changed version to 0.6.11 * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-19 * build depends against python-dev (without a version). this will do the right thing on both debian and ubuntu * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-20 * made the "arch-build" target work again * michael.vogt@ubuntu.com--2005/python-apt--pkgDepCache--0--patch-21 * made arch-build work again (for real this time) --- debian/changelog | 17 ++++++++++------- debian/control | 2 +- debian/rules | 4 +++- 3 files changed, 14 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index efaf9405..d6260709 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,17 @@ -python-apt (0.5.37) hoary; urgency=low - - * fixed some reference count problems in the depcache code - * DepCache.Init() is never called implicit now - * merged with Greek0@gmx.net--2005-main/python-apt--debian--0.6 - that fixes a segfault in the pkgsrcrecords code +python-apt (0.6.12) hoary; urgency=low + * added a tests/ directory * added tests/pkgsrcrecords.py that will check if the pkgsrcrecords interface does not segfault - -- Michael Vogt Thu, 7 Apr 2005 10:20:30 +0200 + -- Michael Vogt Fri, 6 May 2005 10:11:52 +0200 + +python-apt (0.6.11) experimental; urgency=low + + * fixed some reference count problems in the depcache and + pkgsrcrecords code + * DepCache.Init() is never called implicit now + * merged with python-apt tree from Greek0@gmx.net--2005-main python-apt (0.5.36ubuntu2) hoary; urgency=low diff --git a/debian/control b/debian/control index 99e15296..69112768 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: APT Development Team Uploaders: Matt Zimmerman Standards-Version: 3.6.1.1 -Build-Depends: debhelper (>= 4.2.28), libapt-pkg-dev (>= 0.6.35), apt-utils, python-dev (>= 2.4), python2.4-dev, python2.3-dev +Build-Depends: debhelper (>= 4.2.28), libapt-pkg-dev (>= 0.6.35), apt-utils, python-dev, python2.4-dev, python2.3-dev Package: python-apt Architecture: all diff --git a/debian/rules b/debian/rules index 16d26380..0ab6fa27 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,9 @@ export DH_OPTIONS # This is the debhelper compatibility version to use. export DH_COMPAT=3 +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 @@ -83,6 +86,5 @@ arch-build: 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 -- cgit v1.2.3