[Python-modules-commits] r12447 - in packages/cheetah/trunk/debian (7 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Wed Mar 31 00:10:29 UTC 2010
Date: Wednesday, March 31, 2010 @ 00:10:00
Author: arnau
Revision: 12447
New upstream release (2.4.2.1)
Added:
packages/cheetah/trunk/debian/patches/
packages/cheetah/trunk/debian/patches/fix_ftbfs_c_extension_python25.patch
packages/cheetah/trunk/debian/patches/series
Modified:
packages/cheetah/trunk/debian/changelog
packages/cheetah/trunk/debian/control
packages/cheetah/trunk/debian/rules
packages/cheetah/trunk/debian/source/format
Modified: packages/cheetah/trunk/debian/changelog
===================================================================
--- packages/cheetah/trunk/debian/changelog 2010-03-30 21:17:25 UTC (rev 12446)
+++ packages/cheetah/trunk/debian/changelog 2010-03-31 00:10:00 UTC (rev 12447)
@@ -1,3 +1,14 @@
+cheetah (2.4.2.1-1) unstable; urgency=low
+
+ * New upstream release.
+ + Add python-memcache to Suggests in debian/control as the old bundled
+ memcached module has been dropped.
+ + Add debian/patches/fix_ftbfs_c_extension_python25.patch to allow
+ building the C extension on Python <= 2.5.
+ * Switch to dpkg-source 3.0 (quilt) format.
+
+ -- Arnaud Fontaine <arnau at debian.org> Tue, 30 Mar 2010 22:59:59 +0100
+
cheetah (2.4.1-1) unstable; urgency=low
[ Arnaud Fontaine ]
Modified: packages/cheetah/trunk/debian/control
===================================================================
--- packages/cheetah/trunk/debian/control 2010-03-30 21:17:25 UTC (rev 12446)
+++ packages/cheetah/trunk/debian/control 2010-03-31 00:10:00 UTC (rev 12447)
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 5.0.37.2),
cdbs (>= 0.4.43),
python-all-dev (>= 2.3.5-11),
- python-support (>= 0.9.0),
+ python-support (>= 0.90),
python-setuptools (>= 0.6b3),
python-markdown (>= 2.0.1)
Standards-Version: 3.8.4
@@ -19,7 +19,7 @@
Depends: ${python:Depends},
${shlibs:Depends},
${misc:Depends},
-Suggests: python-markdown (>= 2.0.1), python-pygments
+Suggests: python-markdown (>= 2.0.1), python-pygments, python-memcache
Description: text-based template engine and Python code generator
Cheetah can be used as a standalone templating utility or referenced as a
library from other Python applications. It has many potential uses, but web
Added: packages/cheetah/trunk/debian/patches/fix_ftbfs_c_extension_python25.patch
===================================================================
--- packages/cheetah/trunk/debian/patches/fix_ftbfs_c_extension_python25.patch (rev 0)
+++ packages/cheetah/trunk/debian/patches/fix_ftbfs_c_extension_python25.patch 2010-03-31 00:10:00 UTC (rev 12447)
@@ -0,0 +1,48 @@
+Description: C extension fails to build because of PyUnicode_FromFormat only available on Python >= 2.6
+Author: Arnaud Fontaine <arnau at debian.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=sa5634dmm5b.fsf%40Orfeo.duckcorp.org
+
+--- a/cheetah/c/cheetah.h 2010-02-08 04:17:23.000000000 +0000
++++ b/cheetah/c/cheetah.h 2010-03-30 22:42:49.000000000 +0100
+@@ -37,6 +37,9 @@
+
+ #if PY_MAJOR_VERSION >= 3
+ #define IS_PYTHON3
++#elif PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 5
++/* PyUnicode_FromFormat is only available on Python >= 2.6 */
++#define IS_PYTHON25_OR_LESS
+ #endif
+
+ #define TRUE 1
+--- a/cheetah/c/_namemapper.c 2010-02-08 04:17:23.000000000 +0000
++++ b/cheetah/c/_namemapper.c 2010-03-30 22:40:01.000000000 +0100
+@@ -35,7 +35,13 @@
+ static void setNotFoundException(char *key, PyObject *namespace)
+ {
+ PyObject *exceptionStr = NULL;
++#ifdef IS_PYTHON25_OR_LESS
++ exceptionStr = Py_BuildValue("s", "cannot find '");
++ PyString_ConcatAndDel(&exceptionStr, Py_BuildValue("s", key));
++ PyString_ConcatAndDel(&exceptionStr, Py_BuildValue("s", "'"));
++#else
+ exceptionStr = PyUnicode_FromFormat("cannot find \'%s\'", key);
++#endif
+ PyErr_SetObject(NotFound, exceptionStr);
+ Py_XDECREF(exceptionStr);
+ }
+@@ -58,8 +64,15 @@
+
+ if (isAlreadyWrapped != NULL) {
+ if (PyLong_AsLong(isAlreadyWrapped) == -1) {
++#ifdef IS_PYTHON25_OR_LESS
++ newExcValue = Py_BuildValue("U", excValue);
++ PyString_ConcatAndDel(&newExcValue, Py_BuildValue("s", "while searching for '"));
++ PyString_ConcatAndDel(&newExcValue, Py_BuildValue("s", fullName));
++ PyString_ConcatAndDel(&newExcValue, Py_BuildValue("s", "'"));
++#else
+ newExcValue = PyUnicode_FromFormat("%U while searching for \'%s\'",
+ excValue, fullName);
++#endif
+ }
+ Py_DECREF(isAlreadyWrapped);
+ }
Added: packages/cheetah/trunk/debian/patches/series
===================================================================
--- packages/cheetah/trunk/debian/patches/series (rev 0)
+++ packages/cheetah/trunk/debian/patches/series 2010-03-31 00:10:00 UTC (rev 12447)
@@ -0,0 +1 @@
+fix_ftbfs_c_extension_python25.patch
Modified: packages/cheetah/trunk/debian/rules
===================================================================
--- packages/cheetah/trunk/debian/rules 2010-03-30 21:17:25 UTC (rev 12446)
+++ packages/cheetah/trunk/debian/rules 2010-03-31 00:10:00 UTC (rev 12447)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Debian rules file for cheetah
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -9,6 +9,10 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
+# Prepare support for python 3.x (need to add Build-Depends against
+# python3-all-dev in debian/control).
+# cdbs_python_supported_versions += $(shell dpkg-query -W -f='$${Depends}' python3-all-dev | sed 's/.*python\(3\.[0-9]\)-dev.*/\1/')
+
# Install egg-info directories
DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
Modified: packages/cheetah/trunk/debian/source/format
===================================================================
--- packages/cheetah/trunk/debian/source/format 2010-03-30 21:17:25 UTC (rev 12446)
+++ packages/cheetah/trunk/debian/source/format 2010-03-31 00:10:00 UTC (rev 12447)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-modules-commits
mailing list