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

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Sat Jan  9 23:22:47 2010
New Revision: 7949

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7949
Log:
Change Murmur version setting and dependency to 1.2.1.

Modified:
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/control
    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=7949&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Sat Jan  9 23:22:47 2010
@@ -5,8 +5,9 @@
   * Add "Enhances: mumble-server-web" to mumble-django.
   * Replace dependency to python-dbus by python-zeroc-ice
   * Remove the patch for the registration bug added in 1.0-1 (fixed upstream).
+  * Change Murmur version setting and dependency to 1.2.1.
 
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 10 Jan 2010 00:14:12 +0100
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 10 Jan 2010 00:22:08 +0100
 
 mumble-django (1.0-1) unstable; urgency=medium
 

Modified: mumble-django/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/control?rev=7949&op=diff
==============================================================================
--- mumble-django/trunk/debian/control (original)
+++ mumble-django/trunk/debian/control Sat Jan  9 23:22:47 2010
@@ -16,7 +16,7 @@
 Suggests: mumble-django
 Depends: ${misc:Depends}, ${python:Depends}, python-zeroc-ice (>= 3.3.1),
  python-django (>= 1.1), python-imaging (>= 1.1.6), python-simplejson,
- mumble-server (>= 1.2.0)
+ mumble-server (>= 1.2.1)
 Description: A Mumble-Server config application for Django
  mumble-django is a Django web interface application that configures a
  Murmur server. It is able to create and remove vservers, start/stop them,

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=7949&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Sat Jan  9 23:22:47 2010
@@ -24,7 +24,7 @@
  ##  Examples:                                                  ##
  #MUMBLE_DJANGO_ROOT = '/srv/mumble-django';                    ##
  #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django';                  ##
-@@ -64,14 +64,14 @@
+@@ -64,6 +64,6 @@
  # 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.
@@ -32,16 +32,6 @@
 +SLICE = '/usr/share/slice/Murmur.ice'
  
  
- # 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!