diff --git a/debian/changelog b/debian/changelog index 13f9fc1809076a6773c61d2f6c116d3e2474f73e..0b24bfbf5c09eb0cee7a1115003b26bbdbb8b8da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-defaults (2.6.6-6) UNRELEASED; urgency=low +python-defaults (2.6.6-6) experimental; urgency=low * dh_python2: - make the error message about missing extension more clear @@ -17,7 +17,7 @@ python-defaults (2.6.6-6) UNRELEASED; urgency=low - do not try to check if interpreter is present when version range is empty - -- Piotr Ożarowski <piotr@debian.org> Sun, 21 Nov 2010 23:49:32 +0100 + -- Piotr Ożarowski <piotr@debian.org> Wed, 01 Dec 2010 19:43:50 +0100 python-defaults (2.6.6-5) experimental; urgency=low diff --git a/dh_python2 b/dh_python2 index 6b7756f02c9bb7b934feb752910518dce51037af..1404f52cfc8defa7aad44a83bb665c646c1b74a7 100755 --- a/dh_python2 +++ b/dh_python2 @@ -28,7 +28,7 @@ import re import sys from filecmp import dircmp, cmpfiles from optparse import OptionParser, SUPPRESS_HELP -from os.path import isdir, islink, exists, join +from os.path import isdir, islink, exists, join, realpath from shutil import rmtree, copy as fcopy from stat import ST_MODE, S_IXUSR, S_IXGRP, S_IXOTH sys.path.insert(1, '/usr/share/python/') @@ -154,6 +154,8 @@ def share(package, stats, options): if srcver in stats['public_vers']: stats['public_vers'].add(version) share_2x(sitedir(srcver, package), sitedir(version, package)) + # remove duplicates + stats['requires.txt'] = set(realpath(i) for i in stats['requires.txt']) def move_to_pyshared(dir1): @@ -515,6 +517,7 @@ def main(): pyshared_dir = "debian/%s/usr/share/pyshared/" % package if not stats['public_vers'] and exists(pyshared_dir): create_public_links(pyshared_dir, options.vrange) + stats['public_vers'] = get_requested_versions(options.vrange) dependencies = Dependencies(package, dh.packages[package]['uses_breaks'])