This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from 3dd8be6 home/.pbuilderrc: raise memory limit per VM to 2GB. new aa62d52 bin/build-deb-package: update copyright value. new 1d7b2ee bin: new script debian-codename-to-version.sh to map Debian code names to numerical versions. new 367b47d bin/build-deb-package: use numerical Debian version in package version string. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/build-deb-package | 17 ++++---- bin/debian-codename-to-version.sh | 81 +++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 8 deletions(-) create mode 100755 bin/debian-codename-to-version.sh -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit aa62d52b563d47d92d3dff2beb145d7ff1deb3bc Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jun 27 00:25:27 2016 +0200 bin/build-deb-package: update copyright value. --- bin/build-deb-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build-deb-package b/bin/build-deb-package index c374703..616c151 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -1,7 +1,7 @@ #!/bin/bash # Copyright (C) 2011-2013 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2015 by Mihai Moldovan <ionic@ionic.de> +# Copyright (C) 2015-2016 by Mihai Moldovan <ionic@ionic.de> # # This programme is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 1d7b2ee2c4f608f4b433191c1fb5c6f55d5f69a2 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jun 27 00:26:15 2016 +0200 bin: new script debian-codename-to-version.sh to map Debian code names to numerical versions. --- bin/debian-codename-to-version.sh | 81 +++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/bin/debian-codename-to-version.sh b/bin/debian-codename-to-version.sh new file mode 100755 index 0000000..327a32f --- /dev/null +++ b/bin/debian-codename-to-version.sh @@ -0,0 +1,81 @@ +#!/bin/bash + +# Copyright (C) 2016 by Mihai Moldovan <ionic@ionic.de> +# +# This programme is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This programme is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +export PATH="${HOME}/bin:${PATH}" + +# ${CDPATH} could lead to some very nasty problems. Better unset it. +unset CDPATH + +# Takes a pseudo-boolean string representation and converts it into +# either 0 or 1. +# The result is printed as a string without a trailing newline. +# The return code is either 0, iff mapping was successful, +# or 1 if the codename is unknown and mapping failed. + +typeset -l codename +codename="${1:?"No code name provided."}" + +typeset -l -i ret="0" + +case "${codename}" in + # The first version number is actually "fake", + # but given it's a rolling release, + # we can't really do better here. + ("sid"|"unstable") echo "9999";; + + # FIXME: add "testing" - but how? It's not really + # a stable release on its own, but a rolling + # release (see sid/unstable above). Yet, it differs + # from sid/unstable by not having one unique + # code name, but a floating one of the next + # stable release. We know the new release number + # beforehand, but mapping "testing" to the + # upcoming version number means that "testing"s + # version number itself would be floating, creating + # problems after each new release and requiring an + # update. On the other hand, giving "testing" a + # fixed version number such as "999" (smaller than + # "unstable"s, yet bigger than anything we encountered + # so far) would create an inconsistency: + # The "testing" code name would have a different + # version number than the code-name-to-be-released- + # next. + # For now and due to the aforementioned problems, + # I decided to not handle the "testing" code name + # at all. + ("stretch") echo "9";; + + ("jessie") echo "8";; + ("wheezy") echo "7";; + ("squeeze") echo "6";; + ("lenny") echo "5";; + ("etch") echo "4";; + ("sarge") echo "3.1";; + ("woody") echo "3.0";; + ("potato") echo "2.2";; + ("slink") echo "2.1";; + ("hamm") echo "2.0";; + ("bo") echo "1.3";; + ("rex") echo "1.2";; + ("buzz") echo "1.1";; + + (*) ret="1";; +esac + +return "${ret}" -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 367b47d552e3abf35d54501da0a96bdc130ea569 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jun 27 00:26:37 2016 +0200 bin/build-deb-package: use numerical Debian version in package version string. Fixes errors upgrading from one Debian version to another IFF the code name of the newer version begins with a letter that is lexicographical less than the earlier Debian version. --- bin/build-deb-package | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/bin/build-deb-package b/bin/build-deb-package index 616c151..09de607 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -262,13 +262,14 @@ build_packages() { } # for Ubuntu version is the codename of the distribution release - VERSION="${l_CODENAME}" + typeset -l codename="${l_CODENAME}" + typeset -l numerical_version="$("${script_path}/debian-codename-to-version.sh" "${codename}")" # translate the version name for Debian releases - [ "x${l_CODENAME}" = "xsid" ] && VERSION="unstable" - #[ "x$l_CODENAME" = "xjessie" ] && VERSION=testing - #[ "x$l_CODENAME" = "xwheezy" ] && VERSION=stable - #[ "x$l_CODENAME" = "xoldstable" ] && VERSION=oldstable + [ "x${l_CODENAME}" = "xsid" ] && codename="unstable" + #[ "x$l_CODENAME" = "xjessie" ] && codename=testing + #[ "x$l_CODENAME" = "xwheezy" ] && codename=stable + #[ "x$l_CODENAME" = "xoldstable" ] && codename=oldstable # modify the section for non-main package builds [ "x${COMPONENT}" != "xmain" ] && { @@ -278,9 +279,9 @@ build_packages() { # modify changelog for this build if [ "${COMPONENT}" != "${COMPONENT_NIGHTLY}" ]; then - dch --distribution "${VERSION}" --force-distribution -l "+git${DATE}.${GITREV}+${l_CODENAME}.${COMPONENT}." "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}." "Auto-built ${l_DIST} ${l_CODENAME} (Debian ${numerical_version}) package for ${REPOS_SERVER} repository (Git commit: ${GIT_OBJECT_ID})." else - dch --distribution "${VERSION}" --force-distribution -l "~git${DATE}.${GITREV}+${l_CODENAME}.${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 ${l_DIST} ${l_CODENAME} 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
-
git-admin＠x2go.org