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

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Sun Mar 14 13:38:03 2010
New Revision: 8202

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8202
Log:
* Remove patch to set the conversionsql path.
* Update 01-settings.diff to include the conversionsql path.

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=8202&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Sun Mar 14 13:38:03 2010
@@ -1,9 +1,10 @@
 mumble-django (2.0~beta-20100314-1) UNRELEASED; urgency=low
 
   * Last beta version before the release of 2.0 final.
-  * Remove patch to set the conversionsql path (will be done in settings.py).
+  * Remove patch to set the conversionsql path.
+  * Update 01-settings.diff to include the conversionsql path.
 
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 14 Mar 2010 14:31:04 +0100
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 14 Mar 2010 14:37:35 +0100
 
 mumble-django (2.0~beta20100304-1) UNRELEASED; 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=8202&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Sun Mar 14 13:38:03 2010
@@ -2,10 +2,10 @@
 Forwarded: not-needed
 Author: Michael Ziegler <diese-addy at funzt-halt.net>
 
-Index: mumble-django-1.5/pyweb/settings.py
+Index: mumble-django-2.0~beta-20100314/pyweb/settings.py
 ===================================================================
---- mumble-django-1.5.orig/pyweb/settings.py	2010-02-15 12:28:04.000000000 +0100
-+++ mumble-django-1.5/pyweb/settings.py	2010-02-15 12:38:01.000000000 +0100
+--- mumble-django-2.0~beta-20100314.orig/pyweb/settings.py	2010-03-14 14:25:53.000000000 +0100
++++ mumble-django-2.0~beta-20100314/pyweb/settings.py	2010-03-14 14:37:04.000000000 +0100
 @@ -27,8 +27,8 @@
  ##                                                             ##
  ##  The path inside the VirtualHost that M-D lives in:         ##
@@ -36,3 +36,12 @@
  DATABASE_USER = ''
  DATABASE_PASSWORD = ''
  DATABASE_HOST = ''
+@@ -208,7 +209,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";
+ 
+ INSTALLED_APPS = [
+ 	'django.contrib.auth',