[Fusionforge-commits] FusionForge branch 6.0 updated. v5.3-rc4-2995-g31cbb5c

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Mon Jun 1 12:15:20 CEST 2015


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.0 has been updated
       via  31cbb5c9e86dd396df940f8ffab87359804b2dd5 (commit)
       via  12241660eeeba9d2c9d541b734ae12c4de7b4525 (commit)
      from  76f60cdc06dd1a7defdaa8faec51170c69293d00 (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 31cbb5c9e86dd396df940f8ffab87359804b2dd5
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Jun 1 12:14:16 2015 +0200

    testsuite: properly fix .changes path

diff --git a/tests/buildbot/fusionforge-build-and-test.sh b/tests/buildbot/fusionforge-build-and-test.sh
index e390dba..7df8de7 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -102,8 +102,9 @@ if [ $retcode = 0 && "$PUBLISH_REPO" = 1 ] ; then
     branch=$(echo $GIT_BRANCH | sed -e s,origin/,, -e s,/,_,g)
     case $INSTALL_METHOD in
 	deb)
-	    rsync -av --delete root@$HOST:/usr/src/debian-repository/local/ $WORKSPACE/packages/
-	    sed -i -e "s/^Distribution:.*/Distribution: $DIST-$branch/" $WORKSPACE/packages/fusionforge*changes
+	    cd $WORKSPACE/packages/
+	    rsync -av --delete root@$HOST:/usr/src/debian-repository/local/ ./
+	    sed -i -e "s/^Distribution:.*/Distribution: $DIST-$branch/" fusionforge*changes
 	    dput fforg fusionforge*changes
 	    ;;
 	rpm)

commit 12241660eeeba9d2c9d541b734ae12c4de7b4525
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Jun 1 12:14:00 2015 +0200

    deb: CHANGES already installed - document that expicitely

diff --git a/src/debian/fusionforge-common.docs b/src/debian/fusionforge-common.docs
index 1122c5a..93e40c4 100644
--- a/src/debian/fusionforge-common.docs
+++ b/src/debian/fusionforge-common.docs
@@ -1,5 +1,5 @@
 README
 AUTHORS
-CHANGES
 docs/README.Themes
 docs/README.Plugins
+# CHANGES -> automatically installed as changelog.gz

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

Summary of changes:
 src/debian/fusionforge-common.docs           | 2 +-
 tests/buildbot/fusionforge-build-and-test.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/debian/fusionforge-common.docs b/src/debian/fusionforge-common.docs
index 1122c5a..93e40c4 100644
--- a/src/debian/fusionforge-common.docs
+++ b/src/debian/fusionforge-common.docs
@@ -1,5 +1,5 @@
 README
 AUTHORS
-CHANGES
 docs/README.Themes
 docs/README.Plugins
+# CHANGES -> automatically installed as changelog.gz
diff --git a/tests/buildbot/fusionforge-build-and-test.sh b/tests/buildbot/fusionforge-build-and-test.sh
index e390dba..7df8de7 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -102,8 +102,9 @@ if [ $retcode = 0 && "$PUBLISH_REPO" = 1 ] ; then
     branch=$(echo $GIT_BRANCH | sed -e s,origin/,, -e s,/,_,g)
     case $INSTALL_METHOD in
 	deb)
-	    rsync -av --delete root@$HOST:/usr/src/debian-repository/local/ $WORKSPACE/packages/
-	    sed -i -e "s/^Distribution:.*/Distribution: $DIST-$branch/" $WORKSPACE/packages/fusionforge*changes
+	    cd $WORKSPACE/packages/
+	    rsync -av --delete root@$HOST:/usr/src/debian-repository/local/ ./
+	    sed -i -e "s/^Distribution:.*/Distribution: $DIST-$branch/" fusionforge*changes
 	    dput fforg fusionforge*changes
 	    ;;
 	rpm)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list