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

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Sun Nov 28 13:37:53 2010
New Revision: 8673

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8673
Log:
Adapt various paths to upstream refactoring.

Modified:
    mumble-django/trunk/debian/apache2.conf
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/mumble-django.install
    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=8673&op=diff
==============================================================================
--- mumble-django/trunk/debian/apache2.conf (original)
+++ mumble-django/trunk/debian/apache2.conf Sun Nov 28 13:37:53 2010
@@ -1,5 +1,6 @@
-Alias			/mumble-django/static/	/usr/share/mumble-django/htdocs/
-Alias			/mumble-django/media/	/usr/share/pyshared/django/contrib/admin/media/
+Alias			/mumble-django/static/			/usr/share/mumble-django/htdocs/
+Alias			/mumble-django/media/			/usr/share/pyshared/django/contrib/admin/media/
+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=8673&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Sun Nov 28 13:37:53 2010
@@ -5,8 +5,9 @@
   * Add suggestion to python-qrencode.
   * Set Django dependency to = 1.2 to prevent issues with future releases.
   * Refresh line numbers in 01-settings.patch.
-
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 28 Nov 2010 14:35:45 +0100
+  * Adapt various paths to upstream refactoring.
+
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 28 Nov 2010 14:37:12 +0100
 
 mumble-django (2.3-1) unstable; urgency=low
 

Modified: mumble-django/trunk/debian/mumble-django.install
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django.install?rev=8673&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django.install (original)
+++ mumble-django/trunk/debian/mumble-django.install Sun Nov 28 13:37:53 2010
@@ -10,6 +10,8 @@
 # static content
 htdocs/*.css			/usr/share/mumble-django/htdocs/
 htdocs/*.js			/usr/share/mumble-django/htdocs/
+htdocs/*.png			/usr/share/mumble-django/htdocs/
+htdocs/ext-3.2.0		/usr/share/mumble-django/htdocs/
 
 # templates
 pyweb/templates/*	 	/usr/share/mumble-django/pyweb/templates

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=8673&op=diff
==============================================================================
--- mumble-django/trunk/debian/python-django-mumble.install (original)
+++ mumble-django/trunk/debian/python-django-mumble.install Sun Nov 28 13:37:53 2010
@@ -13,7 +13,7 @@
 pyweb/mumble/templates/*	/usr/share/python-support/python-django-mumble/mumble/templates
 
 # Static content
-htdocs/mumble/*			/usr/share/pyshared-data/python-django-mumble/htdocs/mumble
+pyweb/mumble/media/*		/usr/share/pyshared-data/python-django-mumble/media
 
 # Murmur CLI
 pyweb/mucli.py			/usr/share/python-support/python-django-mumble/mumble