[DRE-commits] [SCM] ruby-stamp.git branch, master, updated. upstream/0.5.0-8-gea6492b

[Daniel Martí]

The following commit has been merged in the master branch:
commit ea6492bada8465d0da240a8f6e572442a593e9ac
Author: Daniel Martí <mvdan at mvdan.cc>
Date:   Mon Jul 15 14:21:02 2013 +0000

    Add no-bundler patch

diff --git a/debian/patches/no-bundler.patch b/debian/patches/no-bundler.patch
new file mode 100644
index 0000000..7f2f4af
--- /dev/null
+++ b/debian/patches/no-bundler.patch
@@ -0,0 +1,29 @@
+Description: Don't use bundler, include deps directly
+Author: Daniel Martí <mvdan at mvdan.cc>
+Forwarded: not-needed
+Last-Update: 2013-07-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,4 +1,3 @@
+-require 'bundler/gem_tasks'
+ require 'cucumber/rake/task'
+ 
+ Cucumber::Rake::Task.new(:features)
+--- a/features/support/env.rb
++++ b/features/support/env.rb
+@@ -1,11 +1,5 @@
+-require 'bundler'
+-begin
+-  Bundler.setup(:default, :development)
+-rescue Bundler::BundlerError => e
+-  $stderr.puts e.message
+-  $stderr.puts "Run `bundle install` to install missing gems"
+-  exit e.status_code
+-end
++require 'rake'
++require 'cucumber'
+ 
+ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+ require 'stamp'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6ebba04
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no-bundler.patch

-- 
ruby-stamp.git