From 4d506d29d98ae918c23792a8ac79b7c5159a6358 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Aug 2014 16:14:35 +0200 Subject: [PATCH] Removed log output (log too long) --- .travis.yml | 4 ++-- build/debian/README.howto | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd22137f625..548a8c53380 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,9 +93,9 @@ script: - php upgrade.php 3.5.0 3.6.0 >> upgrade.log - php upgrade2.php 3.5.0 3.6.0 >> upgrade2.log - php upgrade.php 3.6.0 3.7.0 >> upgrade.log - - cat upgrade.log +# - cat upgrade.log - php upgrade2.php 3.6.0 3.7.0 >> upgrade2.log - - cat upgrade2.log +# - cat upgrade2.log - cd ../.. - date - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php diff --git a/build/debian/README.howto b/build/debian/README.howto index d0bdd4574f4..928a1b181f9 100644 --- a/build/debian/README.howto +++ b/build/debian/README.howto @@ -153,7 +153,13 @@ from origin/upstream and origin/pristine. * Into root dir, launch: > debian/get-orig-source.sh -If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0 " to solve this. +If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this. + +* Edit tgz file to remove +- includes/sRGB.icc +And rename file into +dolibarr-x.y.z+dsfgw.tgz +(x.y.z = version, w start from 1 and is increased for each new import) * Staying into git root directory, run > git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz @@ -229,7 +235,7 @@ from origin/upstream and origin/pristine. * If new upstream is available onto sourceforge, launch: > debian/get-orig-source.sh -If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0 " to solve this. +If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this. * Edit tgz file to remove - ckeditor