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

[fladi-guest at users.alioth.debian.org]

    Date: Monday, November 25, 2013 @ 07:55:03
  Author: fladi-guest
Revision: 26538

Adapt patch to fix FTBFS with Django-1.6 (Closes: #729831).

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

Deleted: packages/sorl-thumbnail/trunk/debian/patches/django1.5.patch
===================================================================
--- packages/sorl-thumbnail/trunk/debian/patches/django1.5.patch	2013-11-24 23:07:54 UTC (rev 26537)
+++ packages/sorl-thumbnail/trunk/debian/patches/django1.5.patch	2013-11-25 07:55:03 UTC (rev 26538)
@@ -1,34 +0,0 @@
-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()),
- )
- 

Added: packages/sorl-thumbnail/trunk/debian/patches/django1.6.patch
===================================================================
--- packages/sorl-thumbnail/trunk/debian/patches/django1.6.patch	                        (rev 0)
+++ packages/sorl-thumbnail/trunk/debian/patches/django1.6.patch	2013-11-25 07:55:03 UTC (rev 26538)
@@ -0,0 +1,34 @@
+Description: Fix FTBFS with Django 1.6
+ Upstream uses some deprecated functions from Django.
+Author: Sebastian Ramacher <sramacher at debian.org>
+Author: Michael Fladischer <FladischerMichael at fladi.at>
+Last-Update: 2013-11-24
+
+--- a/tests/settings/default.py
++++ b/tests/settings/default.py
+@@ -32,3 +32,4 @@
+     "django.core.context_processors.request",
+ )
+ 
++SECRET_KEY = 'testkey'
+--- a/tests/thumbnail_tests/urls.py
++++ b/tests/thumbnail_tests/urls.py
+@@ -1,12 +1,16 @@
+-from django.conf.urls.defaults import *
++from django.conf.urls import patterns
+ 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-11-24 23:07:54 UTC (rev 26537)
+++ packages/sorl-thumbnail/trunk/debian/patches/series	2013-11-25 07:55:03 UTC (rev 26538)
@@ -1,4 +1,4 @@
 disable_http_tests.patch
 fix_sphinx_warnings.patch
 orientation.patch
-django1.5.patch
+django1.6.patch