From c524dfb7143ce428288675f630e9d1f21accccff Mon Sep 17 00:00:00 2001 From: Matthias Klose <doko@ubuntu.com> Date: Mon, 12 May 2014 11:55:49 +0200 Subject: [PATCH] * dh_python2: no longer move files to /usr/share/pyshared, don't create /usr/lib/pyshared symlinks for extensions. --- debian/changelog | 2 ++ dh_python2 | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3bce16b..5001ffd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ python-defaults (2.7.6-1) UNRELEASED; urgency=medium * Bump version to 2.7.6. + * dh_python2: no longer move files to /usr/share/pyshared, don't create + /usr/lib/pyshared symlinks for extensions. * Use UTF-8 encoding for the python policy in HTML format. Closes: #689931. -- Matthias Klose <doko@debian.org> Wed, 07 May 2014 14:40:27 +0200 diff --git a/dh_python2 b/dh_python2 index 1b88b29..be1562b 100755 --- a/dh_python2 +++ b/dh_python2 @@ -123,11 +123,8 @@ def share(package, stats, options): dc = dircmp(dir1, dir2) share_2x(dir1, dir2, dc) elif len(pubvers) == 1: - # TODO: remove this once file conflicts will not be needed anymore - move_to_pyshared(sitedir(pubvers[0], package)) - - for version in stats['ext']: - create_ext_links(sitedir(version, package)) + # don't install into pyshared anymore + pass if options.guess_versions and pubvers: for version in get_requested_versions(options.vrange): -- GitLab