r2708 - in zope.interface/trunk/debian (5 files)

menesis-guest at users.alioth.debian.org menesis-guest at users.alioth.debian.org
Fri May 24 19:26:18 UTC 2013


    Date: Friday, May 24, 2013 @ 19:26:17
  Author: menesis-guest
Revision: 2708

* New upstream release.
* debian/control:
  - Add Build-Depends on dpkg-dev (>= 1.16.1~) for multiarch support
  - Bump Standards-Version to 3.9.4
  - Update supported Python versions
  - remove python3-zope.fixers from Build-Depends
  - enable autopkgtest
* debian/rules:
  - README.rst was renamed
* debian/tests/control: add zope.event
* debian/copyright: update to copyright-format 1.0
* Allow cross-building the package (however dh_python[23] needs to
  get aware of cross builds).
* fix_segfault_py3_64bit_LP_675064.diff: Applied upstream, removed.

Modified:
  zope.interface/trunk/debian/changelog
  zope.interface/trunk/debian/control
  zope.interface/trunk/debian/copyright
  zope.interface/trunk/debian/rules
  zope.interface/trunk/debian/tests/control

Modified: zope.interface/trunk/debian/changelog
===================================================================
--- zope.interface/trunk/debian/changelog	2013-05-17 03:01:22 UTC (rev 2707)
+++ zope.interface/trunk/debian/changelog	2013-05-24 19:26:17 UTC (rev 2708)
@@ -1,10 +1,29 @@
-zope.interface (3.6.2-1) UNRELEASED; urgency=low
+zope.interface (4.0.5-1) UNRELEASED; urgency=low
 
-  * New upstream release
-  * Remove backported patches.
+  * Team upload.
 
- -- Brian Sutherland <brian at vanguardistas.net>  Wed, 25 May 2011 10:36:38 +0200
+  [ Gediminas Paulauskas ]
+  * New upstream release.
+  * debian/control:
+    - Add Build-Depends on dpkg-dev (>= 1.16.1~) for multiarch support
+    - Bump Standards-Version to 3.9.4
+    - Update supported Python versions
+    - remove python3-zope.fixers from Build-Depends
+    - enable autopkgtest
+  * debian/rules:
+    - README.rst was renamed
+  * debian/tests/control: add zope.event
+  * debian/copyright: update to copyright-format 1.0
 
+  [ Matthias Klose ]
+  * Allow cross-building the package (however dh_python[23] needs to
+    get aware of cross builds).
+
+  [ Barry Warsaw ]
+  * fix_segfault_py3_64bit_LP_675064.diff: Applied upstream, removed.
+
+ -- Gediminas Paulauskas <menesis at pov.lt>  Fri, 24 May 2013 22:23:43 +0300
+
 zope.interface (3.6.1-3) unstable; urgency=low
 
   * Team upload.
@@ -58,18 +77,6 @@
 
  -- Arnaud Fontaine <arnau at debian.org>  Mon, 16 May 2011 20:34:35 +0900
 
-zope.interface (3.6.1-0ubuntu3) natty; urgency=low
-
-  * Build packages for python3.
-
- -- Matthias Klose <doko at ubuntu.com>  Wed, 23 Feb 2011 18:31:44 +0100
-
-zope.interface (3.6.1-0ubuntu2) natty; urgency=low
-
-  * Rebuild to add support for python 2.7.
-
- -- Matthias Klose <doko at ubuntu.com>  Fri, 03 Dec 2010 00:18:11 +0000
-
 zope.interface (3.6.1-0ubuntu1) maverick; urgency=low
 
   * New upstream release.

Modified: zope.interface/trunk/debian/control
===================================================================
--- zope.interface/trunk/debian/control	2013-05-17 03:01:22 UTC (rev 2707)
+++ zope.interface/trunk/debian/control	2013-05-24 19:26:17 UTC (rev 2708)
@@ -5,16 +5,19 @@
 Uploaders: Brian Sutherland <brian at vanguardistas.net>,
            Fabio Tranchitella <kobold at debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
-               python-all-dev (>= 2.6.6-3~),
-               python-all-dbg,
+               dpkg-dev (>= 1.16.1~),
+               python-all-dev:any (>= 2.6.6-3~),
+               python-all-dbg:any,
                python-setuptools,
-               python3-all-dev,
-               python3-all-dbg, 
-               python3-zope.fixers,
+               python3-all-dev:any,
+               python3-all-dbg:any, 
+               libpython-all-dev, libpython-all-dbg,
+               libpython3-all-dev, libpython3-all-dbg,
                python3-setuptools
