[DRE-commits] [ruby-kramdown] 03/03: Drop patch: merge upstream

Youhei SASAKI uwabami-guest at moszumanska.debian.org
Mon Aug 11 18:38:43 UTC 2014


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

uwabami-guest pushed a commit to annotated tag debian/1.4.1-1
in repository ruby-kramdown.

commit 51e1188e80af752e47b54a012c3c8aff72b39e97
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Aug 12 03:37:46 2014 +0900

    Drop patch: merge upstream
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0001-Fix_StringEx_Require.patch | 20 --------------------
 debian/patches/series                          |  1 -
 2 files changed, 21 deletions(-)

diff --git a/debian/patches/0001-Fix_StringEx_Require.patch b/debian/patches/0001-Fix_StringEx_Require.patch
deleted file mode 100644
index 573c904..0000000
--- a/debian/patches/0001-Fix_StringEx_Require.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian Ruby Extras Maintainers
- <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Date: Tue, 20 Aug 2013 05:04:25 +0900
-Subject: Fix_StringEx_Require
-
----
- lib/kramdown/utils/unidecoder.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- ruby-kramdown.orig/lib/kramdown/utils/unidecoder.rb
-+++ ruby-kramdown/lib/kramdown/utils/unidecoder.rb
-@@ -15,7 +15,7 @@
-     # Provides the ability to tranliterate Unicode strings into plain ASCII ones.
-     module Unidecoder
- 
--      gem 'stringex' if defined?(Gem)
-+      require 'stringex'
-       path = $:.find {|dir| File.directory?(File.join(File.expand_path(dir), "stringex", "unidecoder_data"))}
- 
-       if RUBY_VERSION <= '1.8.6' || !path
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c37beea..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix_StringEx_Require.patch

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



More information about the Pkg-ruby-extras-commits mailing list