Merge ~dbungert/curtin:build-deb-dch into curtin:master

[Dan Bungert]

build-deb: changelog gen with dch

* primary reason for this is to generate the changelog with a real
  DEBNAME/DEBEMAIL
* remove template debian/changelog.trunk
* assume debian version 0ubuntu1
* let dch manage the changelog file

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:900dc530a317577549b711f151018d4e67421f54
https://jenkins.ubuntu.com/server/job/curtin-ci/214/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/214/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/214/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/214/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/214/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/214//rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:900dc530a317577549b711f151018d4e67421f54
https://jenkins.ubuntu.com/server/job/curtin-ci/215/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/215/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/215/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/215/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/215/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/215//rebuild

review: Needs Fixing (continuous-integration)

[Olivier Gayot (ogayot)]

Hello,

A few observations on the code itself. Nothing serious.

also, there are other places where the changelog.trunk is mentioned, maybe we should update:
* if [ ! -d "$dir" ]; then
    # make-tarball will create the directory name based on the
    # contents of debian/changelog.trunk in the version provided.

* echo "WARNING: git at '${uver}' had different version"
        echo " in debian/changelog.trunk than your tree. version there"
        echo " is '$d' working directory had $uver"

Thanks,
Olivier

review: Needs Fixing

1d96c58... by Dan Bungert on 2022-01-05

build-deb: address feedback

* quoted variables are safer in case RELEASE or uver are set weirdly
* remove more references to changelog.trunk
* remove some more logic looking at the tarball, it's OK to have this
  handle snapshots
* fix zero-arg usage

ea4cca6... by Dan Bungert on 2022-01-05

build-deb: change default to signed files

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:058f37941883b66540eec1a22dbe3454b0d3b0ff
https://jenkins.ubuntu.com/server/job/curtin-ci/217/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/217/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/217/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/217/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/217/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/217//rebuild

review: Needs Fixing (continuous-integration)

[Olivier Gayot (ogayot)]

review: Approve

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:058f37941883b66540eec1a22dbe3454b0d3b0ff
https://jenkins.ubuntu.com/server/job/curtin-ci/221/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/221/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/221/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/221/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/221/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/221//rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:ea4cca677245ea6cb68ea0fda24e1a0a7416592f
https://jenkins.ubuntu.com/server/job/curtin-ci/222/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/222/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/222/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/222/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/222/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/222//rebuild

review: Approve (continuous-integration)

diff --git a/debian/changelog.trunk b/debian/changelog.trunk
deleted file mode 100644
index 4d943c0..0000000
--- a/debian/changelog.trunk
+++ /dev/null
@@ -1,5 +0,0 @@
-curtin (UPSTREAM_VER-0ubuntu1) UNRELEASED; urgency=low
-
-  * Initial release
-
- -- Scott Moser <[e-mail]>  Mon, 29 Jul 2013 16:12:09 -0400
diff --git a/tools/build-deb b/tools/build-deb
index dbe364f..85868d7 100755
--- a/tools/build-deb
+++ b/tools/build-deb
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
-set -e
+set -eu
 
 sourcename="curtin"
 TEMP_D=""
@@ -13,7 +13,7 @@ cleanup() {
    [ -z "$TEMP_D" ] || rm -Rf "$TEMP_D"
 }
 
-if [ "$1" = "-h" -o "$1" = "--help" ]; then
+if [ "${1:-}" = "-h" -o "${1:-}" = "--help" ]; then
    cat <<EOF
 Usage: ${0##*/}
    build a deb of from trunk directory
@@ -36,19 +36,13 @@ top_d=$(cd "$(dirname "${0}")"/.. && pwd)
 ref=HEAD
 
 if [ $# -eq 0 ]; then
-   # if no opts given, build source, without depends, and not signed.
-   set -- -S -d -us -uc
+   # if no opts given, build source, without depends.
+   set -- -S -d
 fi
 
-# grab the first line in the changelog
-# hopefully this pulls the version info there
-# resulting in something like: UPSTREAM_VER-0ubuntu1
-clogver_o=$(sed -n '1s,.*(\([^)]*\)).*,\1,p' debian/changelog.trunk)
-
 # uver gets 17.1-3-gc85e2562 '17.1' if this is a tag.
 uver=$(git describe --long --abbrev=8 "--match=[0-9][0-9]*" "$ref")
-clogver_debian=${clogver_o##*-}
-clogver_new="${uver}-${clogver_debian}"
+clogver_new="${uver}-0ubuntu1"
 
 # uver_base_rel rel gets '17.1'
 uver_base_rel=${uver%%-*}
@@ -60,7 +54,7 @@ TEMP_D=$(mktemp -d "${TMPDIR:-/tmp}/${bname}.XXXXXX")
 
 trap cleanup EXIT
 
-echo "building version ${uver}, debian_ver=${clogver_debian}"
+echo "building version ${uver}"
 
 dir="${sourcename}-$uver"
 tarball="${sourcename}_$uver.orig.tar.gz"
@@ -73,38 +67,13 @@ cd "${TEMP_D}"
 tar xzf "$tarball" || fail "failed extract tarball"
 
 if [ ! -d "$dir" ]; then
-    # make-tarball will create the directory name based on the
-    # contents of debian/changelog.trunk in the version provided.
-    # if that differs from what is here, then user has changes.
-    for d in ${sourcename}*; do
-        [ -d "$d" ] && break
-    done
-    if [ -d "$d" ]; then
-        {
-        echo "WARNING: git at '${uver}' had different version"
-        echo "  in debian/changelog.trunk than your tree. version there"
-        echo "  is '$d' working directory had $uver"
-        } 1>&2
-        dir=$d
-    else
-        echo "did not find a directory created by make-tarball. sorry." 1>&2
-        exit
-    fi
+    echo "did not find a directory created by make-tarball. sorry." 1>&2
+    exit
 fi
 cd "$dir" || fail "failed cd $dir"
 
-# move files ending in .trunk to name without .trunk
-# ie, this copies debian/changelog.trunk to debian/changelog
-for f in debian/*.trunk; do
-   mv "$f" "${f%.trunk}"
-done
-
-# first line of debian/changelog looks like
-#   curtin (<version>) UNRELEASED; urgency=low
-# fix the version and UNRELEASED
-sed -i -e "1s,([^)]*),(${clogver_new})," \
-       -e "1s,UNRELEASED,${RELEASE}," debian/changelog ||
-   fail "failed to write debian/changelog"
+dch --create --package curtin --newversion "$clogver_new" \
+    --distribution "$RELEASE" "Development release"
 debuild "$@" || fail "debuild failed"
 
 cd "$TEMP_D"