[Python-modules-commits] r17907 - in packages/jinja2/trunk/debian (7 files)

[piotr at users.alioth.debian.org]

    Date: Monday, July 25, 2011 @ 09:48:41
  Author: piotr
Revision: 17907

* New upstream release
* add_version_placeholder patch removed (no longer needed)
* htmljinja.vim is no longer available, use jinja.vim instead
* Standards-version bumped to 3.9.2 (no other changes needed)

Modified:
  packages/jinja2/trunk/debian/changelog
  packages/jinja2/trunk/debian/control
  packages/jinja2/trunk/debian/copyright
  packages/jinja2/trunk/debian/jinja.yaml
  packages/jinja2/trunk/debian/python-jinja2.install
  packages/jinja2/trunk/debian/rules
Deleted:
  packages/jinja2/trunk/debian/patches/

Modified: packages/jinja2/trunk/debian/changelog
===================================================================
--- packages/jinja2/trunk/debian/changelog	2011-07-24 17:55:29 UTC (rev 17906)
+++ packages/jinja2/trunk/debian/changelog	2011-07-25 09:48:41 UTC (rev 17907)
@@ -1,8 +1,12 @@
-jinja2 (2.5.5-6) UNRELEASED; urgency=low
+jinja2 (2.6-1) unstable; urgency=low
 
+  * New upstream release
+  * add_version_placeholder patch removed (no longer needed)
+  * htmljinja.vim is no longer available, use jinja.vim instead
   * python3-jinja2 suggests python-jinja2-doc instead of python3-jinja2-doc
+  * Standards-version bumped to 3.9.2 (no other changes needed)
 
- -- Piotr Ożarowski <piotr at debian.org>  Tue, 28 Jun 2011 21:17:42 +0200
+ -- Piotr Ożarowski <piotr at debian.org>  Mon, 25 Jul 2011 10:31:24 +0200
 
 jinja2 (2.5.5-5) unstable; urgency=low
 

Modified: packages/jinja2/trunk/debian/control
===================================================================
--- packages/jinja2/trunk/debian/control	2011-07-24 17:55:29 UTC (rev 17906)
+++ packages/jinja2/trunk/debian/control	2011-07-25 09:48:41 UTC (rev 17907)
@@ -8,7 +8,7 @@
  python3-all-dev (>= 3.1.2-10), python3-all-dbg,
  python-setuptools (>= 0.6b3-1~), python3-setuptools
 Build-Depends-Indep: python-sphinx (>= 0.6), python-pygments
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://jinja.pocoo.org/2/
 X-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/jinja2/trunk

Modified: packages/jinja2/trunk/debian/copyright
===================================================================
--- packages/jinja2/trunk/debian/copyright	2011-07-24 17:55:29 UTC (rev 17906)
+++ packages/jinja2/trunk/debian/copyright	2011-07-25 09:48:41 UTC (rev 17907)
@@ -3,7 +3,7 @@
 
 It was downloaded from http://pypi.python.org/pypi/Jinja2
 
-Copyright (c) 2009-2010 by the Jinja Team, see AUTHORS for more details.
+Copyright (c) 2009-2011 by the Jinja Team, see AUTHORS for more details.
 
 Some rights reserved.
 
@@ -69,8 +69,5 @@
 
   ---------------------------------------------------------------
 
-The Debian packaging is © 2008-2010, Piotr Ożarowski <piotr at debian.org> and
+The Debian packaging is © 2008-2011, Piotr Ożarowski <piotr at debian.org> and
 is licensed under the same license as Jinja2.
-
-On Debian systems, the complete text of the BSD License can be found in
-`/usr/share/common-licenses/BSD'

Modified: packages/jinja2/trunk/debian/jinja.yaml
===================================================================
--- packages/jinja2/trunk/debian/jinja.yaml	2011-07-24 17:55:29 UTC (rev 17906)
+++ packages/jinja2/trunk/debian/jinja.yaml	2011-07-25 09:48:41 UTC (rev 17907)
@@ -1,5 +1,4 @@
 addon: jinja
 description: "allow syntax highlighting for Jinja templates"
 files: 
-  - syntax/htmljinja.vim
   - syntax/jinja.vim

Modified: packages/jinja2/trunk/debian/python-jinja2.install
===================================================================
--- packages/jinja2/trunk/debian/python-jinja2.install	2011-07-24 17:55:29 UTC (rev 17906)
+++ packages/jinja2/trunk/debian/python-jinja2.install	2011-07-25 09:48:41 UTC (rev 17907)
@@ -1,3 +1,2 @@
-ext/Vim/htmljinja.vim	/usr/share/vim/addons/syntax/
 ext/Vim/jinja.vim	/usr/share/vim/addons/syntax/
 debian/jinja.yaml	/usr/share/vim/registry

Modified: packages/jinja2/trunk/debian/rules
===================================================================
--- packages/jinja2/trunk/debian/rules	2011-07-24 17:55:29 UTC (rev 17906)
+++ packages/jinja2/trunk/debian/rules	2011-07-25 09:48:41 UTC (rev 17907)
@@ -44,7 +44,6 @@
 install-python%: build-python%
 	python$* setup.py --with-debugsupport install $(py_setup_install_args) \
 		--skip-build --single-version-externally-managed --root $(call pkgdir,$*)
-	sed -i -e 's,REPLACE_ME_WITH_PROPER_VERSION,$(VERSION),' $(call pkgdir,$*)$(call py_libdir,$*)/jinja2/__init__.py
 	rm -rf $(call pkgdir,$*)$(call py_libdir,$*)/jinja2/_markupsafe
 	rm -f $(call pkgdir,$*)$(call py_libdir,$*)/jinja2/_debugsupport.c
 	touch $@