[DRE-commits] [jekyll] 05/07: Refresh patches for newer upstream version.

[Youhei SASAKI]

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

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

commit 2dce2efb722d8c1abef481c2781d4af39d2b7f8d
Author: Harlan Lieberman-Berg <H.LiebermanBerg at gmail.com>
Date:   Fri May 30 23:33:06 2014 +0000

    Refresh patches for newer upstream version.
---
 .../patches/0001-Drop-SimpleCov-dependencies.patch | 25 +++++++++++++---------
 .../patches/0004-Remove-Launchy-Dependencies.patch | 10 +++------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/debian/patches/0001-Drop-SimpleCov-dependencies.patch b/debian/patches/0001-Drop-SimpleCov-dependencies.patch
index 1d14a73..d8e9bfe 100644
--- a/debian/patches/0001-Drop-SimpleCov-dependencies.patch
+++ b/debian/patches/0001-Drop-SimpleCov-dependencies.patch
@@ -7,20 +7,25 @@ Subject: Drop SimpleCov dependencies
  test/helper.rb | 9 ---------
  1 file changed, 9 deletions(-)
 
-diff --git a/test/helper.rb b/test/helper.rb
-index 5eb4193..00f83a5 100644
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -1,12 +1,3 @@
--if RUBY_VERSION > '1.9'
--  require 'simplecov'
--  require 'simplecov-gem-adapter'
--  SimpleCov.start('gem')
+@@ -1,10 +1,3 @@
+-require 'simplecov'
+-require 'simplecov-gem-adapter'
+-SimpleCov.start('gem')
 -
--  require 'coveralls'
--  Coveralls.wear_merged!
--end
+-require 'coveralls'
+-Coveralls.wear_merged!
 -
  require 'rubygems'
  require 'test/unit'
  require 'ostruct'
+--- a/features/support/env.rb
++++ b/features/support/env.rb
+@@ -1,6 +1,3 @@
+-require 'coveralls'
+-Coveralls.wear_merged!
+-
+ require 'fileutils'
+ require 'rr'
+ require 'test/unit'
diff --git a/debian/patches/0004-Remove-Launchy-Dependencies.patch b/debian/patches/0004-Remove-Launchy-Dependencies.patch
index 7c9aa23..cc0f7d9 100644
--- a/debian/patches/0004-Remove-Launchy-Dependencies.patch
+++ b/debian/patches/0004-Remove-Launchy-Dependencies.patch
@@ -8,11 +8,9 @@ Subject: Remove Launchy Dependencies
  jekyll.gemspec | 1 -
  2 files changed, 1 insertion(+), 4 deletions(-)
 
-diff --git a/Rakefile b/Rakefile
-index b8eb85a..f0a504d 100644
 --- a/Rakefile
 +++ b/Rakefile
-@@ -137,14 +137,12 @@ end
+@@ -121,14 +121,12 @@
  namespace :site do
    desc "Generate and view the site locally"
    task :preview do
@@ -28,13 +26,11 @@ index b8eb85a..f0a504d 100644
      end
  
      # Generate the site in server mode.
-diff --git a/jekyll.gemspec b/jekyll.gemspec
-index c12b4a7..3fbdf4c 100644
 --- a/jekyll.gemspec
 +++ b/jekyll.gemspec
-@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
+@@ -50,7 +50,6 @@
    s.add_development_dependency('RedCloth', "~> 4.2")
-   s.add_development_dependency('kramdown', "~> 1.2")
+   s.add_development_dependency('maruku', "0.7.0")
    s.add_development_dependency('rdiscount', "~> 1.6")
 -  s.add_development_dependency('launchy', "~> 2.3")
    s.add_development_dependency('simplecov', "~> 0.7")

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