[Python-modules-commits] r24533 - in packages/jinja2/trunk/debian (6 files)

Sat May 25 21:23:02 UTC 2013

Date: Saturday, May 25, 2013 @ 21:23:00
  Author: piotr
Revision: 24533

* Restore Python 3.2 compatibility (closes: #709638)
* Fix bunch of typos in the documentation (closes: #679534)

Added:
  packages/jinja2/trunk/debian/patches/jinja2-typos.patch
  packages/jinja2/trunk/debian/u2to3.py
Modified:
  packages/jinja2/trunk/debian/changelog
  packages/jinja2/trunk/debian/control
  packages/jinja2/trunk/debian/patches/series
  packages/jinja2/trunk/debian/rules

Modified: packages/jinja2/trunk/debian/changelog
===================================================================

--- packages/jinja2/trunk/debian/changelog	2013-05-25 19:29:51 UTC (rev 24532)
+++ packages/jinja2/trunk/debian/changelog	2013-05-25 21:23:00 UTC (rev 24533)
@@ -1,3 +1,18 @@
+jinja2 (2.7-3) unstable; urgency=low
+
+  [ Jakub Wilk ]
+  * Restore Python 3.2 compatibility (closes: #709638)
+  * Fix bunch of typos in the documentation (closes: #679534)
+
+ -- Piotr OÅ¼arowski <piotr at debian.org>  Sat, 25 May 2013 23:07:10 +0200
+
+jinja2 (2.7-2) unstable; urgency=low
+
+  * Relax build dependency on python3-all and hardcode python3-jinja2's
+    Depends and postinst maintainer script (temporary fix, closes: #709390)
+
+ -- Piotr OÅ¼arowski <piotr at debian.org>  Thu, 23 May 2013 18:42:20 +0200
+
 jinja2 (2.7-1) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/jinja2/trunk/debian/control
===================================================================
--- packages/jinja2/trunk/debian/control	2013-05-25 19:29:51 UTC (rev 24532)
+++ packages/jinja2/trunk/debian/control	2013-05-25 21:23:00 UTC (rev 24533)
@@ -4,13 +4,13 @@
 Maintainer: Piotr OÅ¼arowski <piotr at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 9),
- python-all (>= 2.6.6-3), python3-all (>= 3.3.0-3~),
+ python-all (>= 2.6.6-3), python3-all,
  python-setuptools (>= 0.6b3-1~), python3-setuptools,
  python-sphinx (>= 1.0.7+dfsg) | python3-sphinx, python-pygments
 Standards-Version: 3.9.4
 Homepage: http://jinja.pocoo.org/2/
 X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.3
+X-Python3-Version: >= 3.2
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/jinja2/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/jinja2/trunk/
 

Added: packages/jinja2/trunk/debian/patches/jinja2-typos.patch
===================================================================
--- packages/jinja2/trunk/debian/patches/jinja2-typos.patch	                        (rev 0)
+++ packages/jinja2/trunk/debian/patches/jinja2-typos.patch	2013-05-25 21:23:00 UTC (rev 24533)
@@ -0,0 +1,76 @@
+Description: doc typos
+Author: Jakub Wilk <jwilk at debian.org>
+Bug-Debian: http://bugs.debian.org/679534
+--- jinja2-2.7.orig/docs/tricks.rst
++++ jinja2-2.7/docs/tricks.rst
+@@ -15,7 +15,7 @@ Null-Master Fallback
+ Jinja2 supports dynamic inheritance and does not distinguish between parent
+ and child template as long as no `extends` tag is visited.  While this leads
+ to the surprising behavior that everything before the first `extends` tag
+-including whitespace is printed out instead of being igored, it can be used
++including whitespace is printed out instead of being ignored, it can be used
+ for a neat trick.
+ 
+ Usually child templates extend from one template that adds a basic HTML
+--- jinja2-2.7.orig/docs/templates.rst
++++ jinja2-2.7/docs/templates.rst
+@@ -474,7 +474,7 @@ include characters that affect the resul
+ manually escaping each variable or automatically escaping everything by default.
+ 
+ Jinja supports both, but what is used depends on the application configuration.
+-The default configuaration is no automatic escaping for various reasons:
++The default configuration is no automatic escaping for various reasons:
+ 
+ -   escaping everything except of safe values will also mean that Jinja is
+     escaping variables known to not include HTML such as numbers which is
+@@ -1033,7 +1033,7 @@ but exists for completeness' sake.  The
+     a look at the ``~`` operator.  ``{{ 1 + 1 }}`` is ``2``.
+ 
+ \-
+-    Substract the second number from the first one.  ``{{ 3 - 2 }}`` is ``1``.
++    Subtract the second number from the first one.  ``{{ 3 - 2 }}`` is ``1``.
+ 
+ /
+     Divide two numbers.  The return value will be a floating point number.
+--- jinja2-2.7.orig/docs/sandbox.rst
++++ jinja2-2.7/docs/sandbox.rst
+@@ -54,7 +54,7 @@ Operator Intercepting
+ 
+ .. versionadded:: 2.6
+ 
+-For maximum performace Jinja2 will let operators call directly the type
++For maximum performance Jinja2 will let operators call directly the type
+ specific callback methods.  This means that it's not possible to have this
+ intercepted by overriding :meth:`Environment.call`.  Furthermore a
+ conversion from operator to special method is not always directly possible
+--- jinja2-2.7.orig/docs/api.rst
++++ jinja2-2.7/docs/api.rst
+@@ -450,7 +450,7 @@ This is especially useful if you have a
+ the first request and Jinja compiles many templates at once which slows down
+ the application.
+ 
+-To use a bytecode cache, instanciate it and pass it to the :class:`Environment`.
++To use a bytecode cache, instantiate it and pass it to the :class:`Environment`.
+ 
+ .. autoclass:: jinja2.BytecodeCache
+     :members: load_bytecode, dump_bytecode, clear
+@@ -618,7 +618,7 @@ Evaluation Context
+ ------------------
+ 
+ The evaluation context (short eval context or eval ctx) is a new object
+-introducted in Jinja 2.4 that makes it possible to activate and deactivate
++introduced in Jinja 2.4 that makes it possible to activate and deactivate
+ compiled features at runtime.
+ 
+ Currently it is only used to enable and disable the automatic escaping but
+--- jinja2-2.7.orig/docs/extensions.rst
++++ jinja2-2.7/docs/extensions.rst
+@@ -213,7 +213,7 @@ Writing Extensions
+ 
+ .. module:: jinja2.ext
+ 
+-By writing extensions you can add custom tags to Jinja2.  This is a non trival
++By writing extensions you can add custom tags to Jinja2.  This is a non-trivial
+ task and usually not needed as the default tags and expressions cover all
+ common use cases.  The i18n extension is a good example of why extensions are
+ useful, another one would be fragment caching.

Modified: packages/jinja2/trunk/debian/patches/series
===================================================================
--- packages/jinja2/trunk/debian/patches/series	2013-05-25 19:29:51 UTC (rev 24532)
+++ packages/jinja2/trunk/debian/patches/series	2013-05-25 21:23:00 UTC (rev 24533)
@@ -1 +1,2 @@
 drop_next_import_from_docs-jinjaext.patch
+jinja2-typos.patch

Modified: packages/jinja2/trunk/debian/rules
===================================================================
--- packages/jinja2/trunk/debian/rules	2013-05-25 19:29:51 UTC (rev 24532)
+++ packages/jinja2/trunk/debian/rules	2013-05-25 21:23:00 UTC (rev 24533)
@@ -26,6 +26,11 @@
 build-indep: $(PYVERS:%=build-python%) build-docs
 	touch $@
 
+build-python3%:
+	python3$* setup.py build
+	python debian/u2to3.py --no-diffs --write --nobackups build/lib/
+	touch $@
+
 build-python%:
 	python$* setup.py build
 	touch $@

Added: packages/jinja2/trunk/debian/u2to3.py
===================================================================
--- packages/jinja2/trunk/debian/u2to3.py	                        (rev 0)
+++ packages/jinja2/trunk/debian/u2to3.py	2013-05-25 21:23:00 UTC (rev 24533)
@@ -0,0 +1,12 @@
+#!/usr/bin/python
+
+'''
+minimal 2to3 coverter that touches only u'' literals
+'''
+
+import sys
+from lib2to3.fixes.fix_unicode import FixUnicode
+
+FixUnicode.PATTERN = 'STRING'
+sys.argv[1:1] = ['-f', 'unicode']
+execfile('/usr/bin/2to3')


