Use --link-from-system from the newer debian-cargo-wrapper

diff --git a/cargo.pm b/cargo.pm
index 2ef814fb1cd7317252030211c11d4e7f75de4378..cf290f2783bed85def85f9606d3baf53ea93e67f 100644 (file)
--- a/cargo.pm
+++ b/cargo.pm
@@ -123,12 +123,7 @@ sub configure {
     my $this=shift;
     doit("cp", $this->get_sourcepath("debian/cargo-checksum.json"),
                $this->get_sourcepath(".cargo-checksum.json"));
-    if (-e "/usr/share/cargo/registry") {
-        doit("ln", "-sfT", "/usr/share/cargo/registry", "debian/cargo_registry");
-    } else {
-        doit("mkdir", "-p", "debian/cargo_registry"); # empty registry
-    }
-    doit("/usr/share/cargo/bin/cargo", "prepare-debian", "debian/cargo_registry");
+    doit("/usr/share/cargo/bin/cargo", "prepare-debian", "debian/cargo_registry", "--link-from-system");
 }
 
 sub test {

diff --git a/debian/changelog b/debian/changelog
index 0cb1b8b2c4778f434ea3295a36081b8b28aa7dcd..c714c7e553ecdb6bddf92b584e3795b244af4f75 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dh-cargo (17) UNRELEASED; urgency=medium
+
+  * Use --link-from-system from the newer debian-cargo-wrapper.
+
+ -- Ximin Luo <infinity0@debian.org>  Wed, 23 Jan 2019 20:27:31 -0800
+
 dh-cargo (16) unstable; urgency=medium
 
   * Make detection of rust_libs in dh-cargo-built-using work again.

diff --git a/debian/control b/debian/control
index d8944eb56ae254ec9b7b8cf852facd16d33d6924..4836b6fd215b21193c2a0cde942a3f2cbf998742 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Package: dh-cargo
 Architecture: all
 Multi-Arch: foreign
 Depends: debhelper (>= 10), ${perl:Depends}, ${misc:Depends},
- cargo (>= 0.31.0-3), python3
+ cargo (>= 0.33.0-1), python3
 Description: debhelper buildsystem for Rust crates using Cargo
  dh-cargo provides a debhelper buildsystem to build Rust crates using Cargo.
  .