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

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Sun Nov 28 13:36:17 2010
New Revision: 8672

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8672
Log:
Refresh line numbers in 01-settings.patch.

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=8672&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Sun Nov 28 13:36:17 2010
@@ -4,8 +4,9 @@
   * Add dependency to python-django-extdirect=0.4.
   * Add suggestion to python-qrencode.
   * Set Django dependency to = 1.2 to prevent issues with future releases.
-
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 28 Nov 2010 12:15:27 +0100
+  * Refresh line numbers in 01-settings.patch.
+
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 28 Nov 2010 14:35:45 +0100
 
 mumble-django (2.3-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=8672&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Sun Nov 28 13:36:17 2010
@@ -2,10 +2,10 @@
 Forwarded: not-needed
 Author: Michael Ziegler <diese-addy at funzt-halt.net>
 
-Index: mumble-django-2.3/pyweb/settings.py
+Index: mumble-django-2.4/pyweb/settings.py
 ===================================================================
---- mumble-django-2.3.orig/pyweb/settings.py	2010-06-24 14:19:28.000000000 +0200
-+++ mumble-django-2.3/pyweb/settings.py	2010-06-24 14:28:25.709220716 +0200
+--- 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 @@
  ##                                                             ##
  ##  The path inside the VirtualHost that M-D lives in:         ##
@@ -35,9 +35,9 @@
  DATABASE_USER = ''
  DATABASE_PASSWORD = ''
  DATABASE_HOST = ''
-@@ -250,7 +250,7 @@
- TEST_MURMUR_LAB_DIR   = join( dirname(MUMBLE_DJANGO_ROOT), 'murmur' )
- TEST_MURMUR_FILES_DIR = join( MUMBLE_DJANGO_ROOT, 'testdata' )
+@@ -253,7 +253,7 @@
+ #TEST_MURMUR_LAB_DIR   = join( dirname(MUMBLE_DJANGO_ROOT), 'murmur' )
+ #TEST_MURMUR_FILES_DIR = join( MUMBLE_DJANGO_ROOT, 'testdata' )
  
 -CONVERSIONSQL_ROOT = join( MUMBLE_DJANGO_ROOT, "pyweb", "mumble", "conversionsql" )
 +CONVERSIONSQL_ROOT = "/usr/share/pyshared-data/python-django-mumble/conversionsql"