← Back to branch summary

~ubuntu-branches/ubuntu/saucy/mumble-django/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/01-settings.diff

  • Committer: Package Import Robot
  • Author(s): Michael Ziegler
  • Date: 2013-05-19 18:06:11 UTC
  • mfrom: (1.2.6)
  • Revision ID: package-import@ubuntu.com-20130519180611-flqpsk20fu2t6hq4
Tags: 2.9-1
* New upstream release.
* Drop DM-Upload-Allowed as it isn't used any longer.
* Update VCS-{SVN,Browser} tags.
* Update Django dependency to 1.5.
* Remove template patch for django-registration 0.8 (applied upstream).
* Remove the hunk that adds MessageMiddleware to settings.py (applied
  upstream).
* Disable the registration app for now (incompatible to Django 1.5).
* Remove dependency to python-simplejson.
* Adapt apache config to staticfiles change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01-settings.diff
2
2
Forwarded: not-needed
3
3
Author: Michael Ziegler <diese-addy@funzt-halt.net>
4
4
 
5
 
Index: mumble-django-2.7/pyweb/settings.py
 
5
Index: mumble-django-2.9/pyweb/settings.py
6
6
===================================================================
7
 
--- mumble-django-2.7.orig/pyweb/settings.py    2012-03-31 20:21:58.000000000 +0200
8
 
+++ mumble-django-2.7/pyweb/settings.py 2012-06-10 15:32:21.259973015 +0200
 
7
--- mumble-django-2.9.orig/pyweb/settings.py    2013-05-19 18:10:32.043868910 +0200
 
8
+++ mumble-django-2.9/pyweb/settings.py 2013-05-19 18:10:32.039868910 +0200
9
9
@@ -37,8 +37,8 @@
10
10
 ##                                                             ##
11
11
 ##  The path inside the VirtualHost that M-D lives in:         ##
35
35
         'USER':     '',
36
36
         'PASSWORD': '',
37
37
         'HOST':     '',
38
 
@@ -243,6 +243,7 @@
39
 
     'django.middleware.csrf.CsrfViewMiddleware',
40
 
     'django.middleware.locale.LocaleMiddleware',
41
 
     'django.contrib.auth.middleware.AuthenticationMiddleware',
42
 
+    'django.contrib.messages.middleware.MessageMiddleware',
43
 
 )
44
 
 
45
 
 ROOT_URLCONF = 'pyweb.urls'
46
 
@@ -276,7 +277,7 @@
 
38
@@ -271,7 +271,7 @@
47
39
 #TEST_MURMUR_LAB_DIR   = join( dirname(MUMBLE_DJANGO_ROOT), 'murmur' )
48
40
 #TEST_MURMUR_FILES_DIR = join( MUMBLE_DJANGO_ROOT, 'testdata' )
49
41