[Pkg-voip-commits] r7641 - in /mumble-django/trunk/debian: changelog mumble-django.postinst patches/00list patches/03-genkey-follow-symlink.dpatch

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Fri Sep 25 21:29:57 2009
New Revision: 7641

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7641
Log:
Patch gen_secret_key.sh to follow symlinks.

Added:
    mumble-django/trunk/debian/patches/03-genkey-follow-symlink.dpatch   (with props)
Modified:
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/mumble-django.postinst
    mumble-django/trunk/debian/patches/00list

Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=7641&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Fri Sep 25 21:29:57 2009
@@ -5,8 +5,9 @@
   * Change mumble-django-configure to run the checkenv command.
   * Change URL in debian/watch to match the new URLs on BitBucket.
   * Install settings.py to /etc/mumble-django.
+  * Patch gen_secret_key.sh to follow symlinks.
 
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Fri, 25 Sep 2009 23:15:49 +0200
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Fri, 25 Sep 2009 23:29:23 +0200
 
 mumble-django (0.10-2) unstable; urgency=medium
 

Modified: mumble-django/trunk/debian/mumble-django.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django.postinst?rev=7641&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django.postinst (original)
+++ mumble-django/trunk/debian/mumble-django.postinst Fri Sep 25 21:29:57 2009
@@ -9,7 +9,7 @@
 	
 	cd /usr/share/mumble-django/pyweb
 	./gen_secret_key.sh
-	rm settings.pye
+	rm -f /etc/mumble-django/settings.pye
 	
 	invoke-rc.d --quiet apache2 reload
 	if [ -x /etc/init.d/munin-node ]; then

Modified: mumble-django/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/00list?rev=7641&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/00list (original)
+++ mumble-django/trunk/debian/patches/00list Fri Sep 25 21:29:57 2009
@@ -1,2 +1,3 @@
 01-settings.dpatch
 02-munin.dpatch
+03-genkey-follow-symlink.dpatch

Added: mumble-django/trunk/debian/patches/03-genkey-follow-symlink.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/03-genkey-follow-symlink.dpatch?rev=7641&op=file
==============================================================================
--- mumble-django/trunk/debian/patches/03-genkey-follow-symlink.dpatch (added)
+++ mumble-django/trunk/debian/patches/03-genkey-follow-symlink.dpatch Fri Sep 25 21:29:57 2009
@@ -1,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03-genkey-follow-symlink.dpatch by  <Michael Ziegler <diese-addy at funzt-halt.net>>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mumble-django-0.11~/pyweb/gen_secret_key.sh mumble-django-0.11/pyweb/gen_secret_key.sh
+--- mumble-django-0.11~/pyweb/gen_secret_key.sh	2009-09-25 22:44:58.000000000 +0200
++++ mumble-django-0.11/pyweb/gen_secret_key.sh	2009-09-25 23:24:28.140962908 +0200
+@@ -23,4 +23,4 @@
+ KEY=` dd if=/dev/urandom bs=64 count=1 2>/dev/null | python -c "$HASHSCRIPT" `
+ SECKEY="SECRET_KEY = '$KEY'"
+ 
+-sed -ie "s/^SECRET_KEY.*/${SECKEY}/" settings.py
++sed --follow-symlinks -ie "s/^SECRET_KEY.*/${SECKEY}/" settings.py

Propchange: mumble-django/trunk/debian/patches/03-genkey-follow-symlink.dpatch
------------------------------------------------------------------------------
    svn:executable = *