[Pkg-voip-commits] r8037 - in /mumble-django/trunk/debian: changelog patches/01-settings.diff patches/series
svedrin-guest at alioth.debian.org
svedrin-guest at alioth.debian.org
Tue Feb 9 15:01:17 UTC 2010
Author: svedrin-guest
Date: Tue Feb 9 15:01:16 2010
New Revision: 8037
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8037
Log:
* New upstream release.
* Remove modification of SLICE_VERSION as it is not necessary anymore.
* Update patches/01-settings.diff to reflect the new settings.py layout.
Modified:
mumble-django/trunk/debian/changelog
mumble-django/trunk/debian/patches/01-settings.diff
mumble-django/trunk/debian/patches/series
Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=8037&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Tue Feb 9 15:01:16 2010
@@ -1,10 +1,10 @@
-mumble-django (1.3-1) UNRELEASED; urgency=low
+mumble-django (1.4-1) UNRELEASED; urgency=low
- * New upstream release for Murmur 1.2.2.
- * Remove modification of SLICE_VERSION as it is set correctly upstream.
- * Bump mumble-server dependency to 1.2.2.
+ * New upstream release.
+ * Remove modification of SLICE_VERSION as it is not necessary anymore.
+ * Update patches/01-settings.diff to reflect the new settings.py layout.
- -- Michael Ziegler <diese-addy at funzt-halt.net> Sun, 07 Feb 2010 16:47:25 +0100
+ -- Michael Ziegler <diese-addy at funzt-halt.net> Tue, 09 Feb 2010 15:58:31 +0100
mumble-django (1.2-2) unstable; urgency=medium
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=8037&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.diff (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Tue Feb 9 15:01:16 2010
@@ -1,39 +1,31 @@
-# Configured paths for the templates and the database file.
+# Configure base URL, installation path and database path.
-Index: mumble-django-1.1/pyweb/settings.py
+Index: mumble-django-1.4/pyweb/settings.py
===================================================================
---- mumble-django-1.1.orig/pyweb/settings.py 2010-01-09 12:27:29.000000000 +0100
-+++ mumble-django-1.1/pyweb/settings.py 2010-01-10 00:30:26.000000000 +0100
-@@ -20,8 +20,8 @@
+--- mumble-django-1.4.orig/pyweb/settings.py 2010-02-09 15:53:18.000000000 +0100
++++ mumble-django-1.4/pyweb/settings.py 2010-02-09 15:54:18.000000000 +0100
+@@ -27,8 +27,8 @@
## ##
## The path inside the VirtualHost that M-D lives in: ##
## ##
--MUMBLE_DJANGO_URL = '/'; ##
--#MUMBLE_DJANGO_URL = '/mumble-django/'; ##
-+#MUMBLE_DJANGO_URL = '/'; ##
-+MUMBLE_DJANGO_URL = '/mumble-django/'; ##
+-MUMBLE_DJANGO_URL = '/' ##
+-#MUMBLE_DJANGO_URL = '/mumble-django/' ##
++#MUMBLE_DJANGO_URL = '/' ##
++MUMBLE_DJANGO_URL = '/mumble-django/' ##
## ##
## Make sure you use a trailing slash! ##
## ##
-@@ -33,7 +33,7 @@
+@@ -40,7 +40,8 @@
## extracted Mumble-Django. ##
## ##
## Default: Auto Detection ##
--MUMBLE_DJANGO_ROOT = None; ##
-+MUMBLE_DJANGO_ROOT = '/usr/share/mumble-django'; ##
+-MUMBLE_DJANGO_ROOT = None ##
++#MUMBLE_DJANGO_ROOT = None ##
++MUMBLE_DJANGO_ROOT = '/usr/share/mumble-django' ##
## Examples: ##
- #MUMBLE_DJANGO_ROOT = '/srv/mumble-django'; ##
- #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django'; ##
-@@ -64,7 +64,7 @@
- # 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.
--SLICE = None
-+SLICE = '/usr/share/slice/Murmur.ice'
-
-
- # The default connection string to set for newly created instances.
-@@ -105,7 +105,7 @@
+ #MUMBLE_DJANGO_ROOT = '/srv/mumble-django' ##
+ #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django' ##
+@@ -97,7 +98,7 @@
# Database settings for Mumble-Django's database. These do NOT need to point to Murmur's database,
# Mumble-Django should use its own!
DATABASE_ENGINE = 'sqlite3'
Modified: mumble-django/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/series?rev=8037&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/series (original)
+++ mumble-django/trunk/debian/patches/series Tue Feb 9 15:01:16 2010
@@ -1,3 +1,4 @@
+01-settings.diff
01-settings.diff
02-munin.diff
03-genkey-follow-symlink.diff
More information about the Pkg-voip-commits
mailing list