[Pkg-voip-commits] r7550 - in /mumble-django/trunk/debian: changelog control mumble-django.install

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Tue Sep  1 15:13:13 2009
New Revision: 7550

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7550
Log:
* New upstream release.
* Update apache2.conf to not create a complete VirtualHost anymore.

Modified:
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/control
    mumble-django/trunk/debian/mumble-django.install

Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=7550&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Tue Sep  1 15:13:13 2009
@@ -1,3 +1,10 @@
+mumble-django (0.10-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Update apache2.conf to not create a complete VirtualHost anymore.
+
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Tue, 01 Sep 2009 12:07:10 +0200
+
 mumble-django (0.9-2) unstable; urgency=low
 
   [ Patrick Matthäi ]

Modified: mumble-django/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/control?rev=7550&op=diff
==============================================================================
--- mumble-django/trunk/debian/control (original)
+++ mumble-django/trunk/debian/control Tue Sep  1 15:13:13 2009
@@ -14,7 +14,7 @@
 Package: python-django-mumble
 Architecture: all
 Suggests: mumble-django
-Depends: ${misc:Depends}, ${python:Depends}, python-dbus (>= 0.82.4), python-django (>= 1.0), python-imaging (>=1.1.6), mumble-server (>= 1.1.8)
+Depends: ${misc:Depends}, ${python:Depends}, python-dbus (>= 0.82.4), python-django (>= 1.1), python-imaging (>=1.1.6), python-simplejson, mumble-server (>= 1.1.8)
 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,
@@ -30,9 +30,8 @@
 
 Package: mumble-django
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-django (>= 1.0), libapache2-mod-wsgi (>= 2.3), python-django-registration (>= 0.7), python-django-mumble (>= 0.9)
+Depends: ${misc:Depends}, ${python:Depends}, libapache2-mod-wsgi (>= 2.3), python-django-registration (>= 0.7), python-django-mumble (>= 0.10)
 Suggests: munin-node
-Conflicts: mumble-server-web (< 1.2.0)
 Description: A Mumble-Server web interface
  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/mumble-django.install
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django.install?rev=7550&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django.install (original)
+++ mumble-django/trunk/debian/mumble-django.install Tue Sep  1 15:13:13 2009
@@ -1,8 +1,10 @@
 # Python code
 pyweb/*.py		/usr/share/mumble-django/pyweb
+pyweb/gen_secret_key.sh	/usr/share/mumble-django/pyweb
 
 # static content
 htdocs/*.css		/usr/share/mumble-django/htdocs/
+htdocs/*.js		/usr/share/mumble-django/htdocs/
 htdocs/ext-2.2/*	/usr/share/mumble-django/htdocs/ext-2.2
 
 # templates