Use source package names in *Built-Using

diff --git a/debian/changelog b/debian/changelog
index 4bfd2794273b1fbbc90e334459c9a781da45d648..d9b81da34475eded4c9bcd1fb716e0eee246f331 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dh-cargo (15) UNRELEASED; urgency=medium
+
+  * Use source package names in *Built-Using.
+
+ -- Ximin Luo <infinity0@debian.org>  Sun, 20 Jan 2019 17:32:54 -0800
+
 dh-cargo (14) unstable; urgency=medium
 
   * Use absolute path when dpkg-searching for libs.

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