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

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Sat Mar 31 16:51:11 2012
New Revision: 9613

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9613
Log:
Refresh 01-settings.py patch to apply cleanly.

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=9613&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Sat Mar 31 16:51:11 2012
@@ -3,8 +3,9 @@
   * New upstream release.
   * Use debconf to display the "please run m-d-c" message.
   * Add dependency to ice34-slice.
-
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Sat, 31 Mar 2012 18:47:41 +0200
+  * Refresh 01-settings.py patch to apply cleanly.
+
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Sat, 31 Mar 2012 18:50:58 +0200
 
 mumble-django (2.5-1) 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=9613&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Sat Mar 31 16:51:11 2012
@@ -2,10 +2,10 @@
 Forwarded: not-needed
 Author: Michael Ziegler <diese-addy at funzt-halt.net>
 
-Index: mumble-django-2.5/pyweb/settings.py
+Index: mumble-django-2.6/pyweb/settings.py
 ===================================================================
---- 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
+--- mumble-django-2.6.orig/pyweb/settings.py	2012-03-31 18:46:56.000000000 +0200
++++ mumble-django-2.6/pyweb/settings.py	2012-03-31 18:49:46.857634966 +0200
 @@ -37,8 +37,8 @@
  ##                                                             ##
  ##  The path inside the VirtualHost that M-D lives in:         ##
@@ -26,7 +26,7 @@
  ##  Examples:                                                  ##
  #MUMBLE_DJANGO_ROOT = '/srv/mumble-django'                     ##
  #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django'                   ##
-@@ -162,7 +162,7 @@
+@@ -165,7 +165,7 @@
  DATABASES = {
      'default': {
          'ENGINE':   'django.db.backends.sqlite3',
@@ -35,7 +35,7 @@
          'USER':     '',
          'PASSWORD': '',
          'HOST':     '',
-@@ -270,7 +270,7 @@
+@@ -274,7 +274,7 @@
  #TEST_MURMUR_LAB_DIR   = join( dirname(MUMBLE_DJANGO_ROOT), 'murmur' )
  #TEST_MURMUR_FILES_DIR = join( MUMBLE_DJANGO_ROOT, 'testdata' )