[Pkg-voip-commits] r9773 - in /mumble-django/trunk/debian: changelog patches/01-settings.diff

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Sun Jun 10 13:33:30 2012
New Revision: 9773

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9773
Log:
Adapt 01-settings.diff to include the MessageMiddleware needed by the admin
system for Django 1.4 compatibility.

Modified:
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/patches/01-settings.diff

Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=9773&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Sun Jun 10 13:33:30 2012
@@ -5,6 +5,8 @@
 
   [ Michael Ziegler ]
   * Include Spanish debconf translation (Closes: 675988).
+  * Adapt 01-settings.diff to include the MessageMiddleware needed by the admin
+    system for Django 1.4 compatibility.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 10 Jun 2012 12:22:07 +0200
 

Modified: mumble-django/trunk/debian/patches/01-settings.diff
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/01-settings.diff?rev=9773&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Sun Jun 10 13:33:30 2012
@@ -5,7 +5,7 @@
 Index: mumble-django-2.7/pyweb/settings.py
 ===================================================================
 --- mumble-django-2.7.orig/pyweb/settings.py	2012-03-31 20:21:58.000000000 +0200
-+++ mumble-django-2.7/pyweb/settings.py	2012-03-31 20:23:45.738787498 +0200
++++ mumble-django-2.7/pyweb/settings.py	2012-06-10 15:32:21.259973015 +0200
 @@ -37,8 +37,8 @@
  ##                                                             ##
  ##  The path inside the VirtualHost that M-D lives in:         ##
@@ -35,7 +35,15 @@
          'USER':     '',
          'PASSWORD': '',
          'HOST':     '',
-@@ -276,7 +276,7 @@
+@@ -243,6 +243,7 @@
+     'django.middleware.csrf.CsrfViewMiddleware',
+     'django.middleware.locale.LocaleMiddleware',
+     'django.contrib.auth.middleware.AuthenticationMiddleware',
++    'django.contrib.messages.middleware.MessageMiddleware',
+ )
+ 
+ ROOT_URLCONF = 'pyweb.urls'
+@@ -276,7 +277,7 @@
  #TEST_MURMUR_LAB_DIR   = join( dirname(MUMBLE_DJANGO_ROOT), 'murmur' )
  #TEST_MURMUR_FILES_DIR = join( MUMBLE_DJANGO_ROOT, 'testdata' )