From: Luca Bruno <lucab@debian.org>
Date: Sat, 26 Nov 2016 23:51:41 +0000 (+0000)
Subject: patches: cleanup spurious backup files
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=609df64ecea96e3f026e7e55adc165102669cd9f;p=rustc.git

patches: cleanup spurious backup files
---

diff --git a/debian/patches/fix-configure-for-deb-arches.patch~ b/debian/patches/fix-configure-for-deb-arches.patch~
deleted file mode 100644
index 7f773ad5f5..0000000000
--- a/debian/patches/fix-configure-for-deb-arches.patch~
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix configure architecture targets for Debian
- Rust upstream sometimes builds for multiple triplets depending on the CPU,
- since it could be valid for multiple triplets. We don't need to do this for
- Debian; each DEB_HOST_ARCH maps to a single triplet. This patch indirectly
- achieves this by setting CFG_{OS,CPU}TYPE to more specific values depending
- on what DEB_HOST_ARCH is, hopefully preventing a multiple build.
- .
- Tested on armhf, untested on armel due to missing build-deps.
-Author: Ximin Luo <infinity0@debian.org>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/configure
-+++ b/configure
-@@ -497,8 +497,19 @@
-         ;;
- 
-     armv7l)
--        CFG_CPUTYPE=arm
--        CFG_OSTYPE="${CFG_OSTYPE}eabihf"
-+        case $DEB_HOST_ARCH in
-+        armhf)
-+            CFG_CPUTYPE=armv7
-+            CFG_OSTYPE="${CFG_OSTYPE}eabihf"
-+           ;;
-+        armel)
-+            CFG_CPUTYPE=arm
-+            CFG_OSTYPE="${CFG_OSTYPE}eabi"
-+           ;;
-+        *)
-+            err "unknown DEB_HOST_ARCH $DEB_HOST_ARCH for armv7l cpu"
-+            ;;
-+        esac
-         ;;
- 
-     aarch64)
diff --git a/debian/patches/use-system-jquery.patch~ b/debian/patches/use-system-jquery.patch~
deleted file mode 100644
index c1053310eb..0000000000
--- a/debian/patches/use-system-jquery.patch~
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/librustdoc/html/render.rs
-+++ b/src/librustdoc/html/render.rs
-@@ -655,8 +655,16 @@
-     // Add all the static files. These may already exist, but we just
-     // overwrite them anyway to make sure that they're fresh and up-to-date.
- 
--    write(cx.dst.join("jquery.js"),
--          include_bytes!("static/jquery-2.1.4.min.js"))?;
-+    {
-+        // In Debian, just copy the system jquery instead.
-+        // If the file gets installed, we can eventually create something like
-+        // dh_rustdoc, similar to dh_sphinxdoc to detect these copies and
-+        // convert them into symlinks.
-+        let jquery_system_path = "/usr/share/javascript/jquery/jquery.min.js";
-+        let jquery = cx.dst.join("jquery.js");
-+        let jquery = jquery.as_path();
-+        try_err!(fs::copy(jquery_system_path, jquery), &jquery);
-+    }
-     write(cx.dst.join("main.js"),
-           include_bytes!("static/main.js"))?;
-     write(cx.dst.join("playpen.js"),