[Python-modules-commits] r27422 - in packages/python-concurrent.futures/trunk/debian (6 files)

zigo at users.alioth.debian.org zigo at users.alioth.debian.org
Sat Jan 25 06:47:01 UTC 2014


    Date: Saturday, January 25, 2014 @ 06:46:59
  Author: zigo
Revision: 27422

  * Team upload.
  * Fixes the fact that the package isn't installed at all in /usr/lib/python,
    which makes it completely unusable:
    - Added missing --with python2.
    - Added explicit --buildsystem=python_distutils.
    - Added Provides: python-futures
    - Added missing ${sphinxdoc:Depends}, installing correctly with sphinx-build
  * Removed useless XS-Python-Version: >= 2.6.
  * Removed deprecated python-support build-depends in the favor of dh_python2,
    and therefore now build-depends on python-all version (>= 2.6.6-3~).
  * Ran wrap-and-sort.
  * Fixed Format field of debian/copyright.

Modified:
  packages/python-concurrent.futures/trunk/debian/changelog
  packages/python-concurrent.futures/trunk/debian/control
  packages/python-concurrent.futures/trunk/debian/copyright
  packages/python-concurrent.futures/trunk/debian/rules
Deleted:
  packages/python-concurrent.futures/trunk/debian/patches/10_dont_install_futures.patch
  packages/python-concurrent.futures/trunk/debian/patches/series

Modified: packages/python-concurrent.futures/trunk/debian/changelog
===================================================================
--- packages/python-concurrent.futures/trunk/debian/changelog	2014-01-24 20:05:24 UTC (rev 27421)
+++ packages/python-concurrent.futures/trunk/debian/changelog	2014-01-25 06:46:59 UTC (rev 27422)
@@ -1,3 +1,20 @@
+python-concurrent.futures (2.1.6-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixes the fact that the package isn't installed at all in /usr/lib/python,
+    which makes it completely unusable:
+    - Added missing --with python2.
+    - Added explicit --buildsystem=python_distutils.
+    - Added Provides: python-futures
+    - Added missing ${sphinxdoc:Depends}, installing correctly with sphinx-build
+  * Removed useless XS-Python-Version: >= 2.6.
+  * Removed deprecated python-support build-depends in the favor of dh_python2,
+    and therefore now build-depends on python-all version (>= 2.6.6-3~).
+  * Ran wrap-and-sort.
+  * Fixed Format field of debian/copyright.
+
+ -- Thomas Goirand <zigo at debian.org>  Sat, 25 Jan 2014 05:59:22 +0000
+
 python-concurrent.futures (2.1.6-1) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/python-concurrent.futures/trunk/debian/control
===================================================================
--- packages/python-concurrent.futures/trunk/debian/control	2014-01-24 20:05:24 UTC (rev 27421)
+++ packages/python-concurrent.futures/trunk/debian/control	2014-01-25 06:46:59 UTC (rev 27422)
@@ -3,16 +3,22 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 8), python-all, python-support (>= 1), python-sphinx (>= 1.0.7+dfsg), python-setuptools
+Build-Depends: debhelper (>= 8),
+               python-all (>= 2.6.6-3~),
+               python-setuptools,
+               python-sphinx (>= 1.0.7+dfsg)
 Standards-Version: 3.9.5
-XS-Python-Version: >= 2.6
-Homepage: http://code.google.com/p/pythonfutures/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-concurrent.futures/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-concurrent.futures/trunk/
+Homepage: http://code.google.com/p/pythonfutures/
 
 Package: python-concurrent.futures
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends},
+         ${sphinxdoc:Depends}
+Provides: python-futures
 Description: backport of concurrent.futures package from Python 3.2
  The concurrent.futures module provides a high-level interface for
  asynchronously executing callables.

Modified: packages/python-concurrent.futures/trunk/debian/copyright
===================================================================
--- packages/python-concurrent.futures/trunk/debian/copyright	2014-01-24 20:05:24 UTC (rev 27421)
+++ packages/python-concurrent.futures/trunk/debian/copyright	2014-01-25 06:46:59 UTC (rev 27422)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: python-concurrent.futures
 Source: http://pypi.python.org/pypi/futures
 
