[Pkg-jed-commit] r209 - trunk/packages/jed-extra/debian/patches

[Guenter Milde]

Author: milde-guest
Date: 2005-11-21 11:17:20 +0000 (Mon, 21 Nov 2005)
New Revision: 209

Modified:
   trunk/packages/jed-extra/debian/patches/00list
   trunk/packages/jed-extra/debian/patches/41_apsconf-tmp-dir.dpatch
Log:
re-introduced (and modified) patch 41


Modified: trunk/packages/jed-extra/debian/patches/00list
===================================================================
--- trunk/packages/jed-extra/debian/patches/00list	2005-11-18 14:30:38 UTC (rev 208)
+++ trunk/packages/jed-extra/debian/patches/00list	2005-11-21 11:17:20 UTC (rev 209)
@@ -1,4 +1,4 @@
-# 41_apsconf-tmp-dir          # fixed upsream
+41_apsconf-tmp-dir
 50_ispell-fix-requirements
 # 50_rfcview-require-bufutils # no longer in jed-extra (eXotic)
 # 52_yodl-require             # no longer in jed-extra (eXotic)

Modified: trunk/packages/jed-extra/debian/patches/41_apsconf-tmp-dir.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/41_apsconf-tmp-dir.dpatch	2005-11-18 14:30:38 UTC (rev 208)
+++ trunk/packages/jed-extra/debian/patches/41_apsconf-tmp-dir.dpatch	2005-11-21 11:17:20 UTC (rev 209)
@@ -2,7 +2,7 @@
 ## 41_apsconf-tmp-dir.dpatch by Rafael Laboissiere <rafael at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: 2005-11-21 GM: use path_concat() to make the addition of "/" idempotent
 
 @DPATCH@
 
@@ -14,8 +14,8 @@
  
  #ifdef UNIX
 -aps_tmp_dir = "/home/xyz/tmp/";
-+aps_tmp_dir = getenv ("TMPDIR") + "/";
-+if (aps_tmp_dir == "/")
++aps_tmp_dir = path_concat(getenv("TMPDIR"), ""); % ensure trailing "/"
++if (aps_tmp_dir == "")
 +  aps_tmp_dir = "/tmp/";
  a2ps_cmd = "a2ps";
  default_printer = 5;