This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit ccb2d3a49fc6a68ce51fac4c367f01b2e7e25a26 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 14 06:04:44 2016 +0100 bin/sbuild-deb-package: don't build a source package manually. This change will break the script, but later commits will unbreak it. A side-effect of this is that we won't have a .dsc file (immediately), but we don't care about that as we'll be using the checked out sources for sbuild directly. This directory will stay clean, thanks to sbuild. The actual source package will be generated by sbuild during the build process. Another welcome side-effect is that we don't need to manually copy source tarballs around. --- bin/sbuild-deb-package | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index 8d83597..e83c50c 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -313,11 +313,6 @@ build_packages() { # create git changelog immediately prior to building the package git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog - # build the source package - dpkg-buildpackage -uc -us -S -d - cd .. - DSCFILE="$(pwd)/$(ls -1 "${DEBSRCPKG}_"*.dsc | head -n1)" - SBUILD_OPTIONS="-n -j2 -sAd ${codename} -k ${GPG_KEY} --build-dep-resolver=aptitude" SBUILD_OPTIONS_64="${SBUILD_OPTIONS} -c arctica-${l_CODENAME}" SBUILD_OPTIONS_32="${SBUILD_OPTIONS} -c arctica-${l_CODENAME}-i386 --arch=i386 --debbuildopts=-B" @@ -327,12 +322,6 @@ build_packages() { [ "x${SKIP_ARCH}" != "xamd64" ] && grep -Eqs 'Architecture.*(all|any|amd64)' "${TEMP_DIR}/${PROJECT}/debian/control" && { cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/amd64" - tac ${DSCFILE} | while read line; do - if echo $line | grep -E "^Files:" 1>/dev/null; then break; fi - # each line contains a file that is part of the src:package - filename="$(echo $line | cut -d" " -f3-)" - if [ -n "$filename" ]; then cp "${TEMP_DIR}/${filename}" .; fi - done if [ -z "${OTHERMIRROR}" ]; then nice ${SBUILD} ${SBUILD_OPTIONS_64} "${DSCFILE}" else @@ -341,12 +330,6 @@ build_packages() { } [ "x${SKIP_ARCH}" != "xi386" ] && grep -Eqs 'Architecture.*(any|i386)' "${TEMP_DIR}/${PROJECT}/debian/control" && { cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/i386" - tac ${DSCFILE} | while read line; do - if echo $line | grep -E "^Files:" 1>/dev/null; then break; fi - # each line contains a file that is part of the src:package - filename="$(echo $line | cut -d" " -f3-)" - if [ -n "$filename" ]; then cp "${TEMP_DIR}/${filename}" .; fi - done if [ -z "${OTHERMIRROR}" ]; then nice ${SBUILD} ${SBUILD_OPTIONS_32} "${DSCFILE}" else -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git