From c0b6c9e6812970ac952593abf3d6b4d810b06c9d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Mar 2005 10:21:47 +0000 Subject: * 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 --- debian/python-dep | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 debian/python-dep (limited to 'debian/python-dep') 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" -- cgit v1.2.3