[Pkg-voip-commits] r7861 - in /py-asterisk/trunk/debian/patches: 00list path_join.dpatch

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Thu Dec  3 08:28:51 2009
New Revision: 7861

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7861
Log:
Reformatting Bernd Zeimetz's patch as a dpatch. Not applied.

Added:
    py-asterisk/trunk/debian/patches/path_join.dpatch   (with props)
Modified:
    py-asterisk/trunk/debian/patches/00list

Modified: py-asterisk/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/py-asterisk/trunk/debian/patches/00list?rev=7861&op=diff
==============================================================================
--- py-asterisk/trunk/debian/patches/00list (original)
+++ py-asterisk/trunk/debian/patches/00list Thu Dec  3 08:28:51 2009
@@ -1,3 +1,3 @@
 10_remove_shebang
 11_read_response
-
+#path_join

Added: py-asterisk/trunk/debian/patches/path_join.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/py-asterisk/trunk/debian/patches/path_join.dpatch?rev=7861&op=file
==============================================================================
--- py-asterisk/trunk/debian/patches/path_join.dpatch (added)
+++ py-asterisk/trunk/debian/patches/path_join.dpatch Thu Dec  3 08:28:51 2009
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## path_join.dpatch by Bernd Zeimetz <bzed at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove a pointless '/', to fix #559236 .
+diff --git a/Asterisk/Config.py b/Asterisk/Config.py
+index aeb7dd0..af45d74 100644
+--- a/Asterisk/Config.py
++++ b/Asterisk/Config.py
+@@ -12,8 +12,8 @@ CONFIG_FILENAME = 'py-asterisk.conf'
+ 
+ CONFIG_PATHNAMES = [
+     os.environ.get('PYASTERISK_CONF', ''),
+-    os.path.join(os.environ.get('HOME', ''), '/.py-asterisk.conf'),
+-    os.path.join(os.environ.get('USERPROFILE', ''), '/py-asterisk.conf'),
++    os.path.join(os.environ.get('HOME', ''), '.py-asterisk.conf'),
++    os.path.join(os.environ.get('USERPROFILE', ''), 'py-asterisk.conf'),
+     'py-asterisk.conf',
+     '/etc/py-asterisk.conf',
+     '/etc/asterisk/py-asterisk.conf',

Propchange: py-asterisk/trunk/debian/patches/path_join.dpatch
------------------------------------------------------------------------------
    svn:executable = *