Bug#773852: unblock: zodb/1:3.9.7-5 (pre-approval)
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Hello,
Some time ago I uploaded python-zodb to fix RC bug #767554 but I forgot
to remove some headers files, sorry about that. Would it be possible to
upload python-zodb with the (really straightforward) diff attached?
Thank you very much in advance.
Regards,
--
Arnaud Fontaine
diff -Nru zodb-3.9.7/debian/changelog zodb-3.9.7/debian/changelog
--- zodb-3.9.7/debian/changelog 2014-12-16 17:16:27.000000000 +0900
+++ zodb-3.9.7/debian/changelog 2014-12-24 12:17:32.000000000 +0900
@@ -1,3 +1,11 @@
+zodb (1:3.9.7-5) unstable; urgency=medium
+
+ * Team upload.
+ * persistent module was removed in the previous upload, but some headers
+ were not. Thanks to Kirill Smelkov. Closes: #773699.
+
+ -- Arnaud Fontaine <arnau@debian.org> Wed, 24 Dec 2014 12:16:03 +0900
+
zodb (1:3.9.7-4) unstable; urgency=medium
* Team upload.
diff -Nru zodb-3.9.7/debian/patches/persistent-module-4.x-no-headers.patch zodb-3.9.7/debian/patches/persistent-module-4.x-no-headers.patch
--- zodb-3.9.7/debian/patches/persistent-module-4.x-no-headers.patch 1970-01-01 09:00:00.000000000 +0900
+++ zodb-3.9.7/debian/patches/persistent-module-4.x-no-headers.patch 2014-12-24 12:15:57.000000000 +0900
@@ -0,0 +1,25 @@
+Description: Don't provide persistent headers in python-zodb
+ python-zodb now depends on separate python-persistent and to be compatible
+ with that in python-zodb, after building the package, we remove installed
+ persistent completely. However ZODB also used to install persistent headers in
+ ZODB namespace which were left and now correspond to nothing provided in
+ python-zodb and duplicate persistent headers in python-persistent.
+ After splitting persistent into separate package, upstream already removed
+ that 'headers install' in zodb package:
+ - 57dca750 (Fixed: An unneeded left-over setting in setup.py caused
+ installation with pip to fail).
+ - f5b98e96 (ZODB w/ externally-distributed 'persistent'.)
+ so do it here too.
+
+--- zodb-3.9.7.orig/setup.py
++++ zodb-3.9.7/setup.py
+@@ -188,9 +188,6 @@ setup(name="ZODB3",
+ packages = find_packages('src'),
+ package_dir = {'': 'src'},
+ ext_modules = exts,
+- headers = ['src/persistent/cPersistence.h',
+- 'src/persistent/py24compat.h',
+- 'src/persistent/ring.h'],
+ license = "ZPL 2.1",
+ platforms = ["any"],
+ description = doclines[0],
diff -Nru zodb-3.9.7/debian/patches/series zodb-3.9.7/debian/patches/series
--- zodb-3.9.7/debian/patches/series 2014-12-16 16:51:28.000000000 +0900
+++ zodb-3.9.7/debian/patches/series 2014-12-24 12:15:57.000000000 +0900
@@ -1,5 +1,6 @@
lp_135108.patch
persistent-module-4.x-compat.patch
+persistent-module-4.x-no-headers.patch
test-spurious-failure-under-python27.patch
testUtils.patch
new-transaction.patch
Reply to: