[Fusionforge-commits] FusionForge branch master updated. de6d3a10fcdaa4d767f92690e79fea3c92b406e8

Roland Mas lolando at fusionforge.org
Tue Jun 3 14:17:08 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, master has been updated
       via  de6d3a10fcdaa4d767f92690e79fea3c92b406e8 (commit)
       via  ced07957617b4593eb2949521adda27efc179f77 (commit)
       via  62bfde618b719e20eda3d2bada3ab9386562cc98 (commit)
       via  252239381c4a045c9a25561a51fcf5cc52716707 (commit)
       via  3e5ecf3843e2c7fd3e0b66b9255e7c5cc232696f (commit)
       via  fa4b05bc7e3e7c2367151b141429a27c81ae6588 (commit)
       via  bef13c85477689329b33120b12dcc8964fc00d50 (commit)
       via  b3abd9e4f26982e4cbd30393246081e694ab44c6 (commit)
       via  4acee484d0b6e68a66ff31fe50435f449fdf93fe (commit)
       via  4f5d0522d4be32497455c9cdf38e1510d20c9c8b (commit)
       via  dc7f892083a7e29d251e40e2f63cd288e3688360 (commit)
       via  697caa41dd34a3f4a104b4ab6113881da57415f5 (commit)
       via  634a3108c60dd1af293a4f95d5230ace20a5aee3 (commit)
       via  552b2ec929de3c35c3bd5dcdaf92d925b7bc7a06 (commit)
       via  afa11b7ea6717c4dfa5e3ad8c080ea98d841bd17 (commit)
      from  6d6befc93db5a642f3790577f6d66cb53f2778cf (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 de6d3a10fcdaa4d767f92690e79fea3c92b406e8
Merge: 6d6befc ced0795
Author: Roland Mas <lolando at debian.org>
Date:   Tue Jun 3 14:17:02 2014 +0200

    Merge branch 'Branch_5_3'

diff --cc tests/scripts/fusionforge-build-and-test-deb.sh
index 0c0ab24,947a30e..b0dd771
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@@ -109,15 -109,11 +109,16 @@@ ssh root@$HOST "UCF_FORCE_CONFFNEW=yes 
  
  if [ "$DIST" = wheezy ] ; then
      ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -o debug::pkgproblemresolver=true -y --force-yes install javascript-common"
-     ssh root@$HOST "echo \"deb $DEBMIRROR jessie main\" >> /etc/apt/sources.list.d/jessie.list"
-     ssh root@$HOST "apt-get update"
-     ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -o debug::pkgproblemresolver=true -y --force-yes install loggerhead python"
-     ssh root@$HOST "rm /etc/apt/sources.list.d/jessie.list"
+ 
+     # Grab a more recent loggerhead (without pulling everything)
+     if ! ssh root@$HOST dpkg -l loggerhead | grep -q ^ii ; then
+ 	ssh root@$HOST "apt-get -y --force-yes install wget gdebi-core;wget -c http://snapshot.debian.org/archive/debian/20121107T152130Z/pool/main/l/loggerhead/loggerhead_1.19%7Ebzr477-1_all.deb; gdebi --non-interactive loggerhead_1.19~bzr477-1_all.deb"
+     fi
 +
 +    ssh root@$HOST "echo \"deb $DEBMIRROR wheezy-backports main\" >> /etc/apt/sources.list.d/wheezy-backports.list"
 +    ssh root@$HOST "apt-get update"
 +    ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -o debug::pkgproblemresolver=true -y --force-yes install -t wheezy-backports libjs-jquery-ui"
 +    ssh root@$HOST "rm /etc/apt/sources.list.d/wheezy-backports.list"
  fi
  
  ssh root@$HOST "echo \"deb $DEBMIRROR $DIST main\" > /etc/apt/sources.list"
diff --cc vm/scripts/run-testsuite.sh
index ec669b9,50496f4..1404c7d
--- a/vm/scripts/run-testsuite.sh
+++ b/vm/scripts/run-testsuite.sh
@@@ -1,21 -1,21 +1,22 @@@
  #!/bin/bash
  
 -# Selenium dependencies
 -aptitude -y install default-jre iceweasel
 +# This script runs the preferred functionnal test suite, using phpunit
 +# and Selenium, which will test the Web interface of FusionForge in a
 +# controlled Firefox browser.
  
 -# Build selenium
 -aptitude -y install cowbuilder
 -mkdir -p ~/builder/cow/
 -DISTROLIST=wheezy /usr/src/fusionforge/tests/scripts/manage-cowbuilder.sh
 +# Build an unofficial package for selenium and install it
 +if ! dpkg -l selenium | grep -q ^ii ; then
 +    cd /usr/src/fusionforge/3rd-party/selenium/selenium
 +    debian/rules get-orig-source
 +    debuild --no-lintian --no-tgz-check -us -uc
 +    dpkg -i /usr/src/fusionforge/3rd-party/selenium/selenium_*_all.deb
  
 -mkdir -p /usr/src/build/debian/conf/
 -aptitude -y install reprepro
 -echo -e "Codename: wheezy\nArchitectures: amd64 source\nComponents: main" > /usr/src/build/debian/conf/distributions
 -cd /usr/src/fusionforge/3rd-party/selenium
 -make
 -dpkg -i /usr/src/build/debian/pool/main/s/selenium/selenium_*_all.deb
 +    # Selenium dependencies
 +    aptitude -y install default-jre iceweasel
 +
 +fi
  
+ (echo [mediawiki]; echo unbreak_frames=yes) > /etc/gforge/config.ini.d/zzz-buildbot.ini
  
  # Test dependencies
  aptitude -y install php5-cli phpunit phpunit-selenium

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

Summary of changes:
 src/db/20040826_migrateforum.php                     |    1 -
 src/db/20040826_migraterbac.php                      |    1 -
 src/db/20041211-syncmail.php                         |    1 -
 src/db/20041222-1-delete-task-artifact.php           |    1 -
 src/db/20050127-frs-reorg.php                        |    1 -
 src/db/20050325-3.php                                |    1 -
 src/db/20050617.php                                  |    1 -
 src/db/20050804-2.php                                |    1 -
 src/db/20120409-tracker-attachement-moved-in-fs.php  |    1 -
 src/db/20120603-docman-file-moved-in-fs.php          |    1 -
 src/db/20120610-migrate-sshkeys.php                  |    1 -
 src/packaging/control/000source                      |    2 +-
 src/packaging/control/055db-remote                   |    1 +
 src/packaging/dirs/web-apache2                       |    1 -
 src/packaging/install/web-apache2                    |    2 +-
 .../packaging/control/222plugin-admssw.shortdesc     |    6 +++---
 src/plugins/blocks/packaging/install/plugin-blocks   |    2 +-
 .../packaging/install/plugin-contribtracker          |    2 +-
 .../moinmoin/packaging/install/plugin-moinmoin       |    2 +-
 .../library/scmgit/hooks/committracker/post.php      |    5 ++++-
 .../scmhook/www/committracker/newcommitgit.php       |   18 ++++++++++++++++--
 tests/func/60_PluginsMediawiki/mediawikiTest.php     |    2 ++
 tests/scripts/fusionforge-build-and-test-deb.sh      |    9 +++++----
 vm/packer/http/preseed.cfg                           |    4 +---
 vm/packer/scripts/fusionforge-source.sh              |    4 ++--
 vm/scripts/build.sh                                  |    1 +
 vm/scripts/run-testsuite.sh                          |    1 +
 vm/scripts/uninstall.sh                              |    3 ++-
 28 files changed, 43 insertions(+), 33 deletions(-)
 mode change 100755 => 100644 src/db/20010304-4-artifact-convert-files.php
 mode change 100755 => 100644 src/db/20021213-2-doc_data-migrate.php
 mode change 100755 => 100644 src/db/20040826_migrateforum.php
 mode change 100755 => 100644 src/db/20040826_migraterbac.php
 mode change 100755 => 100644 src/db/20050127-frs-reorg.php
 mode change 100755 => 100644 src/db/20050325-3.php
 mode change 100755 => 100644 src/db/20050617.php
 mode change 100755 => 100644 src/db/20120409-tracker-attachement-moved-in-fs.php
 mode change 100755 => 100644 src/db/20120603-docman-file-moved-in-fs.php
 mode change 100755 => 100644 src/db/20120610-migrate-sshkeys.php
 mode change 100644 => 100755 src/plugins/scmhook/library/scmsvn/hooks/checkmimetype/check-mime-type.pl
 mode change 100644 => 100755 src/plugins/scmhook/library/scmsvn/hooks/commitemail/commit-email.php
 mode change 100755 => 100644 src/utils/default_page.php


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list