-Standards-Version: 3.9.2
-X-Python-Version: >= 2.4
-X-Python3-Version: >= 3.1
+Standards-Version: 3.9.4
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
+XS-Testsuite: autopkgtest
 Homepage: http://pypi.python.org/pypi/zope.interface
 Vcs-Svn: svn://svn.debian.org/pkg-zope/zope.interface/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-zope/zope.interface/trunk

Modified: zope.interface/trunk/debian/copyright
===================================================================
--- zope.interface/trunk/debian/copyright	2013-05-17 03:01:22 UTC (rev 2707)
+++ zope.interface/trunk/debian/copyright	2013-05-24 19:26:17 UTC (rev 2708)
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: zope.interface
 Upstream-Contact: Zope Foundation and Contributors <zope-dev at zope.org>
 Source: http://pypi.python.org/pypi/zope.interface

Modified: zope.interface/trunk/debian/rules
===================================================================
--- zope.interface/trunk/debian/rules	2013-05-17 03:01:22 UTC (rev 2707)
+++ zope.interface/trunk/debian/rules	2013-05-24 19:26:17 UTC (rev 2708)
@@ -1,35 +1,41 @@
 #!/usr/bin/make -f
 
-export PYDEB_SUGGESTS_EXTRAS=docs
-
 %:
-	dh --with python2 --with python3 $@
+	dh $@ --with python2 --with python3
 
 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_clean:
 	rm -rf build
 	find -name __pycache__ | xargs -r rm -rf
 	find -name '*.py[co]' | xargs -r rm -f
 
 override_dh_auto_build:
-	set -xe; for pyvers in $(shell pyversions -vr); do \
-		python$$pyvers setup.py build; \
+	set -xe; for pv in $(shell pyversions -vr); do \
+		$(SET_CROSS_ENV) python$$pv setup.py build; \
 	done
-	set -xe; for pyvers in $(shell py3versions -sv); do \
-		python$$pyvers setup.py build; \
+	set -xe; for pv in $(shell py3versions -sv); do \
+		$(SET_CROSS_ENV) python$$pv setup.py build; \
 	done
 
 override_dh_auto_install:
 	set -xe; \
-	for pyvers in $(shell pyversions -vr); do \
-		python$$pyvers setup.py install --install-layout=deb \
+	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 pyvers in $(shell py3versions -vs); do \
-		python$$pyvers setup.py install --install-layout=deb \
+	for pv in $(shell py3versions -vs); do \
+		$(SET_CROSS_ENV) python$$pv setup.py install --install-layout=deb \
 			--root $(CURDIR)/debian/$(package3); \
 	done
 
@@ -39,12 +45,13 @@
 	# 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 py in $(shell pyversions -vr debian/control); do \
-	    cp src/zope/__init__.py debian/$(package)/usr/lib/python$$py/*-packages/zope/; \
+	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 py in $(shell pyversions -vr debian/control); do \
-	    python$$py-dbg setup.py install --no-compile --single-version-externally-managed \
+	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
@@ -62,8 +69,9 @@
 	    cp src/zope/__init__.py debian/$(package3)/usr/lib/python3/dist-packages/zope/; \
 	done
 	# python3-zope.interface-dbg package
-	for py in $(shell py3versions -vs); do \
-	    python$$py-dbg setup.py install --no-compile --single-version-externally-managed \
+	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
@@ -78,10 +86,10 @@
 	find debian/$(package3) -name requires.txt -exec sed -i '/^setuptools$$/d' {} \;
 
 override_dh_installdocs:
-	dh_installdocs -p$(package) README.txt
+	dh_installdocs -p$(package) README.rst
 	dh_installdocs -p$(package)-dbg --link-doc=$(package)
 
-	dh_installdocs -p$(package3) README.txt
+	dh_installdocs -p$(package3) README.rst
 	dh_installdocs -p$(package3)-dbg --link-doc=$(package3)
 
 override_dh_strip:

Modified: zope.interface/trunk/debian/tests/control
===================================================================
--- zope.interface/trunk/debian/tests/control	2013-05-17 03:01:22 UTC (rev 2707)
+++ zope.interface/trunk/debian/tests/control	2013-05-24 19:26:17 UTC (rev 2708)
@@ -1,7 +1,5 @@
 Tests: all
-Features: no-build-needed
-Depends: python-all, python-zope.interface, python-zope.testrunner
+Depends: python-all, python-zope.interface, python-zope.testrunner, python-zope.event
 
 Tests: all-3
-Features: no-build-needed
-Depends: python3-all, python3-zope.interface, python3-zope.testrunner
+Depends: python3-all, python3-zope.interface, python3-zope.testrunner, python3-zope.event




More information about the pkg-zope-developers mailing list