From dc643d4b030243790ccb704c733ca2130279cbaf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 05:57:28 +0200 Subject: Adding debian version 1.72.1+dfsg1-1. Signed-off-by: Daniel Baumann --- debian/patches/d-bootstrap-install-symlinks.patch | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'debian/patches/d-bootstrap-install-symlinks.patch') diff --git a/debian/patches/d-bootstrap-install-symlinks.patch b/debian/patches/d-bootstrap-install-symlinks.patch index 00f84e0c7..5e4e125d9 100644 --- a/debian/patches/d-bootstrap-install-symlinks.patch +++ b/debian/patches/d-bootstrap-install-symlinks.patch @@ -13,24 +13,24 @@ Index: rust/src/tools/rust-installer/install-template.sh =================================================================== --- rust.orig/src/tools/rust-installer/install-template.sh +++ rust/src/tools/rust-installer/install-template.sh -@@ -616,7 +616,10 @@ install_components() { +@@ -617,7 +617,10 @@ install_components() { - maybe_backup_path "$_file_install_path" + maybe_backup_path "$_file_install_path" -- if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" -+ if [ -h "$_src_dir/$_component/$_file" ] -+ then -+ run cp -d "$_src_dir/$_component/$_file" "$_file_install_path" -+ elif echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" - then - run cp "$_src_dir/$_component/$_file" "$_file_install_path" - run chmod 755 "$_file_install_path" -@@ -638,7 +641,7 @@ install_components() { +- if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" ++ if [ -h "$_src_dir/$_component/$_file" ] ++ then ++ run cp -d "$_src_dir/$_component/$_file" "$_file_install_path" ++ elif echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" + then + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 755 "$_file_install_path" +@@ -639,7 +642,7 @@ install_components() { - maybe_backup_path "$_file_install_path" + maybe_backup_path "$_file_install_path" -- run cp -R "$_src_dir/$_component/$_file" "$_file_install_path" -+ run cp -dR "$_src_dir/$_component/$_file" "$_file_install_path" - critical_need_ok "failed to copy directory" +- run cp -R "$_src_dir/$_component/$_file" "$_file_install_path" ++ run cp -dR "$_src_dir/$_component/$_file" "$_file_install_path" + critical_need_ok "failed to copy directory" # Set permissions. 0755 for dirs, 644 for files -- cgit v1.2.3