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

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Wed Dec  2 14:15:39 2009
New Revision: 7851

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7851
Log:
Update 01-settings.diff to set SLICE_VERSION to 1.2.0.

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=7851&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Wed Dec  2 14:15:39 2009
@@ -9,8 +9,9 @@
   [ Michael Ziegler ]
   * New upstream release v0.12.
   * Bump dependency on mumble-server to 1.2.0~beta2.
+  * Update 01-settings.diff to set SLICE_VERSION to 1.2.0.
 
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Wed, 02 Dec 2009 14:55:16 +0100
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Wed, 02 Dec 2009 15:15:14 +0100
 
 mumble-django (0.11-2) 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=7851&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Wed Dec  2 14:15:39 2009
@@ -1,8 +1,9 @@
 # Configured paths for the templates and the database file.
 
-diff -urNad mumble-django-0.11~/pyweb/settings.py mumble-django-0.11/pyweb/settings.py
---- mumble-django-0.11~/pyweb/settings.py	2009-09-25 22:44:58.000000000 +0200
-+++ mumble-django-0.11/pyweb/settings.py	2009-11-12 19:52:49.703050889 +0100
+Index: mumble-django-0.12/pyweb/settings.py
+===================================================================
+--- mumble-django-0.12.orig/pyweb/settings.py	2009-11-29 13:32:19.000000000 +0100
++++ mumble-django-0.12/pyweb/settings.py	2009-12-02 15:14:21.000000000 +0100
 @@ -20,8 +20,8 @@
  ##                                                             ##
  ##  The path inside the VirtualHost that M-D lives in:         ##
@@ -23,6 +24,17 @@
  ##  Examples:                                                  ##
  #MUMBLE_DJANGO_ROOT = '/srv/mumble-django';                    ##
  #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django';                  ##
+@@ -53,8 +53,8 @@
+ 
+ 
+ # The ICE interface version to use.
+-SLICE_VERSION = (1, 1, 8)
+-#SLICE_VERSION = (1, 2, 0)
++#SLICE_VERSION = (1, 1, 8)
++SLICE_VERSION = (1, 2, 0)
+ # 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.
@@ -32,7 +44,7 @@
  
  
  # The default connection string to set for newly created instances.
-@@ -89,7 +89,7 @@
+@@ -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!
  DATABASE_ENGINE = 'sqlite3'
@@ -41,7 +53,7 @@
  DATABASE_USER = ''
  DATABASE_PASSWORD = ''
  DATABASE_HOST = ''
-@@ -162,6 +162,7 @@
+@@ -178,6 +178,7 @@
  	# Always use forward slashes, even on Windows.
  	# Don't forget to use absolute paths, not relative paths.
  	join( MUMBLE_DJANGO_ROOT, 'template' ),