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, 6.1 has been updated
via 2e889361b09521c2be11e513d4d3652d50b757bd (commit)
via 4ed2c860726f9a60bc30d4ab8cfb5678ac11e7c7 (commit)
from 548df519ff2ef57b1ef8e39d90270220fda27c55 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=2e889361b09521c2be11e513d4d3652d50b757bd
commit 2e889361b09521c2be11e513d4d3652d50b757bd
Merge: 548df51 4ed2c86
Author: Roland Mas <[email protected]>
Date: Sat Dec 2 14:34:23 2017 +0100
Merge branch '6.0' into 6.1
diff --cc autoinstall/build.sh
index f78d974,8cea24c..47032f6
--- a/autoinstall/build.sh
+++ b/autoinstall/build.sh
@@@ -110,7 -105,7 +110,7 @@@ function build_deb
cd $(dirname $0)/../src/
cp -a debian/changelog $f
- version=$(dpkg-parsechangelog | sed -n 's/^Version:
\([0-9.]\+\(\~\(rc\|beta\|alpha\)[0-9]\)\?\).*/\1/p')+$(date +%Y%m%d%H%M)
- version=$(dpkg-parsechangelog | sed -n 's/^Version:
\([0-9.]\+\(\~rc[0-9]\)\?\).*/\1/p')+autobuilt$(date +%Y%m%d%H%M)
++ version=$(dpkg-parsechangelog | sed -n 's/^Version:
\([0-9.]\+\(\~\(rc\|beta\|alpha\)[0-9]\)\?\).*/\1/p')+autobuilt$(date
+%Y%m%d%H%M)
make dist VERSION=$version
mv fusionforge-$version.tar.bz2 ../fusionforge_$version.orig.tar.bz2
cd ..
-----------------------------------------------------------------------
Summary of changes:
autoinstall/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
