[Python-modules-commits] r8314 - in packages/paste/trunk/debian (5 files)

[piotr at users.alioth.debian.org]

    Date: Monday, April 27, 2009 @ 21:24:56
  Author: piotr
Revision: 8314

* Prepare for Python 2.6:
  + use py_libdir in debian/rules (LP: #361163)
  + add r7641.patch (taken from upstream repository) - fixes paste.httpserver

Added:
  packages/paste/trunk/debian/patches/r7641.dpatch
Modified:
  packages/paste/trunk/debian/changelog
  packages/paste/trunk/debian/control
  packages/paste/trunk/debian/patches/00list
  packages/paste/trunk/debian/rules

Modified: packages/paste/trunk/debian/changelog
===================================================================
--- packages/paste/trunk/debian/changelog	2009-04-27 16:52:03 UTC (rev 8313)
+++ packages/paste/trunk/debian/changelog	2009-04-27 21:24:56 UTC (rev 8314)
@@ -1,8 +1,11 @@
-paste (1.7.2-4) UNRELEASED; urgency=low
+paste (1.7.2-4) unstable; urgency=low
 
   * Build depend on python-support >= 1.0.1
     + remove libjs-mochikit from Build-Depends-Indep
     + remove mochikit symlink workaround from debian/rules
+  * Prepare for Python 2.6:
+    + use py_libdir in debian/rules (LP: #361163)
+    + add r7641.patch (taken from upstream repository) - fixes paste.httpserver
 
  -- Piotr Ożarowski <piotr at debian.org>  Wed, 08 Apr 2009 13:33:33 +0200
 

Modified: packages/paste/trunk/debian/control
===================================================================
--- packages/paste/trunk/debian/control	2009-04-27 16:52:03 UTC (rev 8313)
+++ packages/paste/trunk/debian/control	2009-04-27 21:24:56 UTC (rev 8314)
@@ -4,7 +4,7 @@
 Maintainer: Piotr Ożarowski <piotr at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: python (>= 2.3.5-11), python-all, python-support (>= 1.0.1),
+Build-Depends-Indep: python-all (>= 2.3.5-11), python-support (>= 1.0.1),
  python-setuptools (>= 0.6b3-1~), python-sphinx
 Standards-Version: 3.8.1
 Homepage: http://pythonpaste.org/
@@ -22,7 +22,7 @@
  libjs-mochikit, libjs-jquery
 Replaces: paste-common
 Conflicts: paste-common
-Description: Tools for using a Web Server Gateway Interface stack
+Description: tools for using a Web Server Gateway Interface stack
  Python Paste brings consistency to Python web development and web application
  installation, providing tools for both developers and system administrators.
  .

Modified: packages/paste/trunk/debian/patches/00list
===================================================================
--- packages/paste/trunk/debian/patches/00list	2009-04-27 16:52:03 UTC (rev 8313)
+++ packages/paste/trunk/debian/patches/00list	2009-04-27 21:24:56 UTC (rev 8314)
@@ -1 +1,2 @@
 remove_shebang.dpatch
+r7641.dpatch

Added: packages/paste/trunk/debian/patches/r7641.dpatch
===================================================================
--- packages/paste/trunk/debian/patches/r7641.dpatch	                        (rev 0)
+++ packages/paste/trunk/debian/patches/r7641.dpatch	2009-04-27 21:24:56 UTC (rev 8314)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## r7641.dpatch by  <Piotr Ożarowski <piotr at debian.org>>
+##
+## DP: Patch to fix SSL support in Python 2.6
+## DP: (taken from upstream repository: revision 7641)
+
+ at DPATCH@
+diff -urNad paste-1.7.2~/paste/httpserver.py paste-1.7.2/paste/httpserver.py
+--- paste-1.7.2~/paste/httpserver.py	2008-10-29 03:29:41.000000000 +0100
++++ paste-1.7.2/paste/httpserver.py	2009-04-27 22:48:35.867738780 +0200
+@@ -369,6 +369,12 @@
+                             return self._ssl_conn.settimeout(*args)
+                         finally:
+                             self._lock.release()
++                    def gettimeout(self):
++                        self._lock.acquire()
++                        try:
++                            return self._ssl_conn.gettimeout()
++                        finally:
++                            self._lock.release()    
+                 self.socket = TSafeConnection(ssl_context, self.socket)
+             self.server_bind()
+             if request_queue_size:


Property changes on: packages/paste/trunk/debian/patches/r7641.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/paste/trunk/debian/rules
===================================================================
--- packages/paste/trunk/debian/rules	2009-04-27 16:52:03 UTC (rev 8313)
+++ packages/paste/trunk/debian/rules	2009-04-27 21:24:56 UTC (rev 8314)
@@ -6,13 +6,21 @@
 PYVERS=$(shell pyversions -vr)
 PKGDIR=$(CURDIR)/debian/python-paste
 
-include /usr/share/dpatch/dpatch.make 
+include /usr/share/dpatch/dpatch.make
 
+# if $py_setup_install_args will contain "--install-layout=deb" dist-packages
+# will be used instead of site-packages for Python >= 2.6;
+# --install-layout=deb and python.mk are available since python >= 2.5.4-1~,
+# here's backwards compatible code:
+-include /usr/share/python/python.mk
+ifeq (,$(py_libdir))
+    py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+endif
 clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -rf dist build
-	find . -name *\.py[co] -exec rm {} \;
+	find . -name *\.py[co] -delete
 	dh_clean build-docs* $(PYVERS:%=install-python%)
 
 build: patch build-docs
@@ -28,13 +36,12 @@
 
 install: $(PYVERS:%=install-python%)
 install-python%:
-	python$* setup.py install \
-		--single-version-externally-managed \
-		--root $(PKGDIR)
+	python$* setup.py install --root $(PKGDIR) \
+		--single-version-externally-managed $(py_setup_install_args)
 	# pth file is not needed since all paste* packages are installed in same directory
-	rm -f $(PKGDIR)/usr/lib/python$*/site-packages/Paste-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
+	rm -f $(PKGDIR)/$(call py_libdir,$*)/Paste-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
 	dh_link /usr/share/javascript/mochikit/MochiKit.js \
-		/usr/lib/python$*/site-packages/paste/evalexception/mochikit/MochiKit.js
+		$(call py_libdir,$*)/paste/evalexception/mochikit/MochiKit.js
 	touch $@
 
 binary-indep: build install