[Python-modules-commits] r15063 - in packages/pastewebkit/trunk/debian (9 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Sat Dec 11 15:47:08 UTC 2010
Date: Saturday, December 11, 2010 @ 15:47:02
Author: piotr
Revision: 15063
* Move paster's templates to /usr/share/paster_templates/
* Add cast_sys.version_info_to_tuple patch as Python2.7's sys.version_info
is not pickable (it's a named tuple in Python >= 2.7) - closes: #606616
Thanks to Jakub Wilk for his outstanding quality assurance work on Python
in Debian
* Change source package format to 3.0 (quilt)
* Change Debian packaging license to MIT (to match upstream)
* Standards-Version bumped to 3.9.1 (no changes needed)
Added:
packages/pastewebkit/trunk/debian/install
packages/pastewebkit/trunk/debian/patches/
packages/pastewebkit/trunk/debian/patches/cast_sys.version_info_to_tuple.patch
packages/pastewebkit/trunk/debian/patches/series
Modified:
packages/pastewebkit/trunk/debian/changelog
packages/pastewebkit/trunk/debian/control
packages/pastewebkit/trunk/debian/copyright
packages/pastewebkit/trunk/debian/rules
packages/pastewebkit/trunk/debian/source/format
Modified: packages/pastewebkit/trunk/debian/changelog
===================================================================
--- packages/pastewebkit/trunk/debian/changelog 2010-12-11 08:09:49 UTC (rev 15062)
+++ packages/pastewebkit/trunk/debian/changelog 2010-12-11 15:47:02 UTC (rev 15063)
@@ -1,3 +1,16 @@
+pastewebkit (1.0-5) unstable; urgency=low
+
+ * Move paster's templates to /usr/share/paster_templates/
+ * Add cast_sys.version_info_to_tuple patch as Python2.7's sys.version_info
+ is not pickable (it's a named tuple in Python >= 2.7) - closes: #606616
+ Thanks to Jakub Wilk for his outstanding quality assurance work on Python
+ in Debian
+ * Change source package format to 3.0 (quilt)
+ * Change Debian packaging license to MIT (to match upstream)
+ * Standards-Version bumped to 3.9.1 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org> Sat, 11 Dec 2010 15:23:32 +0100
+
pastewebkit (1.0-4) unstable; urgency=low
[ Sandro Tosi ]
Modified: packages/pastewebkit/trunk/debian/control
===================================================================
--- packages/pastewebkit/trunk/debian/control 2010-12-11 08:09:49 UTC (rev 15062)
+++ packages/pastewebkit/trunk/debian/control 2010-12-11 15:47:02 UTC (rev 15063)
@@ -4,9 +4,9 @@
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)
-Build-Depends-Indep: python (>= 2.3.5-11), python-all-dev, python-support (>= 0.6.4),
+Build-Depends-Indep: python (>= 2.3.5-11), python-all, python-support (>= 0.6.4),
python-setuptools (>= 0.6b3-1~), python-docutils
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
Homepage: http://pythonpaste.org/webkit/
XS-Python-Version: >= 2.4
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pastewebkit/trunk/
@@ -14,7 +14,7 @@
Package: python-pastewebkit
Architecture: all
-Depends: ${python:Depends}, python-paste (>= 1.7-1~), python-pastedeploy, python-pastescript,
+Depends: ${python:Depends}, ${misc:Depends}, python-paste (>= 1.7-1~), python-pastedeploy, python-pastescript,
python-pkg-resources
Description: port/reimplementation of Webware WebKit in WSGI and Paste
This is a reimplementation of the Webware WebKit servlet API. This
Modified: packages/pastewebkit/trunk/debian/copyright
===================================================================
--- packages/pastewebkit/trunk/debian/copyright 2010-12-11 08:09:49 UTC (rev 15062)
+++ packages/pastewebkit/trunk/debian/copyright 2010-12-11 15:47:02 UTC (rev 15063)
@@ -61,8 +61,5 @@
-----------------------------------------------------------
-The Debian packaging is (C) 2006-2008, Piotr Ożarowski <piotr at debian.org> and
-is licensed under the GPL.
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL'.
+The Debian packaging is © 2006-2010, Piotr Ożarowski <piotr at debian.org> and
+is licensed under the MIT license as well.
Added: packages/pastewebkit/trunk/debian/install
===================================================================
--- packages/pastewebkit/trunk/debian/install (rev 0)
+++ packages/pastewebkit/trunk/debian/install 2010-12-11 15:47:02 UTC (rev 15063)
@@ -0,0 +1 @@
+paste/webkit/paster_templates/ /usr/share/paster_templates/webkit/
Added: packages/pastewebkit/trunk/debian/patches/cast_sys.version_info_to_tuple.patch
===================================================================
--- packages/pastewebkit/trunk/debian/patches/cast_sys.version_info_to_tuple.patch (rev 0)
+++ packages/pastewebkit/trunk/debian/patches/cast_sys.version_info_to_tuple.patch 2010-12-11 15:47:02 UTC (rev 15063)
@@ -0,0 +1,22 @@
+Index: pastewebkit-1.0/paste/webkit/FakeWebware/MiscUtils/PickleCache.py
+===================================================================
+--- pastewebkit-1.0.orig/paste/webkit/FakeWebware/MiscUtils/PickleCache.py
++++ pastewebkit-1.0/paste/webkit/FakeWebware/MiscUtils/PickleCache.py
+@@ -141,7 +141,7 @@ class PickleCacheReader(PickleCache):
+ elif dict['pickle version']!=pickleVersion:
+ #if v: print 'pickle version (%i) does not match expected (%i)' % (dict['pickle version'], pickleVersion)
+ shouldDeletePickle = 1
+- elif dict['python version']!=sys.version_info:
++ elif dict['python version']!=tuple(sys.version_info):
+ #if v: print 'python version %s does not match current %s' % (dict['python version'], sys.version_info)
+ shouldDeletePickle = 1
+ else:
+@@ -186,7 +186,7 @@ class PickleCacheWriter(PickleCache):
+ picklePath = self.picklePath(filename)
+ dict = {
+ 'source': source,
+- 'python version': sys.version_info,
++ 'python version': tuple(sys.version_info),
+ 'pickle version': pickleVersion,
+ 'data': data,
+ }
Added: packages/pastewebkit/trunk/debian/patches/series
===================================================================
--- packages/pastewebkit/trunk/debian/patches/series (rev 0)
+++ packages/pastewebkit/trunk/debian/patches/series 2010-12-11 15:47:02 UTC (rev 15063)
@@ -0,0 +1,2 @@
+cast_sys.version_info_to_tuple.patch
+
Modified: packages/pastewebkit/trunk/debian/rules
===================================================================
--- packages/pastewebkit/trunk/debian/rules 2010-12-11 08:09:49 UTC (rev 15062)
+++ packages/pastewebkit/trunk/debian/rules 2010-12-11 15:47:02 UTC (rev 15063)
@@ -2,7 +2,6 @@
#export DH_VERBOSE=1
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
PYVERS=$(shell pyversions -vr)
DOCS=$(shell cd docs && find ./ -name "*.txt" -printf "%p " | sed "s/.txt//g")
@@ -24,15 +23,19 @@
touch $@
install: build $(PYVERS:%=install-python%)
+ dh_install
+
install-python%:
python$* setup.py install --prefix=/usr \
--single-version-externally-managed \
--root $(CURDIR)/debian/python-pastewebkit \
--install-lib=/usr/lib/python$*/site-packages
# pth file is not needed since all paste* packages are installed in the same directory
- rm -f debian/python-pastewebkit/usr/lib/python$*/site-packages/PasteWebKit-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
+ rm -f debian/python-pastewebkit/usr/lib/python$*/site-packages/*.pth
+ # installed to /usr/share/paster_templates/ via dh_install
+ rm -rf debian/python-pastewebkit/usr/lib/python$*/site-packages/paste/webkit/paster_templates/
# provided by paste-common package:
- rm -f debian/python-pastewebkit/usr/lib/python$*/site-packages/pastewebkit/paste/__init__.py
+ rm -f debian/python-pastewebkit/usr/lib/python$*/site-packages/paste/__init__.py
binary-indep: build install
dh_testdir -i
Modified: packages/pastewebkit/trunk/debian/source/format
===================================================================
--- packages/pastewebkit/trunk/debian/source/format 2010-12-11 08:09:49 UTC (rev 15062)
+++ packages/pastewebkit/trunk/debian/source/format 2010-12-11 15:47:02 UTC (rev 15063)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-modules-commits
mailing list