[DRE-commits] [asciidoctor] 02/06: Refresh patches ; delete honour_SOURCE_DATE_EPOCH.patch (merged upstream)
Lucas Nussbaum
lucas at moszumanska.debian.org
Sun Jul 2 11:12:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository asciidoctor.
commit d47af6dbf6a50de075e5836f966c7b4d4bdeac35
Author: Lucas Nussbaum <lucas at debian.org>
Date: Sun Jul 2 11:29:09 2017 +0200
Refresh patches ; delete honour_SOURCE_DATE_EPOCH.patch (merged upstream)
---
debian/patches/data_path.patch | 2 +-
debian/patches/honour_SOURCE_DATE_EPOCH.patch | 45 ---------------------------
debian/patches/lib_directory_in_tests.patch | 2 +-
debian/patches/package-version.patch | 2 +-
debian/patches/series | 1 -
debian/patches/skip-asciimath-test.patch | 16 ++++------
debian/patches/skip-unreadable-file.patch | 8 ++---
7 files changed, 12 insertions(+), 64 deletions(-)
diff --git a/debian/patches/data_path.patch b/debian/patches/data_path.patch
index b181931..b8676ac 100644
--- a/debian/patches/data_path.patch
+++ b/debian/patches/data_path.patch
@@ -3,7 +3,7 @@ Subject: Load data from /usr/share/asciidoctor path
Bug-Debian: https://bugs.debian.org/788052
--- a/lib/asciidoctor.rb
+++ b/lib/asciidoctor.rb
-@@ -178,7 +178,7 @@ module Asciidoctor
+@@ -175,7 +175,7 @@ module Asciidoctor
LIB_PATH = ::File.join ROOT_PATH, 'lib'
# The absolute data path of the Asciidoctor RubyGem
diff --git a/debian/patches/honour_SOURCE_DATE_EPOCH.patch b/debian/patches/honour_SOURCE_DATE_EPOCH.patch
deleted file mode 100644
index 2fc6b21..0000000
--- a/debian/patches/honour_SOURCE_DATE_EPOCH.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Honour the SOURCE_DATE_EPOCH environment variable
- Honour the SOURCE_DATE_EPOCH environment variable, so that output documents'
- timestamp is set to last debian/changelog entry when building packages that
- use asciidoctor in their building process.
-Author: Alexis Bienvenüe <pado at passoire.fr>
-Forwarded: https://github.com/asciidoctor/asciidoctor/pull/1721
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=820435
-Reviewed-by: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2016-06-08
-
-
-Index: asciidoctor-1.5.4/lib/asciidoctor/document.rb
-===================================================================
---- asciidoctor-1.5.4.orig/lib/asciidoctor/document.rb
-+++ asciidoctor-1.5.4/lib/asciidoctor/document.rb
-@@ -401,7 +401,11 @@ class Document < AbstractBlock
- #attrs['infile'] = attrs['docfile']
-
- # dynamic intrinstic attribute values
-- now = ::Time.now
-+ if ENV['SOURCE_DATE_EPOCH'].nil?
-+ now = ::Time.now
-+ else
-+ now = ::Time.at(ENV['SOURCE_DATE_EPOCH'].to_i).gmtime
-+ end
- localdate = (attrs['localdate'] ||= now.strftime('%Y-%m-%d'))
- unless (localtime = attrs['localtime'])
- begin
-Index: asciidoctor-1.5.4/lib/asciidoctor.rb
-===================================================================
---- asciidoctor-1.5.4.orig/lib/asciidoctor.rb
-+++ asciidoctor-1.5.4/lib/asciidoctor.rb
-@@ -1308,7 +1308,11 @@ module Asciidoctor
- if ::File === input
- # TODO cli checks if input path can be read and is file, but might want to add check to API
- input_path = ::File.expand_path input.path
-- input_mtime = input.mtime
-+ if ENV['SOURCE_DATE_EPOCH'].nil?
-+ input_mtime = input.mtime
-+ else
-+ input_mtime = ::Time.at(ENV['SOURCE_DATE_EPOCH'].to_i).gmtime
-+ end
- lines = input.readlines
- # hold off on setting infile and indir until we get a better sense of their purpose
- attributes['docfile'] = input_path
diff --git a/debian/patches/lib_directory_in_tests.patch b/debian/patches/lib_directory_in_tests.patch
index 298f43a..f8c5ac2 100644
--- a/debian/patches/lib_directory_in_tests.patch
+++ b/debian/patches/lib_directory_in_tests.patch
@@ -19,6 +19,6 @@ Subject: Exclude lib/ directory from tests
-require File.join(ASCIIDOCTOR_PROJECT_DIR, 'lib', 'asciidoctor')
+require 'asciidoctor'
-
+
require 'socket'
require 'nokogiri'
diff --git a/debian/patches/package-version.patch b/debian/patches/package-version.patch
index 5d30664..81b0676 100644
--- a/debian/patches/package-version.patch
+++ b/debian/patches/package-version.patch
@@ -13,9 +13,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-require File.expand_path '../lib/asciidoctor/version', __FILE__
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
+require 'asciidoctor/version'
+ require 'open3' unless defined? Open3
Gem::Specification.new do |s|
- s.name = 'asciidoctor'
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,5 @@
diff --git a/debian/patches/series b/debian/patches/series
index 49cacf6..ea7f6da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ lib_directory_in_tests.patch
skip-asciimath-test.patch
package-version.patch
skip-unreadable-file.patch
-honour_SOURCE_DATE_EPOCH.patch
diff --git a/debian/patches/skip-asciimath-test.patch b/debian/patches/skip-asciimath-test.patch
index 433df77..687f00c 100644
--- a/debian/patches/skip-asciimath-test.patch
+++ b/debian/patches/skip-asciimath-test.patch
@@ -5,11 +5,9 @@ Forwarded: not-needed
Last-Update: 2015-11-17
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: asciidoctor/test/blocks_test.rb
-===================================================================
---- asciidoctor.orig/test/blocks_test.rb 2016-02-29 18:11:34.879628814 +0100
-+++ asciidoctor/test/blocks_test.rb 2016-02-29 18:11:34.879628814 +0100
-@@ -1278,6 +1278,7 @@
+--- a/test/blocks_test.rb
++++ b/test/blocks_test.rb
+@@ -1278,6 +1278,7 @@ sqrt(3x-1)+(1+x)^2 < y
end
test 'should render asciimath block in textobject of equation in DocBook backend' do
@@ -17,11 +15,9 @@ Index: asciidoctor/test/blocks_test.rb
input = <<-'EOS'
[asciimath]
++++
-Index: asciidoctor/test/substitutions_test.rb
-===================================================================
---- asciidoctor.orig/test/substitutions_test.rb 2016-02-29 18:11:59.355508631 +0100
-+++ asciidoctor/test/substitutions_test.rb 2016-02-29 18:12:41.651300909 +0100
-@@ -1374,6 +1374,7 @@
+--- a/test/substitutions_test.rb
++++ b/test/substitutions_test.rb
+@@ -1374,6 +1374,7 @@ EOS
#end
test 'should convert asciimath macro content to MathML when asciimath gem is available' do
diff --git a/debian/patches/skip-unreadable-file.patch b/debian/patches/skip-unreadable-file.patch
index d5c36d2..daece62 100644
--- a/debian/patches/skip-unreadable-file.patch
+++ b/debian/patches/skip-unreadable-file.patch
@@ -5,11 +5,9 @@ Origin: vendor
Forwarded: no
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: asciidoctor/test/reader_test.rb
-===================================================================
---- asciidoctor.orig/test/reader_test.rb 2016-02-29 17:15:14.900028599 +0100
-+++ asciidoctor/test/reader_test.rb 2016-02-29 18:16:05.506299075 +0100
-@@ -618,6 +618,7 @@
+--- a/test/reader_test.rb
++++ b/test/reader_test.rb
+@@ -618,6 +618,7 @@ trailing content
end
test 'unreadable file referenced by include directive is replaced by warning' do
--
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