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

svedrin-guest at alioth.debian.org svedrin-guest at alioth.debian.org
Tue Dec 15 23:23:37 UTC 2009


Author: svedrin-guest
Date: Tue Dec 15 23:23:37 2009
New Revision: 7887

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7887
Log:
Patch DEFAULT_CONNSTR variable in settings.py to point to Ice.

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=7887&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Tue Dec 15 23:23:37 2009
@@ -4,8 +4,9 @@
   * Bump dependency for mumble-server to 1.2.0.
   * Remove hunk that changes the SLICE_VERSION variable in settings.py.
   * Remove chmod for ja/LC_MESSAGES/django.po (fixed upstream).
+  * Patch DEFAULT_CONNSTR variable in settings.py to point to Ice.
 
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Mon, 14 Dec 2009 18:43:44 +0100
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Wed, 16 Dec 2009 00:23: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=7887&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Tue Dec 15 23:23:37 2009
@@ -1,9 +1,9 @@
 # Configured paths for the templates and the database file.
 
-Index: mumble-django-0.12/pyweb/settings.py
+Index: mumble-django-1.0/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
+--- 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
 @@ -20,8 +20,8 @@
  ##                                                             ##
  ##  The path inside the VirtualHost that M-D lives in:         ##
@@ -24,7 +24,7 @@
  ##  Examples:                                                  ##
  #MUMBLE_DJANGO_ROOT = '/srv/mumble-django';                    ##
  #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django';                  ##
-@@ -64,7 +64,7 @@
+@@ -64,14 +64,14 @@
  # 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.
@@ -33,6 +33,15 @@
  
  
  # The default connection string to set for newly created instances.
+ # ICE:
+-#DEFAULT_CONN = 'Meta:tcp -h 127.0.0.1 -p 6502'
++DEFAULT_CONN = 'Meta:tcp -h 127.0.0.1 -p 6502'
+ # DBus:
+-DEFAULT_CONN = 'net.sourceforge.mumble.murmur'
++#DEFAULT_CONN = 'net.sourceforge.mumble.murmur'
+ 
+ # Default email address to send mails from.
+ DEFAULT_FROM_EMAIL = "webmaster at localhost"
 @@ -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!




More information about the Pkg-voip-commits mailing list