[DRE-commits] [asciidoctor] 03/10: drop/refresh patches

Tue Nov 17 16:38:34 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 c579213ef99cad92876f2e47acc6419fd28155c8
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Nov 16 17:34:53 2015 -0200

    drop/refresh patches
---
 debian/changelog                                  |  6 +++++
 debian/patches/data_path.patch                    |  8 +++----
 debian/patches/lib_directory_in_tests.patch       | 20 +++++++---------
 debian/patches/require-asciidoctor.patch          | 20 ----------------
 debian/patches/series                             |  2 --
 debian/patches/update-asciidoctor.1-manpage.patch | 29 -----------------------
 6 files changed, 17 insertions(+), 68 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9548b2d..11cb2c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 asciidoctor (1.5.3-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Patches removed (already applied upstream):
+    - require-asciidoctor.patch
+    - update-asciidoctor.1-manpage.patch
+  * Patches refreshed:
+    - data_path.patch
+    - lib_directory_in_tests.patch
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 16 Nov 2015 17:30:21 -0200
 
diff --git a/debian/patches/data_path.patch b/debian/patches/data_path.patch
index e48ccb8..b181931 100644
--- a/debian/patches/data_path.patch
+++ b/debian/patches/data_path.patch
@@ -1,11 +1,9 @@
 From: Guillaume Grossetie <ggrossetie at gmail.com>
 Subject: Load data from /usr/share/asciidoctor path
 Bug-Debian: https://bugs.debian.org/788052
-Index: asciidoctor/lib/asciidoctor.rb
-===================================================================
---- asciidoctor.orig/lib/asciidoctor.rb	2015-06-17 20:32:38.975724893 +0200
-+++ asciidoctor/lib/asciidoctor.rb	2015-06-17 20:32:54.199725139 +0200
-@@ -179,7 +179,7 @@
+--- a/lib/asciidoctor.rb
++++ b/lib/asciidoctor.rb
+@@ -178,7 +178,7 @@ module Asciidoctor
    LIB_PATH = ::File.join ROOT_PATH, 'lib'
  
    # The absolute data path of the Asciidoctor RubyGem
diff --git a/debian/patches/lib_directory_in_tests.patch b/debian/patches/lib_directory_in_tests.patch
index a3aac26..22ee4e2 100644
--- a/debian/patches/lib_directory_in_tests.patch
+++ b/debian/patches/lib_directory_in_tests.patch
@@ -1,10 +1,8 @@
 From: Guillaume Grossetie <ggrossetie at gmail.com>
 Subject: Exclude lib/ directory from tests
-Index: asciidoctor/Rakefile
-===================================================================
---- asciidoctor.orig/Rakefile	2015-05-27 21:24:17.003082432 +0200
-+++ asciidoctor/Rakefile	2015-06-19 21:34:30.198079043 +0200
-@@ -20,7 +20,7 @@
+--- a/Rakefile
++++ b/Rakefile
+@@ -20,7 +20,7 @@ begin
    Rake::TestTask.new(:test) do |test|
      prepare_test_env
      puts %(LANG: #{ENV['LANG']}) if ENV.key? 'TRAVIS_BUILD_ID'
@@ -13,16 +11,14 @@ Index: asciidoctor/Rakefile
      test.pattern = 'test/**/*_test.rb'
      test.verbose = true
      test.warning = true
-Index: asciidoctor/test/test_helper.rb
-===================================================================
---- asciidoctor.orig/test/test_helper.rb	2015-05-27 21:24:17.087082433 +0200
-+++ asciidoctor/test/test_helper.rb	2015-06-19 21:34:06.406078658 +0200
-@@ -8,7 +8,7 @@
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -8,7 +8,7 @@ end
  
  require 'simplecov' if ENV['COVERAGE'] == 'true'
  
 -require File.join(ASCIIDOCTOR_PROJECT_DIR, 'lib', 'asciidoctor')
 +require 'asciidoctor'
  
- require 'minitest/autorun'
- require 'socket'
+ # NOTE we require minitest libraries explicitly to avoid a superfluous warning
+ require 'minitest/unit'
diff --git a/debian/patches/require-asciidoctor.patch b/debian/patches/require-asciidoctor.patch
deleted file mode 100644
index 73c97f3..0000000
--- a/debian/patches/require-asciidoctor.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Guillaume Grossetie <ggrossetie at gmail.com>
-Subject: Require asciidoctor with a non relative path in bin/asciidoctor
-Bug-Debian: https://bugs.debian.org/764664
-Index: asciidoctor/bin/asciidoctor
-===================================================================
---- asciidoctor.orig/bin/asciidoctor	2015-06-15 22:07:39.149451578 +0200
-+++ asciidoctor/bin/asciidoctor	2015-06-15 22:17:06.909460761 +0200
-@@ -2,7 +2,11 @@
- 
- require 'rubygems' if RUBY_VERSION < '1.9'
- 
--require File.join File.dirname(__FILE__), '../lib/asciidoctor'
-+if File.exist?(asciidoctor_lib_path = File.join(File.dirname(__FILE__), '../lib/asciidoctor'))
-+  require asciidoctor_lib_path
-+else
-+  require 'asciidoctor'
-+end
- require 'asciidoctor/cli'
- 
- invoker = Asciidoctor::Cli::Invoker.new ARGV
diff --git a/debian/patches/series b/debian/patches/series
index 416ae1d..02cf356 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-update-asciidoctor.1-manpage.patch
-require-asciidoctor.patch
 data_path.patch
 lib_directory_in_tests.patch
diff --git a/debian/patches/update-asciidoctor.1-manpage.patch b/debian/patches/update-asciidoctor.1-manpage.patch
deleted file mode 100644
index ebdd848..0000000
--- a/debian/patches/update-asciidoctor.1-manpage.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Guillaume Grossetie <ggrossetie at gmail.com>
-Subject: Update asciidoctor.1 manpage
- * Format date dd/MM/yyyy
- * Add "NAME" section
-Index: asciidoctor/man/asciidoctor.1
-===================================================================
---- asciidoctor.orig/man/asciidoctor.1	2015-05-29 20:26:13.404432130 +0200
-+++ asciidoctor/man/asciidoctor.1	2015-05-29 20:29:27.112435262 +0200
-@@ -2,16 +2,18 @@
- .\"     Title: asciidoctor
- .\"    Author: Dan Allen
- .\" Generator: Asciidoctor 1.5.2
--.\"      Date: 2014-11-27
-+.\"      Date: 27/11/2014
- .\"    Manual: Asciidoctor Manual
- .\"    Source: Asciidoctor 1.5.2
- .\"  Language: English
- .\"
--.TH "ASCIIDOCTOR" "1" "2014-11-27" "Asciidoctor 1\&.5\&.2" "Asciidoctor Manual"
-+.TH "ASCIIDOCTOR" "1" "27/11/2014" "Asciidoctor 1\&.5\&.2" "Asciidoctor Manual"
- .ie \n(.g .ds Aq \(aq
- .el       .ds Aq '
- .nh
- .ad l
-+.SH "NAME"
-+asciidoctor \- converts AsciiDoc source files to HTML, DocBook and other formats
- .SH "SYNOPSIS"
- .sp
- \fBasciidoctor\fR [\fIOPTION\fR]... \fIFILE\fR...

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

