[Pkg-voip-commits] r7855 - in /mumble-django/trunk/debian: changelog patches/02-munin.diff

[pmatthaei at alioth.debian.org]

Author: pmatthaei
Date: Wed Dec  2 18:06:51 2009
New Revision: 7855

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7855
Log:
* Rediff hunky 02-munin.diff patch.

Modified:
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/patches/02-munin.diff

Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=7855&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Wed Dec  2 18:06:51 2009
@@ -5,6 +5,7 @@
   * Wrap long dependency lines in debian/control.
   * Bump dependency on mumble-server to 1.2.0~beta1.
   * Depend on python-django-mumble with >= ${source:Version}.
+  * Rediff hunky 02-munin.diff patch.
 
   [ Michael Ziegler ]
   * New upstream release v0.12.
@@ -12,7 +13,7 @@
   * Update 01-settings.diff to set SLICE_VERSION to 1.2.0.
   * Add a dbshell option to mumble-django-configure.
 
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Wed, 02 Dec 2009 15:21:20 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 02 Dec 2009 19:06:06 +0100
 
 mumble-django (0.11-2) unstable; urgency=low
 

Modified: mumble-django/trunk/debian/patches/02-munin.diff
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/02-munin.diff?rev=7855&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/02-munin.diff (original)
+++ mumble-django/trunk/debian/patches/02-munin.diff Wed Dec  2 18:06:51 2009
@@ -1,10 +1,10 @@
 # Sets /usr/share/mumble-django as MUMBLE_DJANGO_ROOT path in munin.py.
 # This is merely a precaution...
 
-diff -urNad mumble-django-0.8~/munin.py mumble-django-0.8/munin.py
---- mumble-django-0.8~/munin.py	2009-07-11 14:51:15.000000000 +0200
-+++ mumble-django-0.8/munin.py	2009-07-11 16:15:25.113522493 +0200
-@@ -15,7 +15,7 @@
+diff -Naur mumble-django-0.12.orig/munin.py mumble-django-0.12/munin.py
+--- mumble-django-0.12.orig/munin.py	2009-11-29 13:32:19.000000000 +0100
++++ mumble-django-0.12/munin.py	2009-12-02 19:03:09.000000000 +0100
+@@ -16,7 +16,7 @@
  """
  
  # Set this to the same path you used in settings.py, or None for auto-detection.