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

[X2Go dev team]

The branch, master has been updated
       via  e9ed6ea1577b8d3ead5301ee208816a54b92794e (commit)
       via  ca2930e9da19a9dcc8df8c98ab3b97b07d250608 (commit)
      from  88e9aff58cc70500493798fd9223287ce6ae73e0 (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 e9ed6ea1577b8d3ead5301ee208816a54b92794e
Merge: ca2930e 88e9aff
Author: X2Go Admin Account <x2go-admin at japsand.x2go.org>
Date:   Thu Nov 28 08:48:00 2013 +0100

    Merge branch 'master' of git://code.x2go.org/buildscripts
    
    Conflicts (resolved by Mike Gabriel):
    	bin/build-package

commit ca2930e9da19a9dcc8df8c98ab3b97b07d250608
Author: X2Go Admin Account <x2go-admin at japsand.x2go.org>
Date:   Thu Nov 28 08:45:35 2013 +0100

    work in latest local changes from japsand (build host): build 1.0 source format packages, revert version string fix, handle building of X2Go MATE Bindings

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

Summary of changes:
 bin/build-package |   11 +++++++----
 home/.pbuilderrc  |    1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/bin/build-package b/bin/build-package
index 8545b6b..4d73daf 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -206,7 +206,7 @@ build_packages() {
 					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
+					} || echo "1.0" > debian/source/format
 				}
 
 				# for Ubuntu version is the codename of the distribution release
@@ -217,15 +217,15 @@ build_packages() {
 				#[ "x$l_CODENAME" = "xjessie" ] && VERSION=testing
 				#[ "x$l_CODENAME" = "xwheezy" ] && VERSION=stable
 				#[ "x$l_CODENAME" = "xoldstable" ] && VERSION=oldstable
-				
+
 				# modify the section for non-main package builds
 				[ "x$COMPONENT" != "xmain" ] && {
 					mv debian/control debian/control.tmp
 					cat debian/control.tmp | sed  "s#Section:[\ ]*\(.*\)#Section: $COMPONENT/\1#g" > debian/control
 				}
-				
+
 				# modify changelog for this build
-				dch --distribution $VERSION --force-distribution -l "~$l_CODENAME~$COMPONENT$DATE~$GITREV~build" "Auto-built $l_DIST $l_CODENAME package for $REPOS_SERVER repository."
+				dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT$DATE~$GITREV~build" "Auto-built $l_DIST $l_CODENAME package for $REPOS_SERVER repository."
 				mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386}
 				OTHERMIRROR=""
 				if [ "x$COMPONENT" = "x$COMPONENT_NIGHTLY" ]; then
@@ -233,6 +233,9 @@ build_packages() {
 				else
 					echo $PACKAGE_WITHOUT_OTHERMIRROR | grep $PROJECT >/dev/null || OTHERMIRROR="deb http://$REPOS_SERVER/$l_DIST $l_CODENAME $COMPONENT"
 				fi
+				if [ $PROJECT = "x2gomatebindings" ]; then
+					OTHERMIRROR="deb http://packages.mate-desktop.org/repo/debian $l_CODENAME main"
+				fi
 
 				[ "x$USE_SUDO" != "xyes" ] && {
 					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
diff --git a/home/.pbuilderrc b/home/.pbuilderrc
index a873955..7074627 100644
--- a/home/.pbuilderrc
+++ b/home/.pbuilderrc
@@ -56,3 +56,4 @@ elif [ "x${DIST}" = "xdebian" ]; then
 	fi
 fi
 
+EXTRA_ARCHS=armel


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).