[DRE-commits] [ruby-pygments.rb] 04/05: No relative path to load the version from gemspec

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-pygments.rb.

commit 28032768015327c3402548aaf8b2ac43ba80b380
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Jul 8 14:20:56 2016 +0200

    No relative path to load the version from gemspec
---
 debian/changelog                                      |  2 ++
 debian/patches/0001-Remove-gemspec-git-ls-files.patch | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2c87e88..b3e8a67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ ruby-pygments.rb (0.6.3-2) unstable; urgency=medium
   * Add patch to work with pygments 2.1+ (Closes: #830400)
   * Bump Standards-Version to 3.9.8
   * Set Testsuite to autopkgtest-pkg-ruby
+  * Amend 0001-Remove-gemspec-git-ls-files.patch to not use relative path to
+    load the version number from gemspecs  
 
  -- Cédric Boutillier <boutil at debian.org>  Fri, 08 Jul 2016 13:49:11 +0200
 
diff --git a/debian/patches/0001-Remove-gemspec-git-ls-files.patch b/debian/patches/0001-Remove-gemspec-git-ls-files.patch
index ac65302..3fe1071 100644
--- a/debian/patches/0001-Remove-gemspec-git-ls-files.patch
+++ b/debian/patches/0001-Remove-gemspec-git-ls-files.patch
@@ -1,5 +1,6 @@
 Description:Remove gemspec git ls files.patch
  Removed call to 'git ls-files' from gem spec.
+ Use also a require without path to load the version number
 Subject:Remove gemspec git ls-files
 From:Per Andersson <avtobiff at gmail.com>
 ---
@@ -8,7 +9,17 @@ From:Per Andersson <avtobiff at gmail.com>
 
 --- a/pygments.rb.gemspec
 +++ b/pygments.rb.gemspec
-@@ -21,5 +21,5 @@
+@@ -1,4 +1,8 @@
+-require File.expand_path('../lib/pygments/version', __FILE__)
++version_file = File.expand_path('../lib/pygments/version.rb', __FILE__)
++if not File.exists?(version_file)
++  version_file = 'pygments/version'
++end
++require version_file
+ 
+ Gem::Specification.new do |s|
+   s.name = 'pygments.rb'
+@@ -21,5 +25,5 @@
    # s.extensions = ['ext/extconf.rb']
    s.require_paths = ['lib']
  

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