Use source versions in built-using fields

diff --git a/debian/changelog b/debian/changelog
index a5d614dc87b14beefac4d1960d5896b98226e230..af0468612076acc86f9007d90b44a005695689de 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dh-cargo (21) UNRELEASED; urgency=medium
+
+  * Use source versions (without rebuild +bX suffixes) in Built-Using.
+    (Closes: #939016)
+
+ -- Ximin Luo <infinity0@debian.org>  Thu, 05 Sep 2019 00:33:36 -0700
+
 dh-cargo (20) unstable; urgency=medium
 
   * Remove Cargo.lock since this prevents us from upgrading stuff.

diff --git a/dh-cargo-built-using b/dh-cargo-built-using
index 1c0a691db15ac37ba2672f6f1f5e2d399054adac..eef2061ab6c33b13267c8b91825ec7992c9aa475 100755 (executable)
--- a/dh-cargo-built-using
+++ b/dh-cargo-built-using
@@ -154,11 +154,12 @@ output() {
                local built_using_x=""
                while read pkg ver srcleft; do
                        local src="$(dpkg-query -f '${source:Package}' --show "$pkg")"
+                       local srcver="$(dpkg-query -f '${source:Version}' --show "$pkg")"
                        case "$srcleft" in
                        2)      exit 1;;
-                       1)      built_using="${built_using}$src (= $ver), ";;
+                       1)      built_using="${built_using}$src (= $srcver), ";;
                        esac
-                       built_using_x="${built_using_x}$src (= $ver), "
+                       built_using_x="${built_using_x}$src (= $srcver), "
                done
                echo "cargo:Built-Using=${built_using%, }" >> "debian/$binpkg.substvars"
                echo "cargo:X-Cargo-Built-Using=${built_using_x%, }" >> "debian/$binpkg.substvars"