[Pkg-voip-commits] r8035 - in /mumble/trunk/debian: changelog control mumble-server-web.conf

[thorvald at alioth.debian.org]

Author: thorvald
Date: Tue Feb  9 13:49:06 2010
New Revision: 8035

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8035
Log:
* Move mumble-server's Recommends: of mumble-server-web to Suggests: and
  remove the Suggests: of mumble.
* Remove cgi config in mumble-server-web.conf as we no longer ship cgi
  files.

Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/control
    mumble/trunk/debian/mumble-server-web.conf

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=8035&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Tue Feb  9 13:49:06 2010
@@ -2,6 +2,10 @@
 
   * Remove DM-Upload-Allowed, all uploaders are now DD. (Yay!)
   * Fix my email address in Uploaders:
+  * Move mumble-server's Recommends: of mumble-server-web to Suggests: and
+    remove the Suggests: of mumble.
+  * Remove cgi config in mumble-server-web.conf as we no longer ship cgi
+    files.
 
  -- Thorvald Natvig <thorvald at debian.org>  Mon, 08 Feb 2010 20:03:25 +0100
 

Modified: mumble/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/control?rev=8035&op=diff
==============================================================================
--- mumble/trunk/debian/control (original)
+++ mumble/trunk/debian/control Tue Feb  9 13:49:06 2010
@@ -53,8 +53,7 @@
 Package: mumble-server
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, dbus, libqt4-sql-sqlite
-Recommends: mumble-server-web
-Suggests: mumble, mumble-django
+Suggests: mumble-server-web, mumble-django
 Description: Low latency VoIP server
  Murmur is the VoIP server component for Mumble. Murmur is installed
  in a system-wide fashion, but can also be run by individual users.

Modified: mumble/trunk/debian/mumble-server-web.conf
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server-web.conf?rev=8035&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server-web.conf (original)
+++ mumble/trunk/debian/mumble-server-web.conf Tue Feb  9 13:49:06 2010
@@ -1,9 +1,8 @@
 Alias /mumble-server/ /usr/share/mumble-server-web/www/
 <Directory /usr/share/mumble-server-web/www/>
-	Options ExecCGI FollowSymLinks
+	Options FollowSymLinks
 	AllowOverride None
 	DirectoryIndex index.php
-	AddHandler cgi-script .cgi
 	Order allow,deny
 	Allow from all
 </Directory>