[Pkg-voip-commits] r7791 - in /mumble-django/trunk/debian: changelog mumble-django-configure patches/01-settings.dpatch

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Thu Nov 12 18:57:02 2009
New Revision: 7791

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7791
Log:
Update settings and m-d-configure script to work with Murmur 1.2.0.

Modified:
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/mumble-django-configure
    mumble-django/trunk/debian/patches/01-settings.dpatch

Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=7791&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Thu Nov 12 18:57:02 2009
@@ -1,3 +1,9 @@
+mumble-django (0.11-2) unstable; urgency=low
+
+  * Update settings and m-d-configure script to work with Murmur 1.2.0.
+
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Thu, 12 Nov 2009 19:56:33 +0100
+
 mumble-django (0.11-1) unstable; urgency=low
 
   [ Michael Ziegler ]

Modified: mumble-django/trunk/debian/mumble-django-configure
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django-configure?rev=7791&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django-configure (original)
+++ mumble-django/trunk/debian/mumble-django-configure Thu Nov 12 18:57:02 2009
@@ -19,7 +19,7 @@
 MUMBLE_DJANGO_INSTDIR="/usr/share/mumble-django"
 MUMBLE_DJANGO_USER="www-data"
 MUMBLE_DJANGO_MUNIN="/etc/munin/plugins/mumble-django"
-MURMUR_CONNSTR="net.sourceforge.mumble.murmur"
+MURMUR_CONNSTR="Meta:tcp -h 127.0.0.1 -p 6502"
 
 echo "Welcome to mumble-django-configure!"
 echo "-------------------------------------------"

Modified: mumble-django/trunk/debian/patches/01-settings.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/01-settings.dpatch?rev=7791&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.dpatch (original)
+++ mumble-django/trunk/debian/patches/01-settings.dpatch Thu Nov 12 18:57:02 2009
@@ -4,9 +4,9 @@
 ## DP: Configured paths for the templates and the database file.
 
 @DPATCH@
-diff -urNad mumble-django-0.10~/pyweb/settings.py mumble-django-0.10/pyweb/settings.py
---- mumble-django-0.10~/pyweb/settings.py	2009-09-01 12:03:50.000000000 +0200
-+++ mumble-django-0.10/pyweb/settings.py	2009-09-01 12:21:17.103010169 +0200
+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
 @@ -20,8 +20,8 @@
  ##                                                             ##
  ##  The path inside the VirtualHost that M-D lives in:         ##
@@ -27,6 +27,15 @@
  ##  Examples:                                                  ##
  #MUMBLE_DJANGO_ROOT = '/srv/mumble-django';                    ##
  #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django';                  ##
+@@ -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.
+-SLICE = None
++SLICE = '/usr/share/slice/Murmur.ice'
+ 
+ 
+ # The default connection string to set for newly created instances.
 @@ -89,7 +89,7 @@
  # Database settings for Mumble-Django's database. These do NOT need to point to Murmur's database,
  # Mumble-Django should use its own!
@@ -36,7 +45,7 @@
  DATABASE_USER = ''
  DATABASE_PASSWORD = ''
  DATABASE_HOST = ''
-@@ -161,6 +161,7 @@
+@@ -162,6 +162,7 @@
  	# Always use forward slashes, even on Windows.
  	# Don't forget to use absolute paths, not relative paths.
  	join( MUMBLE_DJANGO_ROOT, 'template' ),