[Python-modules-commits] r24429 - in packages/sorl-thumbnail/trunk/debian (3 files)

[dktrkranz at users.alioth.debian.org]

    Date: Sunday, May 19, 2013 @ 10:14:19
  Author: dktrkranz
Revision: 24429

Fix FTBFS with Django 1.5

Added:
  packages/sorl-thumbnail/trunk/debian/patches/django1.5.patch
Modified:
  packages/sorl-thumbnail/trunk/debian/changelog
  packages/sorl-thumbnail/trunk/debian/patches/series

Modified: packages/sorl-thumbnail/trunk/debian/changelog
===================================================================
--- packages/sorl-thumbnail/trunk/debian/changelog	2013-05-18 21:47:34 UTC (rev 24428)
+++ packages/sorl-thumbnail/trunk/debian/changelog	2013-05-19 10:14:19 UTC (rev 24429)
@@ -1,9 +1,14 @@
-sorl-thumbnail (11.12-5) UNRELEASED; urgency=low
+sorl-thumbnail (11.12-6) UNRELEASED; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:03:59 +0200
+  [ Sebastian Ramacher ]
+  * debian/patches/django1.5.patch:
+    - Fix FTBFS with Django 1.5 (Closes: #707805).
 
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 19 May 2013 12:13:05 +0200
+
 sorl-thumbnail (11.12-4) unstable; urgency=low
 
   * Add patch to fix orientation tests and to skip tests for EXIF

Added: packages/sorl-thumbnail/trunk/debian/patches/django1.5.patch
===================================================================
--- packages/sorl-thumbnail/trunk/debian/patches/django1.5.patch	                        (rev 0)
+++ packages/sorl-thumbnail/trunk/debian/patches/django1.5.patch	2013-05-19 10:14:19 UTC (rev 24429)
@@ -0,0 +1,34 @@
+Description: Fix FTBFS with Django 1.5
+Author: Sebastian Ramacher <sramacher at debian.org>
+
+Index: sorl-thumbnail-11.12/tests/settings/default.py
+===================================================================
+--- sorl-thumbnail-11.12.orig/tests/settings/default.py	2011-12-29 15:20:22.000000000 +0100
++++ sorl-thumbnail-11.12/tests/settings/default.py	2013-05-19 12:07:47.086062700 +0200
+@@ -32,3 +32,4 @@
+     "django.core.context_processors.request",
+ )
+ 
++SECRET_KEY = 'testkey'
+Index: sorl-thumbnail-11.12/tests/thumbnail_tests/urls.py
+===================================================================
+--- sorl-thumbnail-11.12.orig/tests/thumbnail_tests/urls.py	2011-12-29 15:20:22.000000000 +0100
++++ sorl-thumbnail-11.12/tests/thumbnail_tests/urls.py	2013-05-19 12:07:47.086062700 +0200
+@@ -1,12 +1,16 @@
+ from django.conf.urls.defaults import *
+ from django.conf import settings
++from django.views.generic import TemplateView
+ 
++class DynamicTemplateView(TemplateView):
++    def get_template_names(self):
++        return self.kwargs['template']
+ 
+ urlpatterns = patterns('',
+     (r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+         'document_root': settings.MEDIA_ROOT,
+         'show_indexes': True}
+     ),
+-    (r'^(.*\.html)$', 'django.views.generic.simple.direct_to_template'),
++    (r'^(?P<template>.*\.html)$', DynamicTemplateView.as_view()),
+ )
+ 

Modified: packages/sorl-thumbnail/trunk/debian/patches/series
===================================================================
--- packages/sorl-thumbnail/trunk/debian/patches/series	2013-05-18 21:47:34 UTC (rev 24428)
+++ packages/sorl-thumbnail/trunk/debian/patches/series	2013-05-19 10:14:19 UTC (rev 24429)
@@ -1,3 +1,4 @@
 disable_http_tests.patch
 fix_sphinx_warnings.patch
 orientation.patch
+django1.5.patch