svn2cl commit: r181 - in debian/svn2cl/trunk/debian: . patches

[Commits of the svn2cl project <svn2cl-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sun Apr  9 15:09:58 2023
New Revision: 181
URL: http://arthurdejong.org/viewvc/svn2cl?revision=181&view=revision

Log:
Add usrmerge-fix.patch to fix usrmerge problem (closes: 1033919)

Added:
   debian/svn2cl/trunk/debian/patches/
   debian/svn2cl/trunk/debian/patches/series
   debian/svn2cl/trunk/debian/patches/usrmerge-fix.patch
Modified:
   debian/svn2cl/trunk/debian/changelog

Modified: debian/svn2cl/trunk/debian/changelog
==============================================================================
--- debian/svn2cl/trunk/debian/changelog        Sun Apr  9 14:40:12 2023        
(r180)
+++ debian/svn2cl/trunk/debian/changelog        Sun Apr  9 15:09:58 2023        
(r181)
@@ -5,8 +5,9 @@
   * Update debhelper compatibility level to 13
   * Specify Rules-Requires-Root: no
   * Upgrade to standards-version 4.6.2 (no changes needed)
+  * Add usrmerge-fix.patch to fix usrmerge problem (closes: 1033919)
 
- -- Arthur de Jong <adejong@debian.org>  Sun, 09 Apr 2023 13:50:58 +0200
+ -- Arthur de Jong <adejong@debian.org>  Sun, 09 Apr 2023 15:06:36 +0200
 
 svn2cl (0.14-2) unstable; urgency=low
 

Added: debian/svn2cl/trunk/debian/patches/series
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ debian/svn2cl/trunk/debian/patches/series   Sun Apr  9 15:09:58 2023        
(r181)
@@ -0,0 +1 @@
+usrmerge-fix.patch

Added: debian/svn2cl/trunk/debian/patches/usrmerge-fix.patch
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ debian/svn2cl/trunk/debian/patches/usrmerge-fix.patch       Sun Apr  9 
15:09:58 2023        (r181)
@@ -0,0 +1,36 @@
+Description: Fix symlink detection logic to support directory symlinks
+ This mitigates the problem if the script is invoked as `/bin/svn2cl`.
+ In Bookworm – with usrmege – is this the case.
+Author: Arthur de Jong <arthur@arthurdejong.org>
+Origin: upstream, 
https://arthurdejong.org/viewvc/svn2cl/svn2cl/svn2cl.sh?pathrev=180&r1=180&r2=179
+Bug-Debian: http://bugs.debian.org/1033919
+--- a/svn2cl.sh
++++ b/svn2cl.sh
+@@ -270,14 +270,20 @@ do
+ done
+ 
+ # find the directory that this script resides in
+-prog="$0"
+-while [ -h "$prog" ]
+-do
++if [ -x `which readlink` ]
++then
++  prog="$(readlink -f "$0")"
++  dir="$(dirname "$prog")"
++else
++  prog="$0"
++  while [ -h "$prog" ]
++  do
++    dir=`dirname "$prog"`
++    prog=`ls -ld "$prog" | sed "s/^.*-> \(.*\)/\1/;/^[^/]/s,^,$dir/,"`
++  done
+   dir=`dirname "$prog"`
+-  prog=`ls -ld "$prog" | sed "s/^.*-> \(.*\)/\1/;/^[^/]/s,^,$dir/,"`
+-done
+-dir=`dirname "$prog"`
+-dir=`cd "$dir" && pwd`
++  dir=`cd "$dir" && pwd`
++fi
+ XSL="$dir/svn2${OUTSTYLE}.xsl"
+ 
+ # check if the authors file is formatted as a legacy