[Python-modules-commits] r26546 - in packages/python-django-crispy-forms/trunk/debian (5 files)

[jandd at users.alioth.debian.org]

    Date: Monday, November 25, 2013 @ 17:35:10
  Author: jandd
Revision: 26546

* debian/copyright: add separate section with license of docs/_themes
* add patches/001_fix_django1_6_incompatbility.patch to repair
  documentation build with Django 1.6

Added:
  packages/python-django-crispy-forms/trunk/debian/patches/
  packages/python-django-crispy-forms/trunk/debian/patches/001_fix_django1_6_incompatbility.patch
  packages/python-django-crispy-forms/trunk/debian/patches/series
Modified:
  packages/python-django-crispy-forms/trunk/debian/changelog
  packages/python-django-crispy-forms/trunk/debian/copyright

Modified: packages/python-django-crispy-forms/trunk/debian/changelog
===================================================================
--- packages/python-django-crispy-forms/trunk/debian/changelog	2013-11-25 16:35:30 UTC (rev 26545)
+++ packages/python-django-crispy-forms/trunk/debian/changelog	2013-11-25 17:35:10 UTC (rev 26546)
@@ -1,6 +1,9 @@
 python-django-crispy-forms (1.4.0-2) UNRELEASED; urgency=low
 
   * debian/watch: add filenamemangle option
+  * debian/copyright: add separate section with license of docs/_themes
+  * add patches/001_fix_django1_6_incompatbility.patch to repair
+    documentation build with Django 1.6
 
  -- Jan Dittberner <jandd at debian.org>  Sat, 12 Oct 2013 19:03:58 +0200
 

Modified: packages/python-django-crispy-forms/trunk/debian/copyright
===================================================================
--- packages/python-django-crispy-forms/trunk/debian/copyright	2013-11-25 16:35:30 UTC (rev 26545)
+++ packages/python-django-crispy-forms/trunk/debian/copyright	2013-11-25 17:35:10 UTC (rev 26546)
@@ -10,6 +10,46 @@
 Copyright: 2013 Jan Dittberner <jandd at debian.org>
 License: MIT
 
+Files: docs/_themes/*
+Copyright: 2010 Kenneth Reitz
+Copyright: 2010 Armin Ronacher
+License: BSD-3-clause
+ Some rights reserved.
+ .
+ Redistribution and use in source and binary forms of the theme, with or
+ without modification, are permitted provided that the following conditions
+ are met:
+ .
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+ .
+ * The names of the contributors may not be used to endorse or
+   promote products derived from this software without specific
+   prior written permission.
+ .
+ We kindly ask you to only use these themes in an unmodified manner just
+ for Flask and Flask-related products, not for unrelated projects.  If you
+ like the visual style and want to use it for your own projects, please
+ consider making some larger changes to the themes (such as changing
+ font faces, sizes, colors or margins).
+ .
+ THIS THEME IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS THEME, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
 License: MIT
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation

Added: packages/python-django-crispy-forms/trunk/debian/patches/001_fix_django1_6_incompatbility.patch
===================================================================
--- packages/python-django-crispy-forms/trunk/debian/patches/001_fix_django1_6_incompatbility.patch	                        (rev 0)
+++ packages/python-django-crispy-forms/trunk/debian/patches/001_fix_django1_6_incompatbility.patch	2013-11-25 17:35:10 UTC (rev 26546)
@@ -0,0 +1,18 @@
+Subject: Fix Django 1.6 incompatbility for Sphinx documentation generation
+Author: Jan Dittberner <jan at dittberner.info>
+Date:   Mon Nov 25 18:20:28 2013 +0100
+Forwarded: https://github.com/maraujop/django-crispy-forms/pull/273
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -22,9 +22,8 @@ sys.path.insert(0, os.path.abspath('../crispy_forms'))
+ sys.path.insert(0, os.path.abspath('../crispy_forms/templatetags'))
+ sys.path.append(os.path.abspath('_themes'))
+ 
+-import settings
+-from django.core.management import setup_environ
+-setup_environ(settings)
++from django.conf import settings
++settings.configure()
+ 
+ 
+ # -- General configuration -----------------------------------------------------

Added: packages/python-django-crispy-forms/trunk/debian/patches/series
===================================================================
--- packages/python-django-crispy-forms/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-django-crispy-forms/trunk/debian/patches/series	2013-11-25 17:35:10 UTC (rev 26546)
@@ -0,0 +1 @@
+001_fix_django1_6_incompatbility.patch