From d30c66eac524305f0dd9ff1e545a2ae33b85aab2 Mon Sep 17 00:00:00 2001
From: Anirvan BASU <Anirvan.BASU@INRIA.fr>
Date: Tue, 24 Mar 2015 14:14:16 +0100
Subject: [PATCH 1/3] v3.2.0

---
 debian/changelog        | 6 ++++++
 lib/grid5000/version.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 72e9039d..7b3b400e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+g5k-api (3.2.0-1) unstable; urgency=low
+
+
+
+ -- Anirvan BASU <Anirvan.BASU@INRIA.fr>  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 9cf9fd29..a0074147 100644
--- a/lib/grid5000/version.rb
+++ b/lib/grid5000/version.rb
@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module Grid5000
-  VERSION = "3.1.9"
+  VERSION = "3.2.0"
 end
-- 
GitLab


From 5d85bfdabac890a062228714dff748e0c58673d3 Mon Sep 17 00:00:00 2001
From: Anirvan BASU <Anirvan.BASU@INRIA.fr>
Date: Tue, 24 Mar 2015 14:25:20 +0100
Subject: [PATCH 2/3] Package version 3.2.0 after bug fixes 5347, 5065, 5694,
 5106, 5856

---
 config/deploy.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 0c87b167..41032ff4 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}*"
-- 
GitLab


From 43bd23d1d555cb98d233d49234b03322c722857a Mon Sep 17 00:00:00 2001
From: Anirvan BASU <Anirvan.BASU@INRIA.fr>
Date: Tue, 24 Mar 2015 15:01:48 +0100
Subject: [PATCH 3/3] Package version 3.2.0 complete with version file, after
 bug fixes 5347, 5065, 5694, 5106, 5856

---
 lib/grid5000/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/grid5000/version.rb b/lib/grid5000/version.rb
index a0074147..e6b39f96 100644
--- a/lib/grid5000/version.rb
+++ b/lib/grid5000/version.rb
@@ -10,7 +10,7 @@
 # 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.2.0"
-- 
GitLab