Control: found -1 18.8-1 The problem is still present in the current version of setuptools in sid (18.8-1). I updated my patch to this version.
If I can do anything else to help fixing this in Debian, please let me know.
diff -Nru python-setuptools-18.8/debian/changelog python-setuptools-18.8/debian/changelog --- python-setuptools-18.8/debian/changelog 2015-12-13 22:51:45.000000000 +0900 +++ python-setuptools-18.8/debian/changelog 2016-01-26 13:43:21.000000000 +0900 @@ -1,3 +1,9 @@ +python-setuptools (18.8-1.1~tux1) unstable; urgency=medium + + * Correct return value for get_site_dirs to use dist-packages. + + -- Philipp Edelmann <edelm...@fs.tum.de> Fri, 06 Nov 2015 21:06:34 +0100 + python-setuptools (18.8-1) unstable; urgency=medium * New upstream version. diff -Nru python-setuptools-18.8/debian/patches/install-layout.diff python-setuptools-18.8/debian/patches/install-layout.diff --- python-setuptools-18.8/debian/patches/install-layout.diff 2015-12-13 22:51:57.000000000 +0900 +++ python-setuptools-18.8/debian/patches/install-layout.diff 2016-01-26 13:48:16.000000000 +0900 @@ -1,5 +1,3 @@ -Index: b/setuptools/command/easy_install.py -=================================================================== --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -135,13 +135,15 @@ class easy_install(Command): @@ -108,25 +106,26 @@ for attr, val in scheme.items(): if getattr(self, attr, None) is None: setattr(self, attr, val) -@@ -1329,9 +1373,14 @@ def get_site_dirs(): - "site-packages"), - os.path.join(prefix, "lib", "site-python")]) - else: +@@ -1323,11 +1367,14 @@ def get_site_dirs(): + if sys.platform in ('os2emx', 'riscos'): + sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) + elif os.sep == '/': +- sitedirs.extend([os.path.join(prefix, +- "lib", +- "python" + sys.version[:3], +- "site-packages"), +- os.path.join(prefix, "lib", "site-python")]) + if sys.version[:3] in ('2.3', '2.4', '2.5'): + sdir = "site-packages" + else: + sdir = "dist-packages" - sitedirs.extend( -- [prefix, os.path.join(prefix, "lib", "site-packages")] -- ) ++ sitedirs.extend( + [os.path.join(prefix, "local/lib", "python" + sys.version[:3], sdir), + os.path.join(prefix, "lib", "python" + sys.version[:3], sdir)] + ) - if sys.platform == 'darwin': - # for framework builds *only* we add the standard Apple - # locations. Currently only per-user, but /Library and -Index: b/setuptools/command/install_egg_info.py -=================================================================== + else: + sitedirs.extend( + [prefix, os.path.join(prefix, "lib", "site-packages")] --- a/setuptools/command/install_egg_info.py +++ b/setuptools/command/install_egg_info.py @@ -1,5 +1,5 @@
signature.asc
Description: PGP signature