[Pkg-voip-commits] r10187 - in /mumble-django/trunk/debian: apache2.conf changelog python-django-mumble.install

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Sun May 19 16:17:28 2013
New Revision: 10187

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10187
Log:
Adapt apache config to staticfiles change.

Modified:
    mumble-django/trunk/debian/apache2.conf
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/python-django-mumble.install

Modified: mumble-django/trunk/debian/apache2.conf
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/apache2.conf?rev=10187&op=diff
==============================================================================
--- mumble-django/trunk/debian/apache2.conf (original)
+++ mumble-django/trunk/debian/apache2.conf Sun May 19 16:17:28 2013
@@ -1,6 +1,6 @@
+Alias			/mumble-django/mumble/media/		/usr/share/pyshared-data/python-django-mumble/static/mumble/
 Alias			/mumble-django/static/admin/		/usr/share/pyshared/django/contrib/admin/static/admin/
 Alias			/mumble-django/static/			/usr/share/mumble-django/htdocs/
-Alias			/mumble-django/mumble/media/		/usr/share/pyshared-data/python-django-mumble/media/
 
 WSGIScriptAlias         /mumble-django		/usr/share/mumble-django/mumble-django.wsgi
 WSGIDaemonProcess       mumble-django threads=25

Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=10187&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Sun May 19 16:17:28 2013
@@ -9,6 +9,7 @@
     upstream).
   * Disable the registration app for now (incompatible to Django 1.5).
   * Remove dependency to python-simplejson.
+  * Adapt apache config to staticfiles change.
 
  -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 19 May 2013 18:06:11 +0200
 

Modified: mumble-django/trunk/debian/python-django-mumble.install
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/python-django-mumble.install?rev=10187&op=diff
==============================================================================
--- mumble-django/trunk/debian/python-django-mumble.install (original)
+++ mumble-django/trunk/debian/python-django-mumble.install Sun May 19 16:17:28 2013
@@ -13,7 +13,7 @@
 pyweb/mumble/templates/*	/usr/share/python-support/python-django-mumble/mumble/templates
 
 # Static content
-pyweb/mumble/media/*		/usr/share/pyshared-data/python-django-mumble/media
+pyweb/mumble/static/*		/usr/share/pyshared-data/python-django-mumble/static
 
 # Murmur CLI
 pyweb/mucli.py			/usr/share/python-support/python-django-mumble/mumble