[DRE-commits] [jekyll] 02/05: 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 jekyll.

commit b6bdc92077177702be8229771ba58611f786062e
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Wed Jul 30 18:00:03 2014 +0900

    Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 .../patches/0001-Drop-SimpleCov-dependencies.patch | 29 +++++++++++-----------
 .../patches/0004-Remove-Launchy-Dependencies.patch | 20 +++++++--------
 debian/patches/series                              |  1 -
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/debian/patches/0001-Drop-SimpleCov-dependencies.patch b/debian/patches/0001-Drop-SimpleCov-dependencies.patch
index d8e9bfe..ef2308d 100644
--- a/debian/patches/0001-Drop-SimpleCov-dependencies.patch
+++ b/debian/patches/0001-Drop-SimpleCov-dependencies.patch
@@ -7,25 +7,24 @@ Subject: Drop SimpleCov dependencies
  test/helper.rb | 9 ---------
  1 file changed, 9 deletions(-)
 
---- a/test/helper.rb
-+++ b/test/helper.rb
-@@ -1,10 +1,3 @@
+--- jekyll.orig/test/helper.rb
++++ jekyll/test/helper.rb
+@@ -1,7 +1,3 @@
 -require 'simplecov'
 -require 'simplecov-gem-adapter'
 -SimpleCov.start('gem')
 -
--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'
+--- jekyll.orig/jekyll.gemspec
++++ jekyll/jekyll.gemspec
+@@ -56,8 +56,6 @@
+   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")
+-  s.add_development_dependency('simplecov-gem-adapter', "~> 1.0.1")
+   s.add_development_dependency('mime-types', "~> 1.5")
+   s.add_development_dependency('activesupport', '~> 3.2.13')
+   s.add_development_dependency('jekyll_test_plugin')
diff --git a/debian/patches/0004-Remove-Launchy-Dependencies.patch b/debian/patches/0004-Remove-Launchy-Dependencies.patch
index cc0f7d9..8e7cb8f 100644
--- a/debian/patches/0004-Remove-Launchy-Dependencies.patch
+++ b/debian/patches/0004-Remove-Launchy-Dependencies.patch
@@ -8,9 +8,9 @@ Subject: Remove Launchy Dependencies
  jekyll.gemspec | 1 -
  2 files changed, 1 insertion(+), 4 deletions(-)
 
---- a/Rakefile
-+++ b/Rakefile
-@@ -121,14 +121,12 @@
+--- jekyll.orig/Rakefile
++++ jekyll/Rakefile
+@@ -133,14 +133,12 @@
  namespace :site do
    desc "Generate and view the site locally"
    task :preview do
@@ -26,13 +26,13 @@ Subject: Remove Launchy Dependencies
      end
  
      # Generate the site in server mode.
---- a/jekyll.gemspec
-+++ b/jekyll.gemspec
-@@ -50,7 +50,6 @@
+--- jekyll.orig/jekyll.gemspec
++++ jekyll/jekyll.gemspec
+@@ -55,7 +55,6 @@
    s.add_development_dependency('RedCloth', "~> 4.2")
-   s.add_development_dependency('maruku', "0.7.0")
+   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")
-   s.add_development_dependency('simplecov-gem-adapter', "~> 1.0.1")
-   s.add_development_dependency('coveralls', "~> 0.7.0")
+   s.add_development_dependency('mime-types', "~> 1.5")
+   s.add_development_dependency('activesupport', '~> 3.2.13')
+   s.add_development_dependency('jekyll_test_plugin')
diff --git a/debian/patches/series b/debian/patches/series
index f3c2b5a..6d841a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 0002-Drop-RubyGems-Depends.patch
 0003-Downcase-RedCloth.patch
 0004-Remove-Launchy-Dependencies.patch
-0005-Remove-newline-for-newer-Maruku.patch
 0006-Fix-relative-LOAD_PATH-in-test_redcloth.patch
 0007-Add-newline-in-test_coffee_script.patch
 0008-Update-test-for-newer-RDiscount.patch

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