[X2Go-Commits] [buildscripts] 01/01: bin/build-deb-package: drop spurious Debian in nightly builds description, add numerical version to release description and use capitalized distro name in all descriptions.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit bffe0a8f2234f9f20151d2a8077dea921c1afc7f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Jul 1 07:41:38 2016 +0200

    bin/build-deb-package: drop spurious Debian in nightly builds description, add numerical version to release description and use capitalized distro name in all descriptions.
---
 bin/build-deb-package |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/build-deb-package b/bin/build-deb-package
index bc78e8c..de63401 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -272,19 +272,22 @@ build_packages() {
 
 				typeset -l numerical_version=""
 				typeset -l -i tmp_ret="1"
+				typeset -l pretty_dist=""
 
 				if [ -n "${l_DIST}" ] && [ "${l_DIST}" = "debian" ]; then
+					pretty_dist="Debian"
 					numerical_version="$("${script_path}/debian-codename-to-version.sh" "${codename}")"
 					tmp_ret="${?}"
 				fi
 
 				if [ -n "${l_DIST}" ] && [ "${l_DIST}" = "ubuntu" ]; then
+					pretty_dist="Ubuntu"
 					numerical_version="$("${script_path}/ubuntu-codename-to-version.sh" "${codename}")"
 					tmp_ret="${?}"
 				fi
 
 				if [ "${tmp_ret}" -ne "0" ]; then
-					echo "Error: unable to map code name \"${codename}\" to Debian or Ubuntu numerical versions. Unknown code name or not applicable to distribution \"${l_DIST}\"? Aborting." >&2
+					echo "Error: unable to map code name \"${codename}\" to Debian or Ubuntu numerical versions. Unknown code name or not applicable to distribution \"${pretty_dist}\"? Aborting." >&2
 					exit 1
 				fi
 
@@ -296,9 +299,9 @@ build_packages() {
 
 				# modify changelog for this build
 				if [ "${COMPONENT}" != "${COMPONENT_NIGHTLY}" ]; then
-					dch --distribution "${codename}" --force-distribution -l "+git${DATE}.${GITREV}+${numerical_version}.${COMPONENT}." "Auto-built ${l_DIST} ${l_CODENAME} (Debian ${numerical_version}) package for ${REPOS_SERVER} repository (Git commit: ${GIT_OBJECT_ID})."
+					dch --distribution "${codename}" --force-distribution -l "+git${DATE}.${GITREV}+${numerical_version}.${COMPONENT}." "Auto-built ${pretty_dist} ${l_CODENAME} (${numerical_version}) package for ${REPOS_SERVER} repository (Git commit: ${GIT_OBJECT_ID})."
 				else
-					dch --distribution "${codename}" --force-distribution -l "~git${DATE}.${GITREV}+${numerical_version}.${COMPONENT}." "Development-Snapshot!!! Auto-built ${l_DIST} ${l_CODENAME} package for ${REPOS_SERVER} repository (Git commit: ${GIT_OBJECT_ID})."
+					dch --distribution "${codename}" --force-distribution -l "~git${DATE}.${GITREV}+${numerical_version}.${COMPONENT}." "Development-Snapshot!!! Auto-built ${pretty_dist} ${l_CODENAME} (${numerical_version}) package for ${REPOS_SERVER} repository (Git commit: ${GIT_OBJECT_ID})."
 				fi
 				mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/"{amd64,i386}
 				OTHERMIRROR=""

--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git