Merge pull request #55 from juliandunn/fix-gemfile

Fix Gemfile and Gemfile.lock. Also, fix some missing directives from the Debian base definition.

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.2.2'
-gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '4e5d50de'
+gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '4e5d50de48'
 gem "vagrant-windows", "~> 1.0.0" # still not working with Vagrant 1.2 btw
 gem "em-winrm" # for windows!
 gem "rake"

Gemfile.lock

@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/jedi4ever/veewee.git
-  revision: 164a10dd246ed67c0a9a655b915eb0c1d6144203
-  ref: 164a10dd24
+  revision: 4e5d50de4866472bd3e7060157ac573457196760
+  ref: 4e5d50de48
   specs:
     veewee (0.3.7)
       ansi (~> 1.3.0)
@@ -32,15 +32,6 @@ GIT
       net-scp (~> 1.1.0)
       net-ssh (~> 2.6.6)
 
-GIT
-  remote: https://github.com/sneal/vagrant-windows.git
-  revision: fbe11646d674e2ee5253089b958fdc2e573aab78
-  branch: vagrant-1.1-plugin-architecture-vbox4.1
-  specs:
-    vagrant-windows (0.2.0)
-      highline
-      winrm (~> 1.1.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -55,24 +46,24 @@ GEM
     builder (3.2.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    diff-lcs (1.2.3)
+    diff-lcs (1.2.4)
     em-winrm (0.5.4)
       eventmachine (= 1.0.0.beta.3)
       mixlib-log (>= 1.3.0)
       uuidtools (~> 2.1.1)
       winrm (~> 1.1.0)
     erubis (2.7.0)
     eventmachine (1.0.0.beta.3)
-    excon (0.20.1)
+    excon (0.22.1)
     ffi (1.7.0)
     fission (0.4.0)
       CFPropertyList (~> 2.0.17)
-    fog (1.10.1)
+    fog (1.11.1)
       builder
       excon (~> 0.20)
       formatador (~> 0.2.0)
+      json (~> 1.7)
       mime-types
-      multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
@@ -86,7 +77,7 @@ GEM
       ffi (>= 1.0.1)
     gyoku (1.0.0)
       builder (>= 2.1.2)
-    highline (1.6.18)
+    highline (1.6.19)
     httpclient (2.2.0.2)
     httpi (0.9.7)
       rack
@@ -97,9 +88,8 @@ GEM
     log4r (1.1.10)
     logging (1.6.2)
       little-plugger (>= 1.1.3)
-    mime-types (1.22)
+    mime-types (1.23)
     mixlib-log (1.6.0)
-    multi_json (1.7.2)
     net-scp (1.1.0)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.7)
@@ -126,6 +116,9 @@ GEM
       wasabi (~> 1.0)
     thor (0.18.1)
     uuidtools (2.1.3)
+    vagrant-windows (1.0.1)
+      highline
+      winrm (~> 1.1.1)
     wasabi (1.0.0)
       nokogiri (>= 1.4.0)
     winrm (1.1.2)
@@ -144,5 +137,5 @@ DEPENDENCIES
   em-winrm
   rake
   vagrant!
-  vagrant-windows!
+  vagrant-windows (~> 1.0.0)
   veewee!

definitions/.debian/preseed.cfg

@@ -1,9 +1,12 @@
+choose-mirror-bin mirror/http/proxy string
+d-i apt-setup/use_mirror boolean true
 d-i base-installer/kernel/override-image string linux-server
 d-i clock-setup/utc boolean true
 d-i clock-setup/utc-auto boolean true
 d-i finish-install/reboot_in_progress note
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean true
+d-i keymap select us
 d-i mirror/country string manual
 d-i mirror/http/directory string /debian
 d-i mirror/http/hostname string mirrors.kernel.org