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

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Sun Feb  7 15:46:52 2010
New Revision: 8031

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8031
Log:
* New upstream release for Murmur 1.2.2.
* Remove modification of SLICE_VERSION as it is set correctly upstream.

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=8031&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Sun Feb  7 15:46:52 2010
@@ -1,3 +1,10 @@
+mumble-django (1.3-1) UNRELEASED; urgency=low
+
+  * New upstream release for Murmur 1.2.2.
+  * Remove modification of SLICE_VERSION as it is set correctly upstream.
+
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 07 Feb 2010 16:46:11 +0100
+
 mumble-django (1.2-2) unstable; urgency=medium
 
   * Remove *.py wildcard in mumble-django.install, as it causes settings.py

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=8031&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Sun Feb  7 15:46:52 2010
@@ -24,15 +24,6 @@
  ##  Examples:                                                  ##
  #MUMBLE_DJANGO_ROOT = '/srv/mumble-django';                    ##
  #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django';                  ##
-@@ -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.