From 7aebc12d52cee4df60cbdaf7036eae517c64ca98 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 4 Oct 2012 14:56:58 +0200 Subject: [PATCH 1/2] Bump to version 3.7.2 --- lib/Alchemy/Phrasea/Core/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index d6a4ef2265..f14171371d 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -18,7 +18,7 @@ namespace Alchemy\Phrasea\Core; */ class Version { - protected static $number = '3.7.1'; + protected static $number = '3.7.2'; protected static $name = 'Carnosaurus'; public static function getNumber() From f357905fc8875c89324888d68478dd0f466a5827 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 5 Oct 2012 14:08:35 +0200 Subject: [PATCH 2/2] Update travis configuration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a565d91733..7040d4af5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ before_script: - cp hudson/*.yml config/ - curl -s http://getcomposer.org/installer | php - php composer.phar install --dev - - sudo apt-get update - sudo apt-get install -y xpdf ffmpeg libavcodec-extra-53 openoffice.org-writer unoconv ghostscript gsfonts dcraw ufraw graphicsmagick libgraphicsmagick1-dev libfreetype6-dev libjpeg-dev libgif-dev libtiff-dev libdjvulibre-dev libwmf-dev libmagickcore-dev libmagickwand-dev libpng-dev gettext zlib1g-dev build-essential libfaac-dev libmp3lame0 libx264-dev libvpx-dev libtheora-dev libvorbis-dev gpac - sudo apt-get autoremove - sudo apt-get clean @@ -17,6 +16,7 @@ before_script: - mysql -e "source `pwd`/hudson/fixtures.sql" - mysql -e 'SET GLOBAL time_zone = "+02:00";' - mysql -e 'SET @@global.sql_mode= "";' + - mysql -e 'SET @@global.wait_timeout= 999999;' - git clone git://github.com/alchemy-fr/Phraseanet-Extension.git - sh -c "cd Phraseanet-Extension && ./configure && make && sudo make install" - echo "extension=phrasea2.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`