[DRE-commits] [asciidoctor] 09/10: package-version.patch: allow loading version without lib/ available
Antonio Terceiro
terceiro at moszumanska.debian.org
Tue Nov 17 16:38:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository asciidoctor.
commit 8e1e383d6459c7d77b2328c6c08e6bace3fdb1c5
Author: Antonio Terceiro <terceiro at debian.org>
Date: Tue Nov 17 14:18:12 2015 -0200
package-version.patch: allow loading version without lib/ available
---
debian/changelog | 1 +
debian/patches/package-version.patch | 27 +++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 29 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 538266d..537a421 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ asciidoctor (1.5.3-1) unstable; urgency=medium
in Debian
- slim-test.patch: fix code logic to not depend on when the slim library
has been loaded.
+ - package-version.patch: allow loading gemspec without lib/ available
* Added ruby-thread-safe to Build-Depends:
-- Antonio Terceiro <terceiro at debian.org> Tue, 17 Nov 2015 11:47:27 -0200
diff --git a/debian/patches/package-version.patch b/debian/patches/package-version.patch
new file mode 100644
index 0000000..5d30664
--- /dev/null
+++ b/debian/patches/package-version.patch
@@ -0,0 +1,27 @@
+Description: gemspec: load asciidoctor/version from system is not available locally
+ This fixes running tests under autopkgtest
+Author: Antonio Terceiro <terceiro at debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2015-11-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/asciidoctor.gemspec
++++ b/asciidoctor.gemspec
+@@ -1,5 +1,6 @@
+ # -*- encoding: utf-8 -*-
+-require File.expand_path '../lib/asciidoctor/version', __FILE__
++$LOAD_PATH << File.expand_path('../lib', __FILE__)
++require 'asciidoctor/version'
+
+ Gem::Specification.new do |s|
+ s.name = 'asciidoctor'
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,4 +1,5 @@
+-require File.expand_path '../lib/asciidoctor/version', __FILE__
++$LOAD_PATH << File.expand_path('../lib', __FILE__)
++require 'asciidoctor/version'
+
+ def prepare_test_env
+ # rather than hardcoding gc settings in test task,
diff --git a/debian/patches/series b/debian/patches/series
index 4b577c1..c6c9e0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ data_path.patch
lib_directory_in_tests.patch
skip-asciimath-test.patch
slim-test.patch
+package-version.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/asciidoctor.git
More information about the Pkg-ruby-extras-commits
mailing list