diff --git a/config/deploy.rb b/config/deploy.rb index 0c87b167040d0b30bbf4edb5dce11109732a48e6..41032ff402e5a8b4658795d4a8a4ea6f931509c1 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -22,7 +22,8 @@ set :puppet, "/tmp/puppet" set :scm, :git -set :gateway, ENV['GATEWAY'] || "#{ENV['USER']}@access.grid5000.fr" +# abasu (dmargery) : added "unless" block to make package if option GATEWAY='' +set :gateway, ENV['GATEWAY'] || "#{ENV['USER']}@access.grid5000.fr" unless ENV['NOPROXY'] set :user, ENV['REMOTE_USER'] || "root" key = ENV['SSH_KEY'] || "~/.ssh/id_rsa" @@ -53,7 +54,7 @@ task :package, :roles => :pkg do cmd = "date -s \"#{Time.now.to_s}\" && " cmd += "export http_proxy=proxy:3128 && " unless ENV['NOPROXY'] cmd += "apt-get update && " - cmd += "apt-get install #{pkg_dependencies.join(" ")} git-core dh-make dpkg-dev -y && " + cmd += "apt-get install #{pkg_dependencies.join(" ")} git-core dh-make dpkg-dev libicu-dev -y && " cmd += "gem1.9.1 install rake -v 0.8.7 --no-ri --no-rdoc && " cmd += "gem1.9.1 install bundler -v 1.1.1 --no-ri --no-rdoc && " cmd += "rm -rf /tmp/#{application}*" diff --git a/debian/changelog b/debian/changelog index 72e9039d74e5f6a84289688af144f1f82a4e013c..7b3b400e80bdeb963612760faf7efb5446d41533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +g5k-api (3.2.0-1) unstable; urgency=low + + + + -- Anirvan BASU Tue, 24 Mar 2015 14:14:16 +0100 + g5k-api (3.1.8-1) unstable; urgency=low * 89f7224 [deploy] Bugfix: return 201 HTTP code on POST requests diff --git a/lib/grid5000/version.rb b/lib/grid5000/version.rb index 9cf9fd29ddbfbece8417ea4a513ea57e39dff511..e6b39f96f03a1b18caa24f03f219673bb941989c 100644 --- a/lib/grid5000/version.rb +++ b/lib/grid5000/version.rb @@ -10,8 +10,8 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. +# limitations under the License. module Grid5000 - VERSION = "3.1.9" + VERSION = "3.2.0" end