[DRE-commits] [ruby-wikicloth] 03/05: Refresh patches

Per Andersson avtobiff at moszumanska.debian.org
Fri Oct 9 20:24:30 UTC 2015


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

avtobiff pushed a commit to branch master
in repository ruby-wikicloth.

commit 7e6f422c5974333cbf81a6be6a7e254ba4ca9727
Author: Per Andersson <avtobiff at gmail.com>
Date:   Fri Oct 9 21:29:02 2015 +0200

    Refresh patches
    
    - Ignore code coverage test
    - Use i18n gem instead of wikicloth i18n
---
 debian/changelog                                                 | 3 +++
 debian/patches/0003-Ignore-code-coverage-test.patch              | 4 +---
 debian/patches/0005-Use-i18n-gem-instead-of-wikicloth-i18n.patch | 4 +---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 96f7b57..e5e3c4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ ruby-wikicloth (0.8.1+dfsg-3) UNRELEASED; urgency=medium
     - Comment out rubygems requires
     - Explicit gem versioning
     - Rearrange test/unit require
+  * Refresh patches
+    - Ignore code coverage test
+    - Use i18n gem instead of wikicloth i18n
 
  -- Sebastien Badia <seb at sebian.fr>  Wed, 08 Apr 2015 18:18:00 +0200
 
diff --git a/debian/patches/0003-Ignore-code-coverage-test.patch b/debian/patches/0003-Ignore-code-coverage-test.patch
index d569839..4256c23 100644
--- a/debian/patches/0003-Ignore-code-coverage-test.patch
+++ b/debian/patches/0003-Ignore-code-coverage-test.patch
@@ -6,11 +6,9 @@ Subject: Ignore code coverage test
  Rakefile |   30 +++++++++++++++---------------
  1 file changed, 15 insertions(+), 15 deletions(-)
 
-diff --git a/Rakefile b/Rakefile
-index c402d97..2d04725 100644
 --- a/Rakefile
 +++ b/Rakefile
-@@ -11,21 +11,21 @@ Rake::TestTask.new(:test) do |test|
+@@ -11,21 +11,21 @@
    test.verbose = true
  end
  
diff --git a/debian/patches/0005-Use-i18n-gem-instead-of-wikicloth-i18n.patch b/debian/patches/0005-Use-i18n-gem-instead-of-wikicloth-i18n.patch
index c1dd876..39a1b4f 100644
--- a/debian/patches/0005-Use-i18n-gem-instead-of-wikicloth-i18n.patch
+++ b/debian/patches/0005-Use-i18n-gem-instead-of-wikicloth-i18n.patch
@@ -9,12 +9,10 @@ See http://github.com/nricciar/wikicloth/issues/61
  lib/wikicloth.rb |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/lib/wikicloth.rb b/lib/wikicloth.rb
-index bd1af7c..fb62352 100644
 --- a/lib/wikicloth.rb
 +++ b/lib/wikicloth.rb
 @@ -1,6 +1,8 @@
- #require 'rubygems' if RUBY_VERSION < '1.9'
+ require 'rubygems' if RUBY_VERSION < '1.9'
  require 'jcode' if RUBY_VERSION < '1.9'
  require 'builder'
 +# debian: use i18n, wikicloth/i18n seems broken

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



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