[DRE-commits] [bundler] 04/06: Patch gemspec to not use git, as a gem2deb workaround

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository bundler.

commit 1a8213f7e0e6505c4aa103f626b4c1ee898e8105
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Sun May 1 19:07:08 2016 +0000

    Patch gemspec to not use git, as a gem2deb workaround
---
 debian/patches/no-git-in-gemspec | 25 +++++++++++++++++++++++++
 debian/patches/series            |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/no-git-in-gemspec b/debian/patches/no-git-in-gemspec
new file mode 100644
index 0000000..5d7720c
--- /dev/null
+++ b/debian/patches/no-git-in-gemspec
@@ -0,0 +1,25 @@
+Description: replace call to git ls-files with Dir.glob
+Forwarded: not-needed
+Origin: vendor
+Author: Christian Hofstaedtler <zeha at debian.org>
+
+It appears gem2deb munges the gemspec file with a static Encoding of US-ASCII,
+but our gemspec is encoded in UTF-8; this causes gem2deb to fail. Avoid the
+gem2deb munging by not calling git from the gemspec.
+
+Index: bundler/bundler.gemspec
+===================================================================
+--- bundler.orig/bundler.gemspec
++++ bundler/bundler.gemspec
+@@ -24,10 +24,7 @@ Gem::Specification.new do |s|
+   s.add_development_dependency "ronn",       "~> 0.7.3"
+   s.add_development_dependency "rspec",      "~> 3.0"
+ 
+-  s.files = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
+-  # we don't check in man pages, but we need to ship them because
+-  # we use them to generate the long-form help for each command.
+-  s.files += Dir.glob("lib/bundler/man/**/*")
++  s.files = Dir.glob("lib/**") + Dir.glob("exe/*") + Dir.glob("*.md") + Dir.glob("man/*")
+ 
+   s.bindir        = "exe"
+   s.executables   = %w(bundle bundler)
diff --git a/debian/patches/series b/debian/patches/series
index 909ee74..f30ce7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+no-git-in-gemspec
 unvendorize

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