From a7cc745ac3cfdea23798cdb8b7ca72d41f8b319c Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Tue, 18 Jun 2019 00:32:17 -0400
Subject: ob-gencontrol: Fix missing "src-" in source package names

---
diff --git a/NEWS b/NEWS
index da67ef1..2ef5f22 100644
--- a/NEWS
+++ b/NEWS
@@ -17,9 +17,8 @@ Utilities:
     standard "-h" option (supported in BusyBox 1.22.0 and later);
     without it, packages with symbolic links won't be fully
     reproducible.
-  * ob-gencontrol now generates source package control files without
-    redundant "Source" fields and with "Binary" and "Build-Depends"
-    fields.
+  * ob-gencontrol now generates source package control files with
+    "Binary" and "Build-Depends" fields.
   * ob-installplatconf now supports platconf directories with upstream
     versions containing pattern matching notation (e.g. "foo_1.*").
     This complies with the latest draft of SPF 2.0.
diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh
index 2e14e6a..e1fffdf 100644
--- a/src/ob-gencontrol.sh
+++ b/src/ob-gencontrol.sh
@@ -77,7 +77,8 @@ gen_control_src()
 	# ob_get_binary_packages().  See comment and code in opkbuild
 	# setup_build().
 	cat >"${binary}.control/control" <<-EOF
-		Package: ${OPK_SOURCE}
+		Package: src-${OPK_SOURCE}
+		Source: ${OPK_SOURCE}
 		Binary:$(printf '%s\n' ${OPK_PACKAGES} | LC_ALL='C' sort | \
 			xargs printf ' %s')
 		Version: ${OPK_SOURCE_VERSION}
diff --git a/tests/exe/ob-gencontrol.sh b/tests/exe/ob-gencontrol.sh
index a6407c1..a619856 100755
--- a/tests/exe/ob-gencontrol.sh
+++ b/tests/exe/ob-gencontrol.sh
@@ -27,7 +27,8 @@ plan_ 12
 OB_DO_SOURCE='true' command_ok_ 'ob-gencontrol source package exit status' -- \
 	ob-gencontrol
 cmd_is 'source package control file' cat 'src-foo.control/control' <<-EOF
-	Package: foo
+	Package: src-foo
+	Source: foo
 	Binary: bar baz-qux foo
 	Version: 1.0-1
 	Architecture: src
--
cgit v0.9.1