[DRE-commits] [ruby-i18n] 01/01: readded strip bundler patch, refreshed moved to extra file, added DEP-3 header

[Jonas Genannt]

This is an automated email from the git hooks/post-receive script.

hggh-guest pushed a commit to branch master
in repository ruby-i18n.

commit d519c3aa88390854908854402ad65dcbc2a2fef9
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Fri Nov 29 00:07:28 2013 +0100

    readded strip bundler patch, refreshed moved to extra file, added DEP-3 header
---
 debian/changelog                   |  4 ++--
 debian/control                     |  3 +--
 debian/patches/series              |  1 +
 debian/patches/strip_bundler.patch | 37 +++++++++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fc6ff22..34b8f41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,12 @@ ruby-i18n (0.6.5-1) unstable; urgency=low
   * New Upstream Release
   * d/control:
     - bumped standards version
-    - added bundler to build depend (so no patch needed, to strip bundler/setup)
     - changed ruby1.8 dependency to ruby
     - wrap-sort
   * removed patches
-    - rubygems is loaded per default, added bundler as build dependency
+    - rubygems is loaded per default
     - test works, no need to skip
+  * patch strip_bundler refreshed, moved to extra file
 
  -- Jonas Genannt <jonas.genannt at capi2name.de>  Wed, 27 Nov 2013 19:26:54 +0100
 
diff --git a/debian/control b/debian/control
index e4829fc..4ef5584 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>,
            Antonio Terceiro <terceiro at debian.org>
-Build-Depends: bundler,
-               debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 7.0.50~),
                gem2deb (>= 0.3.0~),
                ruby-activesupport,
                ruby-mocha,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..88e9474
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+strip_bundler.patch
diff --git a/debian/patches/strip_bundler.patch b/debian/patches/strip_bundler.patch
new file mode 100644
index 0000000..bc7f486
--- /dev/null
+++ b/debian/patches/strip_bundler.patch
@@ -0,0 +1,37 @@
+Author: Jonas Genannt <jonas.genannt at capi2name.de>
+Description: disable bundler on build time, do not install dependency on build
+             time via bundler
+Forwarded: not-needed
+
+--- a/test/run_all.rb
++++ b/test/run_all.rb
+@@ -1,7 +1,3 @@
+-def bundle_check
+-  `bundle check` == "The Gemfile's dependencies are satisfied\n"
+-end
+-
+ command  = 'ruby -w -Ilib -Itest test/all.rb'
+ gemfiles = %w(ci/Gemfile.rails-3.x ci/Gemfile.rails-2.3.x ci/Gemfile.no-rails)
+ 
+@@ -9,11 +5,6 @@
+   puts "BUNDLE_GEMFILE=#{gemfile}"
+   ENV['BUNDLE_GEMFILE'] = gemfile
+ 
+-  unless bundle_check
+-    puts "bundle install"
+-    system('bundle install')
+-  end
+-
+   puts command
+   system('ruby -w -Ilib -Itest test/all.rb')
+ end
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -12,7 +12,6 @@
+   gem_name =='i18n' ? puts("skipping loading the i18n gem ...") : super
+ end
+ 
+-require 'bundler/setup'
+ require 'i18n'
+ require 'mocha'
+ require 'test_declarative'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-i18n.git