[X2Go-Commits] buildscripts.git - master (branch) updated: d114903e52e532fcb1587ceaf5eadbe9d26e45ac

X2Go dev team git-admin at x2go.org
Fri Jul 19 13:48:54 CEST 2013


The branch, master has been updated
       via  d114903e52e532fcb1587ceaf5eadbe9d26e45ac (commit)
       via  0fe6d2898a908e40d1cde9669ebc450a8792c3b6 (commit)
      from  984f0ae8ce1212d1b0503e9dbd0c45ddadf90c0d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d114903e52e532fcb1587ceaf5eadbe9d26e45ac
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jul 19 13:48:49 2013 +0200

    build 3.0 (quilt) packages, as well

commit 0fe6d2898a908e40d1cde9669ebc450a8792c3b6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 21 21:01:10 2012 +0200

    add support quilt format, extracting upstream orig tarballs from git, if possible

-----------------------------------------------------------------------

Summary of changes:
 bin/build-package |   31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/bin/build-package b/bin/build-package
index c510799..59da3ea 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -103,13 +103,19 @@ prepare_workspace() {
 		cd "$PROJECT_DIR" && git reset --hard
 		git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT
 		git pull origin $CHECKOUT
+		git fetch origin upstream:upstream || true
+		git fetch origin pristine-tar:pristine-tar || true
 		# and again, get the $CHECKOUT refspec in pure state
 		git reset --hard
+		git clean -df
 	else
 		cd "$(dirname $PROJECT_DIR)"
 		git clone git://$GIT_HOSTNAME/$PROJECT_PATH.git
 		cd "$PROJECT"
 		git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT;
+		git fetch origin upstream:upstream
+		git fetch origin pristine-tar:pristine-tar || true
+		git clean -df
 	fi
 	cd "$PROJECT_DIR"
 
@@ -188,10 +194,19 @@ build_packages() {
 				git checkout $CHECKOUT || git checkout master
 				find $PROJECT_DIR/../ -type f -maxdepth 0 -mindepth 0 | grep $PROJECT_*.orig.tar.gz &>/dev/null && cp $PROJECT_DIR/../$PROJECT_*.orig.tar.gz ..
 				GITREV=$(gitrevno)
+
+				# we always build native packages for our repos
+				SA_OPTION=""
+
 				# we always build native packages for our repos
 				test -f debian/source/format && cat debian/source/format | egrep '^3.0.*\(quilt\)$' >/dev/null && {
-					echo "3.0 (native)" > debian/source/format
-			        }	
+					git fetch origin upstream:upstream
+					UPSTREAM_VERSION=$(dpkg-parsechangelog | grep Version: | cut -d " " -f2 | sed -e 's/-.*//' -e 's/^.*://')
+					REVISION=$(dpkg-parsechangelog | grep Version: | cut -d " " -f2 | sed -e 's/.*-//')
+					git archive --prefix=${PROJECT}-${UPSTREAM_VERSION}/ -o ../${PROJECT}_${UPSTREAM_VERSION}.orig.tar.gz upstream/${UPSTREAM_VERSION} && {
+						SA_OPTION="--debbuildopts=-sa"
+					} || echo "3.0 (native)" > debian/source/format
+				}
 
 				# for Ubuntu version is the codename of the distribution release
 				VERSION=$l_CODENAME
@@ -221,32 +236,32 @@ build_packages() {
 				[ "x$USE_SUDO" != "xyes" ] && {
 					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
 						[ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
-							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" -- --allow-untrusted 0<&-
+							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" -- --allow-untrusted $SA_OPTION 0<&-
 						}
 						[ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
-							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386"  -- --binary-arch --allow-untrusted 0<&-
+							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386"  -- --binary-arch --allow-untrusted $SA_OPTION 0<&-
 						}
 					}
 					for extra_arch in $EXTRA_ARCHS; do
 						mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch"
 						cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && {
-							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted 0<&-
+							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&-
 						}
 					done
 				}
 				[ "x$USE_SUDO" = "xyes" ] && {
 					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
 						[ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
-							sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 -- --allow-untrusted 0<&-
+							sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 -- --allow-untrusted $SA_OPTION 0<&-
 						}
 						[ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
-							sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386  -- --binary-arch --allow-untrusted 0<&-
+							sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386  -- --binary-arch --allow-untrusted $SA_OPTION 0<&-
 						}
 					}
 					for extra_arch in $EXTRA_ARCHS; do
 						mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch"
 						cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && {
-							sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted 0<&-
+							sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&-
 						}
 					done
 				}


hooks/post-receive
-- 
buildscripts.git (X2Go packaging scripts)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "buildscripts.git" (X2Go packaging scripts).




More information about the x2go-commits mailing list