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

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Sat Jan  9 23:32:24 2010
New Revision: 7950

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7950
Log:
patch SLICE_VERSION variable

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=7950&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Sat Jan  9 23:32:24 2010
@@ -7,7 +7,7 @@
   * Remove the patch for the registration bug added in 1.0-1 (fixed upstream).
   * Change Murmur version setting and dependency to 1.2.1.
 
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 10 Jan 2010 00:22:08 +0100
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 10 Jan 2010 00:32:08 +0100
 
 mumble-django (1.0-1) unstable; urgency=medium
 

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=7950&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Sat Jan  9 23:32:24 2010
@@ -1,9 +1,9 @@
 # Configured paths for the templates and the database file.
 
-Index: mumble-django-1.0/pyweb/settings.py
+Index: mumble-django-1.1/pyweb/settings.py
 ===================================================================
---- mumble-django-1.0.orig/pyweb/settings.py	2009-12-10 23:13:36.000000000 +0100
-+++ mumble-django-1.0/pyweb/settings.py	2009-12-16 00:21:46.000000000 +0100
+--- mumble-django-1.1.orig/pyweb/settings.py	2010-01-09 12:27:29.000000000 +0100
++++ mumble-django-1.1/pyweb/settings.py	2010-01-10 00:30:26.000000000 +0100
 @@ -20,8 +20,8 @@
  ##                                                             ##
  ##  The path inside the VirtualHost that M-D lives in:         ##
@@ -24,7 +24,16 @@
  ##  Examples:                                                  ##
  #MUMBLE_DJANGO_ROOT = '/srv/mumble-django';                    ##
  #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django';                  ##
-@@ -64,6 +64,6 @@
+@@ -54,7 +54,7 @@
+ 
+ # The ICE interface version to use.
+ #SLICE_VERSION = (1, 1, 8)
+-SLICE_VERSION = (1, 2, 0)
++SLICE_VERSION = (1, 2, 1)
+ # Murmur 1.2.0 is incompatible with 1.1.8, that's why this needs to be configured here.
+ # If you have <=1.1.8 and 1.2.0 servers running simultaneously, consider using DBus for
+ # the <=1.1.8 servers and ICE for 1.2.0. That way, you will be able to manage both server
+@@ -64,7 +64,7 @@
  # This can be set to the path to the Murmur.ice file that resides
  # in your Murmur directory.
  # Default: None -- use the slices shipped with MD.
@@ -32,6 +41,7 @@
 +SLICE = '/usr/share/slice/Murmur.ice'
  
  
+ # The default connection string to set for newly created instances.
 @@ -105,7 +105,7 @@
  # Database settings for Mumble-Django's database. These do NOT need to point to Murmur's database,
  # Mumble-Django should use its own!
@@ -48,4 +58,4 @@
 +	'/usr/share/pyshared-data/python-django-mumble/template',
  )
  
- INSTALLED_APPS = (
+ TEST_RUNNER = 'mumble.testrunner.run_tests'