@@ -27,5 +27,6 @@
 Note: maintainer is Alex Gronholm <alex.gronholm+pypi at nextday.fi>
 
 Files: debian/*
-Copyright: 2012-2014 Sandro Tosi <morph at debian.org>
+Copyright: 2012-2014, Sandro Tosi <morph at debian.org>
+           2014, Thomas Goirand <zigo at debian.org>
 License: BSD

Deleted: packages/python-concurrent.futures/trunk/debian/patches/10_dont_install_futures.patch
===================================================================
--- packages/python-concurrent.futures/trunk/debian/patches/10_dont_install_futures.patch	2014-01-24 20:05:24 UTC (rev 27421)
+++ packages/python-concurrent.futures/trunk/debian/patches/10_dont_install_futures.patch	2014-01-25 06:46:59 UTC (rev 27422)
@@ -1,16 +0,0 @@
-Description: 'futures' is only a compatibility module for concurrent.futures; we don't install it
-Author: Sandro Tosi <morph at debian.org>
-Forwarded: not-needed
-Index: python-concurrent.futures-2.1.2/setup.py
-===================================================================
---- python-concurrent.futures-2.1.2.orig/setup.py	2012-04-08 11:27:31.471451993 +0200
-+++ python-concurrent.futures-2.1.2/setup.py	2012-04-08 11:27:41.787792674 +0200
-@@ -19,7 +19,7 @@
-       maintainer_email='alex.gronholm+pypi at nextday.fi',
-       url='http://code.google.com/p/pythonfutures',
-       download_url='http://pypi.python.org/pypi/futures/',
--      packages=['futures', 'concurrent', 'concurrent.futures'],
-+      packages=['concurrent', 'concurrent.futures'],
-       license='BSD',
-       classifiers=['License :: OSI Approved :: BSD License',
-                    'Development Status :: 5 - Production/Stable',

Deleted: packages/python-concurrent.futures/trunk/debian/patches/series
===================================================================
--- packages/python-concurrent.futures/trunk/debian/patches/series	2014-01-24 20:05:24 UTC (rev 27421)
+++ packages/python-concurrent.futures/trunk/debian/patches/series	2014-01-25 06:46:59 UTC (rev 27422)
@@ -1 +0,0 @@
-10_dont_install_futures.patch

Modified: packages/python-concurrent.futures/trunk/debian/rules
===================================================================
--- packages/python-concurrent.futures/trunk/debian/rules	2014-01-24 20:05:24 UTC (rev 27421)
+++ packages/python-concurrent.futures/trunk/debian/rules	2014-01-25 06:46:59 UTC (rev 27422)
@@ -1,27 +1,24 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+PYTHONS:=$(shell pyversions -vr)
 
 %:
-	dh $@ --with sphinxdoc
+	dh $@ --buildsystem=python_distutils --with python2,sphinxdoc
 
+override_dh_install:
+	set -e && for pyvers in $(PYTHONS); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python-concurrent.futures; \
+	done
+
 override_dh_clean:
-	dh_clean
-	rm -rf build/
+	dh_clean -O--buildsystem=python_distutils
 	rm -rf *.egg-info
 
-override_dh_auto_build:
-	dh_auto_build
-	# build doc
-	python setup.py build_sphinx
+override_dh_sphinxdoc:
+	sphinx-build -b html docs $(CURDIR)/debian/python-concurrent.futures/usr/share/doc/python-concurrent.futures/html
+	dh_sphinxdoc -O--buildsystem=python_distutils
 
-override_dh_auto_install:
-	dh_auto_install
-	# remove egg-info dir, not wanted
-	rm -rf $(CURDIR)/debian/python-concurrent.futures/usr/lib/python*/dist-packages/futures*.egg-info
-
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	set -e ; \
@@ -33,7 +30,4 @@
 endif
 
 override_dh_installexamples:
-	dh_installexamples crawl.py primes.py
-
-override_dh_installdocs:
-	dh_installdocs build/sphinx/html
+	dh_installexamples -O--buildsystem=python_distutils crawl.py primes.py




More information about the Python-modules-commits mailing list