r86 - in trunk: . patches

[Martin Michlmayr]

Author: tbm
Date: 2005-11-04 13:51:15 +0000 (Fri, 04 Nov 2005)
New Revision: 86

Added:
   trunk/patches/09_fix_wrong_relpath.dpatch
Modified:
   trunk/changelog
   trunk/patches/00list
Log:
Don't produce broken links with linkRelative when the source and target
directories start with the same letter.  Closes: #334088.


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2005-10-15 19:50:37 UTC (rev 85)
+++ trunk/changelog	2005-11-04 13:51:15 UTC (rev 86)
@@ -4,6 +4,8 @@
   * debian/README.Debian: Remove the paragraph about the situation of
     bins-edit-gui and "Suggests" since the packages have been upgraded
     to "Recommends" in 1.1.29-3.
+  * Don't produce broken links with linkRelative when the source and
+    target directories start with the same letter.  Closes: #334088.
 
  -- Martin Michlmayr <tbm at cyrius.com>  Sat, 15 Oct 2005 20:49:21 +0100
 

Modified: trunk/patches/00list
===================================================================
--- trunk/patches/00list	2005-10-15 19:50:37 UTC (rev 85)
+++ trunk/patches/00list	2005-11-04 13:51:15 UTC (rev 86)
@@ -3,3 +3,4 @@
 06_doc_bins.sgml
 07_fix_share
 08_fix_bins-edit-gui_encoding
+09_fix_wrong_relpath

Added: trunk/patches/09_fix_wrong_relpath.dpatch
===================================================================
--- trunk/patches/09_fix_wrong_relpath.dpatch	2005-10-15 19:50:37 UTC (rev 85)
+++ trunk/patches/09_fix_wrong_relpath.dpatch	2005-11-04 13:51:15 UTC (rev 86)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_fix_wrong_relpath.dpatch by Martin Michlmayr <tbm at cyrius.com>
+##
+## DP: Fix a off by one in relpath() [#334088]
+
+ at DPATCH@
+--- bins.orig/bins	2005-10-15 16:02:07.000000000 +0100
++++ bins.new/bins	2005-11-04 13:40:29.000000000 +0000
+@@ -1151,7 +1151,7 @@
+     my $l2 = length($p2);
+ 
+     my $cl = cls($p1, $p2);
+-
++    $cl-- if (substr($p2, $cl-1, 1) ne "/");
+     my $p2r = substr( $p2, $cl, $l2);
+ 
+     my $p1dc = 0;