Merging debian version 1.76.0+dfsg1-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 36 deletions

diff --git a/debian/patches/d-bootstrap-install-symlinks.patch b/debian/patches/d-bootstrap-install-symlinks.patch
deleted file mode 100644
index 5e4e125d9..000000000
--- a/debian/patches/d-bootstrap-install-symlinks.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-Date: Thu, 14 Jul 2022 13:17:38 +0200
-Subject: Install symlinks as-is, don't dereference them
-
-Our patch to mdbook installs symlinks to systems versions of font-awesome,
-highlight, etc. Upstream mdbook otherwise doesn't use symlinks, so this
-doesn't affect anything else that's already generated.
----
- src/tools/rust-installer/install-template.sh | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-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
-@@ -617,7 +617,10 @@ install_components() {
- 
-             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"
-@@ -639,7 +642,7 @@ install_components() {
- 
-             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"
- 
-                     # Set permissions. 0755 for dirs, 644 for files