diff --git a/debian/changelog b/debian/changelog index 7ccb56e90ffe62cb4d2c436fa34723e6f0d54def..01886287922f3896968465c59802493a4b71ff66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-defaults (2.7.3-3) UNRELEASED; urgency=low + + * dh_python2: no longer sensitive to trailing slash in private dir names + (closes: #686358) + + -- Piotr Ożarowski <piotr@debian.org> Fri, 31 Aug 2012 18:06:26 +0200 + python-defaults (2.7.3-2) unstable; urgency=low * dh_python2: ignore empty files while trying to normalize shebangs diff --git a/dh_python2 b/dh_python2 index 617d8009f15d1f984e021cf724c2f894883ecd2b..911f4a72687194be7b9cf6cf91387207f56deef3 100755 --- a/dh_python2 +++ b/dh_python2 @@ -321,8 +321,9 @@ def scan(package, dname=None, options=None): 'usr/share/%s', 'usr/share/games/%s')] else: # scan private directory *only* - proot = join('debian', package, dname.strip('/')) - private_to_check = [dname[1:]] + dname = dname.strip('/') + proot = join('debian', package, dname) + private_to_check = [dname] for root, dirs, file_names in os.walk(proot): # ignore Python 3.X locations