diff --git a/debian/changelog b/debian/changelog index d992b8fba83f916cbb3529b6110cb4c725706d41..d8ebe2944919d626b225e1993f20602fb02736f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ python-defaults (2.7.2-6) UNRELEASED; urgency=low + [ Scott Kitterman ] * Fixed typo in python-policy (thanks to Jakub Wilk) + [ Piotr Ożarowski ] + * dh_python2: + - handle private dirs without leading slash + -- Scott Kitterman <scott@kitterman.com> Sat, 03 Sep 2011 11:21:35 -0400 python-defaults (2.7.2-5) experimental; urgency=low diff --git a/dh_python2 b/dh_python2 index fb5d24a893e4f5088008405561b6531d661065bf..4d6f603d988e2f55dab3889c093f0b87846bfda3 100755 --- a/dh_python2 +++ b/dh_python2 @@ -554,7 +554,13 @@ def main(): log.warning('dh_pydeb detected, PyDist feature disabled') options.guess_deps = False - private_dir = None if not args else args[0] + if not args: + private_dir = None + else: + private_dir = args[0] + if not private_dir.startswith('/'): + # handle usr/share/foo dirs (without leading slash) + private_dir = '/' + private_dir # TODO: support more than one private dir at the same time (see :meth:scan) if options.skip_private: private_dir = False