Bug#925461: unblock: pypy/7.0.0+dfsg-3, backports.functools-lru-cache/1.5-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock pypy & backports.functools-lru-cache.
A relatively last-minute feature in pypy was namespace package support
(#920899). Unfortunately the path I picked isn't what dh_pypy (in
dh-python) implemented, and I think Piotr's rationale for that was
reasonable. But I didn't notice the incompatibility until after the
freeze.
So, #924676 and #924677.
debdiffs attached.
unblock pypy/7.0.0+dfsg-3
unblock backports.functools-lru-cache/1.5-3
Thanks,
SR
diff -Nru pypy-7.0.0+dfsg/debian/changelog pypy-7.0.0+dfsg/debian/changelog
--- pypy-7.0.0+dfsg/debian/changelog 2019-02-12 17:41:21.000000000 -0500
+++ pypy-7.0.0+dfsg/debian/changelog 2019-03-24 11:07:07.000000000 -0400
@@ -1,3 +1,12 @@
+pypy (7.0.0+dfsg-3) unstable; urgency=medium
+
+ * Update watch file regex, upstream calls it pypy2.7 now.
+ * pypycompile and pypyclean now read namespaces from /usr/share/pypy/ns
+ (following dh_pypy). (Closes: #924676)
+ - Breaks old pypy-backports.functools-lru-cache, using the old location.
+
+ -- Stefano Rivera <stefanor@debian.org> Sun, 24 Mar 2019 11:07:07 -0400
+
pypy (7.0.0+dfsg-2) unstable; urgency=medium
* Remove dh_builddeb override, no longer necessary.
diff -Nru pypy-7.0.0+dfsg/debian/control pypy-7.0.0+dfsg/debian/control
--- pypy-7.0.0+dfsg/debian/control 2019-02-12 17:41:21.000000000 -0500
+++ pypy-7.0.0+dfsg/debian/control 2019-03-24 11:07:07.000000000 -0400
@@ -18,8 +18,8 @@
procps,
pypy [any-amd64 any-i386 armhf ppc64 ppc64el s390x] <!stage1>,
python (>= 2.6.6-11~),
- python-pycparser,
python-docutils,
+ python-pycparser,
python-sphinx (>= 1.0.7+dfsg),
python2.7-dev,
tcl-dev,
@@ -36,7 +36,9 @@
Package: pypy
Architecture: any
Depends: pypy-lib (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Breaks: pypy-dev (<< ${source:Version})
+Breaks:
+ pypy-backports.functools-lru-cache (<< 1.5-3~),
+ pypy-dev (<< ${source:Version})
Provides: ${pypy-abi}
Suggests: pypy-doc, pypy-tk (= ${binary:Version})
Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
diff -Nru pypy-7.0.0+dfsg/debian/copyright pypy-7.0.0+dfsg/debian/copyright
--- pypy-7.0.0+dfsg/debian/copyright 2019-02-12 17:41:21.000000000 -0500
+++ pypy-7.0.0+dfsg/debian/copyright 2019-03-24 11:07:07.000000000 -0400
@@ -206,7 +206,7 @@
Floris Bruynooghe
Christopher Pope
Tristan Arthur
- Christian Tismer
+ Christian Tismer
Dan Stromberg
Carl Meyer
Florin Papa
diff -Nru pypy-7.0.0+dfsg/debian/pypy.dirs pypy-7.0.0+dfsg/debian/pypy.dirs
--- pypy-7.0.0+dfsg/debian/pypy.dirs 2019-02-12 17:41:21.000000000 -0500
+++ pypy-7.0.0+dfsg/debian/pypy.dirs 2019-03-24 11:07:07.000000000 -0400
@@ -1,2 +1,2 @@
+/usr/share/pypy/ns
/usr/local/lib/pypy2.7/dist-packages
-/usr/lib/pypy/ns
diff -Nru pypy-7.0.0+dfsg/debian/pypy.install pypy-7.0.0+dfsg/debian/pypy.install
--- pypy-7.0.0+dfsg/debian/pypy.install 2019-02-12 17:41:21.000000000 -0500
+++ pypy-7.0.0+dfsg/debian/pypy.install 2019-03-24 11:07:07.000000000 -0400
@@ -2,5 +2,5 @@
debian/scripts/pypycompile /usr/bin
include/pypy_*.h /usr/lib/pypy/include
lib_pypy/_*_cffi.*.so /usr/lib/pypy/lib_pypy
-pypy/goal/pypy-c /usr/lib/pypy/bin
pypy/goal/libpypy-c.so /usr/lib/pypy/bin
+pypy/goal/pypy-c /usr/lib/pypy/bin
diff -Nru pypy-7.0.0+dfsg/debian/pypy.links pypy-7.0.0+dfsg/debian/pypy.links
--- pypy-7.0.0+dfsg/debian/pypy.links 2019-02-12 17:41:21.000000000 -0500
+++ pypy-7.0.0+dfsg/debian/pypy.links 2019-03-24 11:07:07.000000000 -0400
@@ -1,2 +1,2 @@
-/usr/lib/pypy/bin/pypy-c /usr/bin/pypy
/usr/lib/pypy/bin/libpypy-c.so /usr/lib/libpypy-c.so
+/usr/lib/pypy/bin/pypy-c /usr/bin/pypy
diff -Nru pypy-7.0.0+dfsg/debian/scripts/pypyclean pypy-7.0.0+dfsg/debian/scripts/pypyclean
--- pypy-7.0.0+dfsg/debian/scripts/pypyclean 2019-02-12 17:41:21.000000000 -0500
+++ pypy-7.0.0+dfsg/debian/scripts/pypyclean 2019-03-24 11:07:07.000000000 -0400
@@ -31,7 +31,7 @@
def installed_namespaces():
'''Return a dictionary of package: frozenset(namespaces)'''
- ns_dir = '/usr/lib/pypy/ns'
+ ns_dir = '/usr/share/pypy/ns'
ns_by_pkg = {}
for pkg in os.listdir(ns_dir):
ns_file = os.path.join(ns_dir, pkg)
diff -Nru pypy-7.0.0+dfsg/debian/scripts/pypycompile pypy-7.0.0+dfsg/debian/scripts/pypycompile
--- pypy-7.0.0+dfsg/debian/scripts/pypycompile 2019-02-12 17:41:21.000000000 -0500
+++ pypy-7.0.0+dfsg/debian/scripts/pypycompile 2019-03-24 11:07:07.000000000 -0400
@@ -45,7 +45,7 @@
'''Iterate through a package's ns file.
Create all necessary__init__.pys, and yield them.
'''
- ns_file = os.path.join('/usr/lib/pypy/ns', package)
+ ns_file = os.path.join('/usr/share/pypy/ns', package)
if not os.path.exists(ns_file):
return
with open(ns_file) as f:
diff -Nru pypy-7.0.0+dfsg/debian/watch pypy-7.0.0+dfsg/debian/watch
--- pypy-7.0.0+dfsg/debian/watch 2019-02-12 17:41:21.000000000 -0500
+++ pypy-7.0.0+dfsg/debian/watch 2019-03-24 11:07:07.000000000 -0400
@@ -3,4 +3,4 @@
# To repack, run debian/rules get-packaged-orig-source
opts=dversionmangle=s/\+dfsg// \
https://bitbucket.org/pypy/pypy/downloads/ \
- pypy2-v([0-9.]+)-src\.tar\.bz2
+ pypy2.7-v([0-9.]+)-src\.tar\.bz2
diff -Nru backports.functools-lru-cache-1.5/debian/changelog backports.functools-lru-cache-1.5/debian/changelog
--- backports.functools-lru-cache-1.5/debian/changelog 2019-01-31 01:25:47.000000000 -0500
+++ backports.functools-lru-cache-1.5/debian/changelog 2019-03-24 10:58:45.000000000 -0400
@@ -1,3 +1,10 @@
+backports.functools-lru-cache (1.5-3) unstable; urgency=medium
+
+ * Team upload.
+ * dh_pypy now supports namespace packages. Use it. (Closes: #924677)
+
+ -- Stefano Rivera <stefanor@debian.org> Sun, 24 Mar 2019 10:58:45 -0400
+
backports.functools-lru-cache (1.5-2) unstable; urgency=medium
[ Stefano Rivera ]
diff -Nru backports.functools-lru-cache-1.5/debian/control backports.functools-lru-cache-1.5/debian/control
--- backports.functools-lru-cache-1.5/debian/control 2019-01-31 01:25:47.000000000 -0500
+++ backports.functools-lru-cache-1.5/debian/control 2019-03-24 10:58:45.000000000 -0400
@@ -4,7 +4,7 @@
Maintainer: Sandro Tosi <morph@debian.org>
Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Build-Depends: debhelper (>= 10),
- dh-python,
+ dh-python (>= 3.20190308~),
pypy,
pypy-setuptools,
pypy-setuptools-scm,
@@ -30,7 +30,7 @@
Package: pypy-backports.functools-lru-cache
Architecture: all
-Depends: ${misc:Depends}, ${pypy:Depends}, pypy (>= 6.0.0+dfsg-4~)
+Depends: ${misc:Depends}, ${pypy:Depends}, pypy (>= 7.0.0+dfsg-3~)
Recommends: ${pypy:Recommends}
Suggests: ${pypy:Suggests}
Description: backport of functools.lru_cache from Python 3.3 to PyPy
diff -Nru backports.functools-lru-cache-1.5/debian/rules backports.functools-lru-cache-1.5/debian/rules
--- backports.functools-lru-cache-1.5/debian/rules 2019-01-31 01:25:47.000000000 -0500
+++ backports.functools-lru-cache-1.5/debian/rules 2019-03-24 10:58:45.000000000 -0400
@@ -12,7 +12,4 @@
dh_python2 --namespace backports
override_dh_pypy:
- dh_pypy
- # No built-in namespace support, yet
- mkdir -p debian/pypy-backports.functools-lru-cache/usr/lib/pypy/ns
- echo backports > debian/pypy-backports.functools-lru-cache/usr/lib/pypy/ns/pypy-backports.functools-lru-cache
+ dh_pypy --namespace backports
Reply to: