[Fusionforge-commits] FusionForge branch GUM updated. 443e269123633fc5948ef559ba1e90c99777d2df

Sylvain Beucler beuc-inria at fusionforge.org
Fri Aug 22 14:06:15 CEST 2014


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 "FusionForge".

The branch, GUM has been updated
       via  443e269123633fc5948ef559ba1e90c99777d2df (commit)
       via  f3b7863f0fdb030cb8aa6ade2df971f37cc74322 (commit)
       via  80e9f955e23053203e5302d22c77ee8586ba41f0 (commit)
       via  a5d69073cc4051d66c9ef4326237521827265e0f (commit)
       via  d5046aadfd5d0f3ab21c50cb3cbcc4bd536a13ed (commit)
       via  15c7a372ca81974522b69f6c450f3652204ffa5d (commit)
       via  3301d1da7014b80ee986253b5fb0042a1870db8e (commit)
       via  8e34148293a3e3a011313f643e94ab93fd92287d (commit)
       via  9f8cee04a6952d5f7accfc916c3e1e7f3b14661f (commit)
      from  511344b5b261f87e99e1db939ef207ae91c4071d (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 443e269123633fc5948ef559ba1e90c99777d2df
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Aug 22 13:51:58 2014 +0200

    install: update build.sh for new build system

diff --git a/src/GNUmakefile b/src/GNUmakefile
index 1b828f3..ca42770 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -100,7 +100,7 @@ uninstall:
 
 ## Step 3: configure & update system
 # not relying on 'prefix' for post-install (for no-install/dev setups)
-fgc_source_path:=$(shell forge_get_config source_path)
+fgc_source_path:=$(shell forge_get_config source_path 2>/dev/null)
 post-install: post-install-core post-install-plugins
 post-install-core:  # common+db+web
 	$(fgc_source_path)/post-install.d/core.sh
diff --git a/tests/scripts/deb/build.sh b/tests/scripts/deb/build.sh
index a238a1a..2df22dc 100755
--- a/tests/scripts/deb/build.sh
+++ b/tests/scripts/deb/build.sh
@@ -17,7 +17,7 @@
 
 
 # Install build dependencies
-aptitude -y install mini-dinstall dput devscripts equivs
+aptitude -y install mini-dinstall dput devscripts equivs pbzip2
 mk-build-deps -i /usr/src/fusionforge/src/debian/control -t 'apt-get -y' -r
 
 
@@ -25,8 +25,7 @@ mk-build-deps -i /usr/src/fusionforge/src/debian/control -t 'apt-get -y' -r
 #rm -rf /usr/src/debian-repository
 mkdir -p /usr/src/debian-repository
 
-if [ ! -f /root/.mini-dinstall.conf ]; then
-    cat >/root/.mini-dinstall.conf <<EOF
+cat >/root/.mini-dinstall.conf <<EOF
 [DEFAULT]
 archivedir = /usr/src/debian-repository
 archive_style = flat
@@ -34,14 +33,13 @@ archive_style = flat
 verify_sigs = 0
 
 generate_release = 1
-release_signscript = /usr/src/fusionforge/vm/scripts/mini-dinstall-sign.sh
+release_signscript = /usr/src/fusionforge/tests/scripts/deb/mini-dinstall-sign.sh
 
 max_retry_time = 3600
 mail_on_success = false
 
 [local]
 EOF
-fi
 
 export GNUPGHOME=/usr/src/gnupg
 if [ ! -e $GNUPGHOME ]; then
@@ -103,9 +101,11 @@ if [ $? -eq 0 ]; then
 fi
 
 debian/rules debian/control  # re-gen debian/control
-dch --newversion $(dpkg-parsechangelog | sed -n 's/^Version: \([0-9.]\+\(\~rc[0-9]\)\?\).*/\1/p')+$(date +%Y%m%d%H%M)-1 --distribution local --force-distribution "Autobuilt."
-#debuild --no-lintian --no-tgz-check -us -uc -tc  # using -tc so 'bzr st' is readable
-make dist && \mv fusionforge-5.3.50.tar.bz2 ../fusionforge_5.3.50.orig.tar.bz2 && debuild
+version=$(dpkg-parsechangelog | sed -n 's/^Version: \([0-9.]\+\(\~rc[0-9]\)\?\).*/\1/p')+$(date +%Y%m%d%H%M)
+dch --newversion $version-1 --distribution local --force-distribution "Autobuilt."
+make dist
+mv fusionforge-$(make version).tar.bz2 ../fusionforge_$version.orig.tar.bz2
+debuild -us -uc -tc  # using -tc so 'git status' is readable
 
 # Install built packages into the local repo
 debrelease -f local

commit f3b7863f0fdb030cb8aa6ade2df971f37cc74322
Merge: 511344b 80e9f95
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Aug 22 13:09:37 2014 +0200

    Merge branch 'master' into GUM


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

Summary of changes:
 src/GNUmakefile                               |    2 +-
 src/common/pm/ProjectTasksForUser.class.php   |    8 +--
 src/common/tracker/Artifact.class.php         |    1 -
 src/common/tracker/ArtifactMessage.class.php  |    2 +-
 src/common/tracker/ArtifactsForUser.class.php |   57 ++++++++++++-------
 src/www/project/report/index.php              |   75 +++++++++----------------
 src/www/project/request.php                   |    2 +-
 tests/scripts/deb/build.sh                    |   16 +++---
 vm/packer/fusionforge-dev-debian.json         |    8 +--
 vm/packer/scripts/fusionforge-source.sh       |    8 +--
 10 files changed, 85 insertions(+), 94 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list