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

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Sun Oct  9 18:40:12 2011
New Revision: 9330

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9330
Log:
Update 01-settings.patch to reflect the new settings.py layout.

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=9330&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Sun Oct  9 18:40:12 2011
@@ -2,8 +2,9 @@
 
   * New upstream release.
   * Bump Standards-Version to 3.9.2 (no changes needed).
-
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 09 Oct 2011 20:29:47 +0200
+  * Update 01-settings.patch to reflect the new settings.py layout.
+
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 09 Oct 2011 20:39:57 +0200
 
 mumble-django (2.4-4) unstable; urgency=low
 

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=9330&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Sun Oct  9 18:40:12 2011
@@ -2,11 +2,11 @@
 Forwarded: not-needed
 Author: Michael Ziegler <diese-addy at funzt-halt.net>
 
-Index: mumble-django-2.4/pyweb/settings.py
+Index: mumble-django-2.5/pyweb/settings.py
 ===================================================================
---- mumble-django-2.4.orig/pyweb/settings.py	2010-11-14 14:35:45.000000000 +0100
-+++ mumble-django-2.4/pyweb/settings.py	2010-11-28 12:37:27.464160506 +0100
-@@ -28,8 +28,8 @@
+--- mumble-django-2.5.orig/pyweb/settings.py	2011-10-09 20:28:55.000000000 +0200
++++ mumble-django-2.5/pyweb/settings.py	2011-10-09 20:39:19.828000592 +0200
+@@ -37,8 +37,8 @@
  ##                                                             ##
  ##  The path inside the VirtualHost that M-D lives in:         ##
  ##                                                             ##
@@ -17,7 +17,7 @@
  ##                                                             ##
  ##  Make sure you use a trailing slash!                        ##
  ##                                                             ##
-@@ -41,7 +41,7 @@
+@@ -50,7 +50,7 @@
  ##  extracted Mumble-Django.                                   ##
  ##                                                             ##
  ##  Default: Auto Detection                                    ##
@@ -26,16 +26,16 @@
  ##  Examples:                                                  ##
  #MUMBLE_DJANGO_ROOT = '/srv/mumble-django'                     ##
  #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django'                   ##
-@@ -147,7 +147,7 @@
- # Database settings for Mumble-Django's database. These do NOT need to point
- # to Murmur's database, Mumble-Django should use its own!
- DATABASE_ENGINE = 'sqlite3'
--DATABASE_NAME = join( MUMBLE_DJANGO_ROOT, 'db', 'mumble-django.db3' )
-+DATABASE_NAME = '/var/lib/mumble-django/mumble-django.db3'
- DATABASE_USER = ''
- DATABASE_PASSWORD = ''
- DATABASE_HOST = ''
-@@ -253,7 +253,7 @@
+@@ -162,7 +162,7 @@
+ DATABASES = {
+     'default': {
+         'ENGINE':   'django.db.backends.sqlite3',
+-        'NAME':     join( MUMBLE_DJANGO_ROOT, 'db', 'mumble-django.db3' ),
++        'NAME':     '/var/lib/mumble-django/mumble-django.db3',
+         'USER':     '',
+         'PASSWORD': '',
+         'HOST':     '',
+@@ -270,7 +270,7 @@
  #TEST_MURMUR_LAB_DIR   = join( dirname(MUMBLE_DJANGO_ROOT), 'murmur' )
  #TEST_MURMUR_FILES_DIR = join( MUMBLE_DJANGO_ROOT, 'testdata' )