use upstream paths for rust-gdb, rust-lldb, add debian/not-installed

diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644 (file)
index 0000000..3fca91e
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,9 @@
+# rust-installer stuff, not relevant for Debian
+usr/lib/rustlib/components
+usr/lib/rustlib/install.log
+usr/lib/rustlib/manifest-*
+usr/lib/rustlib/rust-installer-version
+usr/lib/rustlib/uninstall.sh
+
+# docs, we already install into /usr/share/doc/rustc
+usr/share/doc/rust/*

diff --git a/debian/patches/d-rust-gdb-paths b/debian/patches/d-rust-gdb-paths
index c9f62c524017774fb78048e64b2f3a28b1344232..2619efcb63ec1756f6dd30691b6966563721b566 100644 (file)
--- a/debian/patches/d-rust-gdb-paths
+++ b/debian/patches/d-rust-gdb-paths
@@ -6,16 +6,12 @@ Forwarded: not-needed
 
 --- a/src/etc/rust-gdb
 +++ b/src/etc/rust-gdb
-@@ -11,8 +11,10 @@
+@@ -11,7 +11,7 @@
  fi
  
  # Find out where the pretty printer Python module is
 -RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
--GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
-+#RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
-+#GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
-+# We can just hardcode this on Debian, and remove the rustc dependency
-+GDB_PYTHON_MODULE_DIRECTORY="/usr/share/rust-gdb"
++RUSTC_SYSROOT="$(if type "$RUSTC" 2>/dev/null; then "$RUSTC" --print=sysroot; else echo /usr; fi)"
+ GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
  
  # Run GDB with the additional arguments that load the pretty printers
- # Set the environment variable `RUST_GDB` to overwrite the call to a

diff --git a/debian/patches/d-rust-lldb-paths b/debian/patches/d-rust-lldb-paths
index 757062ad2649e2800b409fb808ed526554bb6ebe..4abca08a24d5dbab2015c8785483d3fd090578c1 100644 (file)
--- a/debian/patches/d-rust-lldb-paths
+++ b/debian/patches/d-rust-lldb-paths
@@ -6,8 +6,12 @@ Forwarded: not-needed
 
 --- a/src/etc/rust-lldb
 +++ b/src/etc/rust-lldb
-@@ -10,7 +10,7 @@
- RUSTC_SYSROOT=$(rustc --print sysroot)
+@@ -7,10 +7,10 @@
+ host=$(rustc -vV | sed -n -e 's/^host: //p')
+ 
+ # Find out where to look for the pretty printer Python module
+-RUSTC_SYSROOT=$(rustc --print sysroot)
++RUSTC_SYSROOT="$(if type "$RUSTC" 2>/dev/null; then "$RUSTC" --print=sysroot; else echo /usr; fi)"
  RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
  
 -lldb=lldb
@@ -15,14 +19,3 @@ Forwarded: not-needed
  if [ -f "$RUST_LLDB" ]; then
      lldb="$RUST_LLDB"
  else
-@@ -30,8 +30,8 @@
-     fi
- fi
- 
--script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_lookup.py\""
--commands_file="$RUSTC_SYSROOT/lib/rustlib/etc/lldb_commands"
-+script_import="command script import \"/usr/share/rust-lldb/lldb_lookup.py\""
-+commands_file="/usr/share/rust-lldb/lldb_commands"
- 
- # Call LLDB with the commands added to the argument list
- exec "$lldb" --one-line-before-file "$script_import" --source-before-file "$commands_file" "$@"

diff --git a/debian/rust-gdb.install b/debian/rust-gdb.install
index d2ebb5206d448d74a7753ec01d90432bf468038e..7c1bf5d5dd80619aad34b327b93f63e80706e523 100644 (file)
--- a/debian/rust-gdb.install
+++ b/debian/rust-gdb.install
@@ -1,3 +1,5 @@
-src/etc/rust-gdb usr/bin/
-src/etc/gdb_* usr/share/rust-gdb/
-src/etc/rust_types.py usr/share/rust-gdb/
+usr/bin/rust-gdb
+usr/bin/rust-gdbgui
+usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py
+usr/lib/rustlib/etc/gdb_lookup.py
+usr/lib/rustlib/etc/gdb_providers.py

diff --git a/debian/rust-lldb.install b/debian/rust-lldb.install
index 6ebec380a5986210d5fd8b9955d6ecef805fe6b5..8d5ff5192b5ea878e02493e852f46b7207894b9a 100644 (file)
--- a/debian/rust-lldb.install
+++ b/debian/rust-lldb.install
@@ -1,3 +1,4 @@
-src/etc/rust-lldb usr/bin/
-src/etc/lldb_* usr/share/rust-lldb/
-src/etc/rust_types.py usr/share/rust-lldb/
+usr/bin/rust-lldb
+usr/lib/rustlib/etc/lldb_commands
+usr/lib/rustlib/etc/lldb_lookup.py
+usr/lib/rustlib/etc/lldb_providers.py

diff --git a/debian/rustc.install b/debian/rustc.install
index c289154d7466cd2947886d9dce64b9ffabd872b9..d4440a0ffb9be53a4006aadc49b1f0d002f9ae3c 100644 (file)
--- a/debian/rustc.install
+++ b/debian/rustc.install
@@ -1,3 +1,4 @@
 usr/bin/rustc
 usr/bin/rustdoc
+usr/lib/rustlib/etc/rust_types.py
 debian/architecture.mk usr/share/rustc/