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

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Fri Dec 11 17:12:32 2009
New Revision: 7878

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7878
Log:
Remove hunk that changes the SLICE_VERSION variable in 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=7878&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Fri Dec 11 17:12:32 2009
@@ -2,8 +2,9 @@
 
   * New upstream release v1.0.
   * Bump dependency for mumble-server to 1.2.0.
+  * Remove hunk that changes the SLICE_VERSION variable in settings.py.
 
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Fri, 11 Dec 2009 18:07:07 +0100
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Fri, 11 Dec 2009 18:12:08 +0100
 
 mumble-django (0.12-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=7878&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Fri Dec 11 17:12:32 2009
@@ -24,17 +24,6 @@
  ##  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.