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

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Sun May 12 19:30:13 2013
New Revision: 10178

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10178
Log:
Disable the registration app for now because it doesn't work with Django 1.5.

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=10178&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Sun May 12 19:30:13 2013
@@ -7,6 +7,7 @@
   * Remove template patch for django-registration 0.8 (applied upstream).
   * Remove the hunk that adds MessageMiddleware to settings.py (applied
     upstream).
+  * Disable the registration app for now because it doesn't work with Django 1.5.
 
  -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 12 May 2013 21:12:12 +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=10178&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Sun May 12 19:30:13 2013
@@ -2,10 +2,10 @@
 Forwarded: not-needed
 Author: Michael Ziegler <diese-addy at funzt-halt.net>
 
-Index: mumble-django-2.7/pyweb/settings.py
+Index: mumble-django-2.8/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-06-10 15:32:21.259973015 +0200
+--- mumble-django-2.8.orig/pyweb/settings.py	2013-05-12 21:27:06.816587421 +0200
++++ mumble-django-2.8/pyweb/settings.py	2013-05-12 21:27:17.481587511 +0200
 @@ -37,8 +37,8 @@
  ##                                                             ##
  ##  The path inside the VirtualHost that M-D lives in:         ##
@@ -35,7 +35,7 @@
          'USER':     '',
          'PASSWORD': '',
          'HOST':     '',
-@@ -276,7 +277,7 @@
+@@ -277,7 +277,7 @@
  #TEST_MURMUR_LAB_DIR   = join( dirname(MUMBLE_DJANGO_ROOT), 'murmur' )
  #TEST_MURMUR_FILES_DIR = join( MUMBLE_DJANGO_ROOT, 'testdata' )
  
@@ -44,3 +44,9 @@
  
  INSTALLED_APPS = [
      'django.contrib.auth',
+@@ -305,4 +305,4 @@
+ # Check if django_extensions is available.
+ modprobe( "django_extensions" )
+ 
+-modprobe( 'registration' )
++#modprobe( 'registration' )