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

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Mon Jun 21 16:53:03 2010
New Revision: 8523

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8523
Log:
* New upstream release.
* Update 01-settings.diff to match the new layout for settings.py.

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=8523&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Mon Jun 21 16:53:03 2010
@@ -1,3 +1,10 @@
+mumble-django (2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update 01-settings.diff to match the new layout for settings.py.
+
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Mon, 21 Jun 2010 18:52:37 +0200
+
 mumble-django (2.1-2) unstable; urgency=low
 
   * Bump dependency to python-zeroc-ice to 3.3.1-12 (needed for Murmur 1.2.3).

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=8523&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Mon Jun 21 16:53:03 2010
@@ -2,11 +2,11 @@
 Forwarded: not-needed
 Author: Michael Ziegler <diese-addy at funzt-halt.net>
 
-Index: mumble-django-2.0~beta-20100314/pyweb/settings.py
+Index: mumble-django-2.2/pyweb/settings.py
 ===================================================================
---- 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 @@
+--- mumble-django-2.2.orig/pyweb/settings.py	2010-06-21 18:13:18.929964675 +0200
++++ mumble-django-2.2/pyweb/settings.py	2010-06-21 18:49:41.354247117 +0200
+@@ -28,8 +28,8 @@
  ##                                                             ##
  ##  The path inside the VirtualHost that M-D lives in:         ##
  ##                                                             ##
@@ -17,31 +17,30 @@
  ##                                                             ##
  ##  Make sure you use a trailing slash!                        ##
  ##                                                             ##
-@@ -40,7 +40,8 @@
+@@ -41,7 +41,7 @@
  ##  extracted Mumble-Django.                                   ##
  ##                                                             ##
  ##  Default: Auto Detection                                    ##
 -MUMBLE_DJANGO_ROOT = None                                      ##
-+#MUMBLE_DJANGO_ROOT = None                                     ##
 +MUMBLE_DJANGO_ROOT = '/usr/share/mumble-django'                ##
  ##  Examples:                                                  ##
  #MUMBLE_DJANGO_ROOT = '/srv/mumble-django'                     ##
  #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django'                   ##
-@@ -106,7 +107,7 @@
- # Database settings for Mumble-Django's database. These do NOT need to point to Murmur's database,
- # Mumble-Django should use its own!
+@@ -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 = ''
-@@ -208,7 +209,7 @@
- TEST_MURMUR_LAB_DIR   = join( dirname(MUMBLE_DJANGO_ROOT), 'murmur' );
- TEST_MURMUR_FILES_DIR = join( MUMBLE_DJANGO_ROOT, 'testdata' );
+@@ -243,7 +243,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";
+-CONVERSIONSQL_ROOT = join( MUMBLE_DJANGO_ROOT, "pyweb", "mumble", "conversionsql" )
++CONVERSIONSQL_ROOT = "/usr/share/pyshared-data/python-django-mumble/conversionsql"
  
  INSTALLED_APPS = [
- 	'django.contrib.auth',
+     'django.contrib.auth',