[DRE-commits] [ruby-rouge] 02/06: Refresh patches

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository ruby-rouge.

commit 0707a083dd645859053ba1544bd768cfced3d240
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Aug 28 13:08:17 2017 +0900

    Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0001_Fix_PATH_rougify.patch         | 25 ++++++++++++++++++++++
 ..._share.patch => 0002_Fix_location_of_demo.path} | 16 +++++++++-----
 debian/patches/fix_path_rougify.patch              | 22 -------------------
 debian/patches/series                              |  4 ++--
 4 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/debian/patches/0001_Fix_PATH_rougify.patch b/debian/patches/0001_Fix_PATH_rougify.patch
new file mode 100644
index 0000000..eb06c0e
--- /dev/null
+++ b/debian/patches/0001_Fix_PATH_rougify.patch
@@ -0,0 +1,25 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Mon, 28 Aug 2017 13:08:19 +0900
+Subject: Fix PATH: rougify
+
+---
+ bin/rougify | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/bin/rougify b/bin/rougify
+index a7d7df2..0cf4b9d 100755
+--- a/bin/rougify
++++ b/bin/rougify
+@@ -1,9 +1,8 @@
+ #!/usr/bin/env ruby
+ 
+ require 'pathname'
+-ROOT_DIR = Pathname.new(__FILE__).dirname.parent
+-load ROOT_DIR.join('lib/rouge.rb')
+-load ROOT_DIR.join('lib/rouge/cli.rb')
++require 'rouge'
++require 'rouge/cli'
+ Signal.trap('PIPE', 'SYSTEM_DEFAULT') if Signal.list.include? 'PIPE'
+ 
+ begin
diff --git a/debian/patches/demos_in_usr_share.patch b/debian/patches/0002_Fix_location_of_demo.path
similarity index 51%
rename from debian/patches/demos_in_usr_share.patch
rename to debian/patches/0002_Fix_location_of_demo.path
index 32ae089..6bbb446 100644
--- a/debian/patches/demos_in_usr_share.patch
+++ b/debian/patches/0002_Fix_location_of_demo.path
@@ -1,11 +1,17 @@
-Description: install demo files under /usr/share/ruby-rouge/demos
-Forwarded: no
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2015-07-20
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Mon, 28 Aug 2017 13:08:19 +0900
+Subject: Fix demo's location
 
+---
+ lib/rouge/lexer.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/rouge/lexer.rb b/lib/rouge/lexer.rb
+index b554f72..bca41e0 100644
 --- a/lib/rouge/lexer.rb
 +++ b/lib/rouge/lexer.rb
-@@ -87,7 +87,7 @@
+@@ -102,7 +102,7 @@ module Rouge
        def demo_file(arg=:absent)
          return @demo_file = Pathname.new(arg) unless arg == :absent
  
diff --git a/debian/patches/fix_path_rougify.patch b/debian/patches/fix_path_rougify.patch
deleted file mode 100644
index 11871c5..0000000
--- a/debian/patches/fix_path_rougify.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: fix paths for Ruby rouge library in rougify
- Let the interpreter find the files.
- The relative paths are not correct anymore when files are installed
- systemwide.
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: no
-Last-Update: 2015-07-20
-
---- a/bin/rougify
-+++ b/bin/rougify
-@@ -1,9 +1,8 @@
- #!/usr/bin/env ruby
- 
- require 'pathname'
--ROOT_DIR = Pathname.new(__FILE__).dirname.parent
--load ROOT_DIR.join('lib/rouge.rb')
--load ROOT_DIR.join('lib/rouge/cli.rb')
-+require 'rouge'
-+require 'rouge/cli'
- 
- begin
-   Rouge::CLI.parse(ARGV).run
diff --git a/debian/patches/series b/debian/patches/series
index 1b6a4b4..fbd81fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-fix_path_rougify.patch
-demos_in_usr_share.patch
+0001_Fix_PATH_rougify.patch
+0002_Fix_location_of_demo.path

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