r2934 - in zope.interface/trunk/debian (9 files)
barry at users.alioth.debian.org
barry at users.alioth.debian.org
Fri Jun 19 14:55:55 UTC 2015
Date: Friday, June 19, 2015 @ 14:55:54
Author: barry
Revision: 2934
* d/control:
- Bump Standards-Version with no other changes necessary.
- wrap-and-sort
* d/rules: Restore cross building rules.
* d/tests:
- Add DEP-8 tests for python{,3}-dbg interpreter.
- Ensure that the C extension module can be imported in all interpreters.
Added:
zope.interface/trunk/debian/tests/all-2
(from rev 2933, zope.interface/trunk/debian/tests/all)
zope.interface/trunk/debian/tests/all-dbg-2
zope.interface/trunk/debian/tests/all-dbg-3
Modified:
zope.interface/trunk/debian/changelog
zope.interface/trunk/debian/control
zope.interface/trunk/debian/rules
zope.interface/trunk/debian/tests/all-3
zope.interface/trunk/debian/tests/control
Deleted:
zope.interface/trunk/debian/tests/all
Modified: zope.interface/trunk/debian/changelog
===================================================================
--- zope.interface/trunk/debian/changelog 2015-06-11 21:12:45 UTC (rev 2933)
+++ zope.interface/trunk/debian/changelog 2015-06-19 14:55:54 UTC (rev 2934)
@@ -1,7 +1,13 @@
zope.interface (4.1.2-1) UNRELEASED; urgency=medium
* New upstream release.
- * d/control: Bump Standards-Version with no other changes necessary.
+ * d/control:
+ - Bump Standards-Version with no other changes necessary.
+ - wrap-and-sort
+ * d/rules: Restore cross building rules.
+ * d/tests:
+ - Add DEP-8 tests for python{,3}-dbg interpreter.
+ - Ensure that the C extension module can be imported in all interpreters.
* d/watch: Use pypi.debian.net redirector.
-- Barry Warsaw <barry at debian.org> Mon, 01 Jun 2015 14:16:15 -0400
Modified: zope.interface/trunk/debian/control
===================================================================
--- zope.interface/trunk/debian/control 2015-06-11 21:12:45 UTC (rev 2933)
+++ zope.interface/trunk/debian/control 2015-06-19 14:55:54 UTC (rev 2934)
@@ -4,15 +4,15 @@
Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
Uploaders: Brian Sutherland <brian at vanguardistas.net>,
Fabio Tranchitella <kobold at debian.org>,
- Barry Warsaw <barry at debian.org>
+ Barry Warsaw <barry at debian.org>,
Build-Depends: debhelper (>= 9),
dh-python,
+ python-all-dbg,
python-all-dev (>= 2.6.6-3~),
- python-all-dbg,
python-setuptools,
python-zope.event,
+ python3-all-dbg,
python3-all-dev,
- python3-all-dbg,
python3-setuptools,
python3-zope.event,
Standards-Version: 3.9.6
@@ -25,10 +25,17 @@
Package: python-zope.interface
Architecture: any
-Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Provides: python-zope, python-zopeinterface, ${python:Provides}
-Replaces: python-zope, python-zopeinterface
-Conflicts: python-zope, python-zopeinterface, zope3
+Depends: ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends},
+Provides: python-zope,
+ python-zopeinterface,
+ ${python:Provides},
+Replaces: python-zope,
+ python-zopeinterface,
+Conflicts: python-zope,
+ python-zopeinterface,
+ zope3,
Description: Interfaces for Python
This package provides an implementation of object interfaces for Python.
Interfaces are a mechanism for labeling objects as conforming to a given API
@@ -41,14 +48,14 @@
Priority: extra
Section: debug
Architecture: any
-Pre-Depends: dpkg (>= 1.17.5)
-Depends: python-zope.interface (= ${binary:Version}),
- python-dbg,
+Pre-Depends: dpkg (>= 1.17.5),
+Depends: python-dbg,
+ python-zope.interface (= ${binary:Version}),
${misc:Depends},
- ${shlibs:Depends}
-Conflicts: python-zopeinterface-dbg
-Replaces: python-zopeinterface-dbg
-Provides: python-zopeinterface-dbg
+ ${shlibs:Depends},
+Conflicts: python-zopeinterface-dbg,
+Replaces: python-zopeinterface-dbg,
+Provides: python-zopeinterface-dbg,
Description: Interfaces for Python (debug extension)
This package provides an implementation of object interfaces for Python.
Interfaces are a mechanism for labeling objects as conforming to a given API
@@ -59,8 +66,11 @@
Package: python3-zope.interface
Architecture: any
-Depends: ${python3:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Provides: python3-zope, ${python3:Provides}
+Depends: ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends},
+Provides: python3-zope,
+ ${python3:Provides},
Description: Interfaces for Python3
This package provides an implementation of object interfaces for Python.
Interfaces are a mechanism for labeling objects as conforming to a given API
@@ -73,11 +83,11 @@
Priority: extra
Section: debug
Architecture: any
-Pre-Depends: dpkg (>= 1.17.5)
-Depends: python3-zope.interface (= ${binary:Version}),
- python3-dbg,
+Pre-Depends: dpkg (>= 1.17.5),
+Depends: python3-dbg,
+ python3-zope.interface (= ${binary:Version}),
${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
Description: Interfaces for Python3 (debug extension)
This package provides an implementation of object interfaces for Python.
Interfaces are a mechanism for labeling objects as conforming to a given API
Modified: zope.interface/trunk/debian/rules
===================================================================
--- zope.interface/trunk/debian/rules 2015-06-11 21:12:45 UTC (rev 2933)
+++ zope.interface/trunk/debian/rules 2015-06-19 14:55:54 UTC (rev 2934)
@@ -9,12 +9,77 @@
package=python-zope.interface
package3=python3-zope.interface
+include /usr/share/dpkg/architecture.mk
+ifneq ($(DEB_BUILD_MULTIARCH),$(DEB_HOST_MULTIARCH))
+ SET_CROSS_ENV = PYTHONPATH=/usr/lib/python$$pv/plat-$(DEB_HOST_MULTIARCH)
+
+ # FIXME: is this sufficient?
+ SET_CROSS_ENV += _PYTHON_HOST_PLATFORM=$(DEB_HOST_GNU_CPU)
+endif
+
+override_dh_auto_build:
+ set -xe; for pv in $(shell pyversions -vr); do \
+ $(SET_CROSS_ENV) python$$pv setup.py build; \
+ done
+ set -xe; for pv in $(shell py3versions -sv); do \
+ $(SET_CROSS_ENV) python$$pv setup.py build; \
+ done
+
override_dh_auto_install:
- dh_auto_install
+ set -xe; \
+ for pv in $(shell pyversions -vr); do \
+ $(SET_CROSS_ENV) python$$pv setup.py install --install-layout=deb \
+ --root $(CURDIR)/debian/$(package); \
+ done
+ set -xe; \
+ for pv in $(shell py3versions -vs); do \
+ $(SET_CROSS_ENV) python$$pv setup.py install --install-layout=deb \
+ --root $(CURDIR)/debian/$(package3); \
+ done
# Remove C sources.
find debian/$(package) -name '*.c' | xargs -r rm -f
find debian/$(package3) -name '*.c' | xargs -r rm -f
+override_dh_install:
+ # remove C source
+ find debian/$(package) -name '*.c' | xargs -r rm -f
+ # remove debug symbols
+ #rm debian/$(package)/usr/lib/python*/*-packages/zope/interface/_zope_interface_coptimizations_d.so
+ # zope.interface provides the zope namespace __init__.py
+ for pv in $(shell pyversions -vr debian/control); do \
+ cp src/zope/__init__.py debian/$(package)/usr/lib/python$$pv/*-packages/zope/; \
+ done
+ # python-zope.interface-dbg package
+ for pv in $(shell pyversions -vr debian/control); do \
+ $(SET_CROSS_ENV) python$$pv-dbg setup.py install \
+ --no-compile --single-version-externally-managed \
+ $(py_setup_install_args) --root=debian/$(package)-dbg \
+ --install-layout=deb; \
+ done
+ find debian/$(package)-dbg
+ find debian/$(package)-dbg ! -type d ! -name '*.so' | xargs rm -f
+ find debian/$(package)-dbg -depth -empty -exec rmdir {} \;
+
+
+ # remove C source
+ find debian/$(package3) -name '*.c' | xargs -r rm -f
+ # remove debug symbols
+ #-rm debian/$(package3)/usr/lib/python3/dist-packages/zope/interface/_zope_interface_coptimizations_d.so
+ # zope.interface provides the zope namespace __init__.py
+ for py in $(shell py3versions -vs); do \
+ cp src/zope/__init__.py debian/$(package3)/usr/lib/python3/dist-packages/zope/; \
+ done
+ # python3-zope.interface-dbg package
+ for pv in $(shell py3versions -vs); do \
+ $(SET_CROSS_ENV) python$$pv-dbg setup.py install \
+ --no-compile --single-version-externally-managed \
+ $(py_setup_install_args) --root=debian/$(package3)-dbg \
+ --install-layout=deb; \
+ done
+ find debian/$(package3)-dbg
+ find debian/$(package3)-dbg ! -type d ! -name '*.so' | xargs rm -f
+ find debian/$(package3)-dbg -depth -empty -exec rmdir {} \;
+
override_dh_installdocs:
dh_installdocs
dh_installdocs -p$(package) README.rst
@@ -27,3 +92,7 @@
dh_installchangelogs
dh_installchangelogs -p$(package) CHANGES.rst
dh_installchangelogs -p$(package3) CHANGES.rst
+
+override_dh_strip:
+ dh_strip -p$(package) --dbg-package=$(package)-dbg
+ dh_strip -p$(package3) --dbg-package=$(package3)-dbg
Deleted: zope.interface/trunk/debian/tests/all
===================================================================
--- zope.interface/trunk/debian/tests/all 2015-06-11 21:12:45 UTC (rev 2933)
+++ zope.interface/trunk/debian/tests/all 2015-06-19 14:55:54 UTC (rev 2934)
@@ -1,4 +0,0 @@
-#!/usr/bin/python
-
-import zope.interface
-print zope.interface
Copied: zope.interface/trunk/debian/tests/all-2 (from rev 2933, zope.interface/trunk/debian/tests/all)
===================================================================
--- zope.interface/trunk/debian/tests/all-2 (rev 0)
+++ zope.interface/trunk/debian/tests/all-2 2015-06-19 14:55:54 UTC (rev 2934)
@@ -0,0 +1,8 @@
+#!/usr/bin/python
+
+import zope.interface
+print zope.interface
+
+# Make sure the optimization module is importable.
+import zope.interface._zope_interface_coptimizations
+print zope.interface._zope_interface_coptimizations
Modified: zope.interface/trunk/debian/tests/all-3
===================================================================
--- zope.interface/trunk/debian/tests/all-3 2015-06-11 21:12:45 UTC (rev 2933)
+++ zope.interface/trunk/debian/tests/all-3 2015-06-19 14:55:54 UTC (rev 2934)
@@ -2,3 +2,7 @@
import zope.interface
print(zope.interface)
+
+# Make sure the optimization module is importable.
+import zope.interface._zope_interface_coptimizations
+print(zope.interface._zope_interface_coptimizations)
Added: zope.interface/trunk/debian/tests/all-dbg-2
===================================================================
--- zope.interface/trunk/debian/tests/all-dbg-2 (rev 0)
+++ zope.interface/trunk/debian/tests/all-dbg-2 2015-06-19 14:55:54 UTC (rev 2934)
@@ -0,0 +1,8 @@
+#!/usr/bin/python-dbg
+
+import zope.interface
+print zope.interface
+
+# Make sure the optimization module is importable.
+import zope.interface._zope_interface_coptimizations
+print zope.interface._zope_interface_coptimizations
Added: zope.interface/trunk/debian/tests/all-dbg-3
===================================================================
--- zope.interface/trunk/debian/tests/all-dbg-3 (rev 0)
+++ zope.interface/trunk/debian/tests/all-dbg-3 2015-06-19 14:55:54 UTC (rev 2934)
@@ -0,0 +1,8 @@
+#!/usr/bin/python3-dbg
+
+import zope.interface
+print(zope.interface)
+
+# Make sure the optimization module is importable.
+import zope.interface._zope_interface_coptimizations
+print(zope.interface._zope_interface_coptimizations)
Modified: zope.interface/trunk/debian/tests/control
===================================================================
--- zope.interface/trunk/debian/tests/control 2015-06-11 21:12:45 UTC (rev 2933)
+++ zope.interface/trunk/debian/tests/control 2015-06-19 14:55:54 UTC (rev 2934)
@@ -1,5 +1,6 @@
-Tests: all
+Tests: all-2 all-3 all-dbg-3
Depends: @
-Tests: all-3
+Tests: all-dbg-2
Depends: @
+Restrictions: allow-stderr
More information about the pkg-zope-developers
mailing list