[Python-modules-commits] r13160 - in packages/jinja2/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Sunday, May 30, 2010 @ 09:22:11
  Author: piotr
Revision: 13160

* New upstream release
* python3_builtins.patch removed, no longer needed
* add python3.1 to python3-jinja2's Depends

Modified:
  packages/jinja2/trunk/debian/changelog
  packages/jinja2/trunk/debian/control
  packages/jinja2/trunk/debian/patches/series
Deleted:
  packages/jinja2/trunk/debian/patches/python3_builtins.patch

Modified: packages/jinja2/trunk/debian/changelog
===================================================================
--- packages/jinja2/trunk/debian/changelog	2010-05-30 09:07:30 UTC (rev 13159)
+++ packages/jinja2/trunk/debian/changelog	2010-05-30 09:22:11 UTC (rev 13160)
@@ -1,3 +1,11 @@
+jinja2 (2.5-1) unstable; urgency=low
+
+  * New upstream release
+  * python3_builtins.patch removed, no longer needed
+  * add python3.1 to python3-jinja2's Depends
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 30 May 2010 11:01:51 +0200
+
 jinja2 (2.4.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/jinja2/trunk/debian/control
===================================================================
--- packages/jinja2/trunk/debian/control	2010-05-30 09:07:30 UTC (rev 13159)
+++ packages/jinja2/trunk/debian/control	2010-05-30 09:22:11 UTC (rev 13160)
@@ -69,7 +69,7 @@
 
 Package: python3-jinja2
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python3.1
 Recommends: python-pkg-resources
 Provides: ${python:Provides}
 Suggests: python-jinja2-doc

Deleted: packages/jinja2/trunk/debian/patches/python3_builtins.patch
===================================================================
--- packages/jinja2/trunk/debian/patches/python3_builtins.patch	2010-05-30 09:07:30 UTC (rev 13159)
+++ packages/jinja2/trunk/debian/patches/python3_builtins.patch	2010-05-30 09:22:11 UTC (rev 13160)
@@ -1,14 +0,0 @@
-# Different name for builtins in Python 3 (changeset 789)
-diff -ruN jinja2-2.4.1//jinja2/utils.py jinja2/jinja2/utils.py
---- jinja2-2.4.1//jinja2/utils.py	2010-04-20 13:43:42.000000000 +0200
-+++ jinja2/jinja2/utils.py	2010-04-20 21:30:18.437823475 +0200
-@@ -236,7 +236,8 @@
-         return 'None'
-     elif obj is Ellipsis:
-         return 'Ellipsis'
--    if obj.__class__.__module__ == '__builtin__':
-+    # __builtin__ in 2.x, builtins in 3.x
-+    if obj.__class__.__module__ in ('__builtin__', 'builtins'):
-         name = obj.__class__.__name__
-     else:
-         name = obj.__class__.__module__ + '.' + obj.__class__.__name__

Modified: packages/jinja2/trunk/debian/patches/series
===================================================================
--- packages/jinja2/trunk/debian/patches/series	2010-05-30 09:07:30 UTC (rev 13159)
+++ packages/jinja2/trunk/debian/patches/series	2010-05-30 09:22:11 UTC (rev 13160)
@@ -1,2 +1 @@
 add_version_placeholder.patch
-python3_builtins.patch