[DRE-commits] [jekyll] 04/12: Add patch: Replace git execution from gemspec

Youhei SASAKI uwabami-guest at moszumanska.debian.org
Sun Dec 27 14:49:36 UTC 2015


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

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

commit fbb82832ac5820ceeed64ad8298d400996a6490a
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Dec 7 01:40:47 2015 +0900

    Add patch: Replace git execution from gemspec
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 .../patches/0001-Drop-Ruby-Minitest-Profile.patch  | 34 ++++++++++++
 .../patches/0001-Drop-SimpleCov-dependencies.patch | 30 -----------
 debian/patches/0002-Downgrading-RDoc-as-4.1.patch  | 25 +++++++++
 debian/patches/0002-Drop-RubyGems-Depends.patch    | 48 -----------------
 debian/patches/0003-Downcase-RedCloth.patch        | 24 ---------
 .../patches/0003-Remove-Launchy-Dependencies.patch | 43 +++++++++++++++
 .../patches/0004-Fix-Gemfile-versioning-toml.patch | 22 ++++++++
 .../patches/0004-Remove-Launchy-Dependencies.patch | 38 -------------
 ...05-Fix-Gemfile-dependencies-drop-redgreen.patch | 21 ++++++++
 .../0005-Remove-newline-for-newer-Maruku.patch     | 20 -------
 .../0006-Fix-Gemfile-versioning-pygments.rb.patch  | 22 ++++++++
 ...6-Fix-relative-LOAD_PATH-in-test_redcloth.patch | 17 ------
 .../0007-Add-newline-in-test_coffee_script.patch   | 19 -------
 .../patches/0007-Fix-Gemfile-drop-liquid-c.patch   | 19 +++++++
 ...-patch-Replace-git-execution-from-gemspec.patch | 20 +++++++
 .../0008-Update-test-for-newer-RDiscount.patch     | 21 --------
 debian/patches/activesupport4                      | 21 --------
 debian/patches/series                              | 16 +++---
 debian/rules                                       | 62 +++++++++++-----------
 19 files changed, 245 insertions(+), 277 deletions(-)

diff --git a/debian/patches/0001-Drop-Ruby-Minitest-Profile.patch b/debian/patches/0001-Drop-Ruby-Minitest-Profile.patch
new file mode 100644
index 0000000..dc1b2ad
--- /dev/null
+++ b/debian/patches/0001-Drop-Ruby-Minitest-Profile.patch
@@ -0,0 +1,34 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Tue, 3 Nov 2015 10:07:12 +0900
+Subject: Drop Ruby Minitest Profile
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ Gemfile        | 1 -
+ test/helper.rb | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/Gemfile b/Gemfile
+index 9b64809..9ddb15b 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -17,7 +17,6 @@ group :test do
+   gem 'jekyll_test_plugin'
+   gem 'jekyll_test_plugin_malicious'
+   gem 'minitest-reporters'
+-  gem 'minitest-profile'
+   gem 'minitest'
+   gem 'rspec-mocks'
+ 
+diff --git a/test/helper.rb b/test/helper.rb
+index dc02176..25dfc2e 100644
+--- a/test/helper.rb
++++ b/test/helper.rb
+@@ -15,7 +15,6 @@ require 'rubygems'
+ require 'ostruct'
+ require 'minitest/autorun'
+ require 'minitest/reporters'
+-require 'minitest/profile'
+ require 'rspec/mocks'
+ 
+ require 'jekyll'
diff --git a/debian/patches/0001-Drop-SimpleCov-dependencies.patch b/debian/patches/0001-Drop-SimpleCov-dependencies.patch
deleted file mode 100644
index ef2308d..0000000
--- a/debian/patches/0001-Drop-SimpleCov-dependencies.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Debian Ruby Extras Maintainers
- <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Date: Fri, 2 May 2014 15:38:28 +0900
-Subject: Drop SimpleCov dependencies
-
----
- test/helper.rb | 9 ---------
- 1 file changed, 9 deletions(-)
-
---- jekyll.orig/test/helper.rb
-+++ jekyll/test/helper.rb
-@@ -1,7 +1,3 @@
--require 'simplecov'
--require 'simplecov-gem-adapter'
--SimpleCov.start('gem')
--
- require 'rubygems'
- require 'test/unit'
- require 'ostruct'
---- 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/0002-Downgrading-RDoc-as-4.1.patch b/debian/patches/0002-Downgrading-RDoc-as-4.1.patch
new file mode 100644
index 0000000..7fd786f
--- /dev/null
+++ b/debian/patches/0002-Downgrading-RDoc-as-4.1.patch
@@ -0,0 +1,25 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Tue, 3 Nov 2015 10:10:47 +0900
+Subject: Downgrading RDoc as 4.1
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ Gemfile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Gemfile b/Gemfile
+index 9ddb15b..19936a2 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -3,9 +3,9 @@ gemspec name: 'jekyll'
+ 
+ gem 'rake', '~> 10.1'
+ group :development do
+-  gem 'rdoc', '~> 4.2'
++  gem 'rdoc', '~> 4.1'
+   gem 'launchy', '~> 2.3'
+-  gem 'toml', '~> 0.1.0'
++  gem 'toml', '=> 0.1.0'
+   gem 'pry'
+ end
+ 
diff --git a/debian/patches/0002-Drop-RubyGems-Depends.patch b/debian/patches/0002-Drop-RubyGems-Depends.patch
deleted file mode 100644
index 3f058b1..0000000
--- a/debian/patches/0002-Drop-RubyGems-Depends.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Debian Ruby Extras Maintainers
- <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Date: Fri, 2 May 2014 15:38:28 +0900
-Subject: Drop RubyGems Depends
-
----
- lib/jekyll.rb  | 3 ---
- test/helper.rb | 3 +--
- test/suite.rb  | 2 --
- 3 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/lib/jekyll.rb b/lib/jekyll.rb
-index a2a97ba..a81ca7d 100644
---- a/lib/jekyll.rb
-+++ b/lib/jekyll.rb
-@@ -12,9 +12,6 @@ def require_all(path)
-   end
- end
- 
--# rubygems
--require 'rubygems'
--
- # stdlib
- require 'fileutils'
- require 'time'
-diff --git a/test/helper.rb b/test/helper.rb
-index 00f83a5..0e794a2 100644
---- a/test/helper.rb
-+++ b/test/helper.rb
-@@ -1,7 +1,6 @@
--require 'rubygems'
- require 'test/unit'
- require 'ostruct'
--gem 'RedCloth', '>= 4.2.1'
-+require 'redcloth'
- 
- require 'jekyll'
- 
-diff --git a/test/suite.rb b/test/suite.rb
-index 81b6171..60b2f56 100644
---- a/test/suite.rb
-+++ b/test/suite.rb
-@@ -1,5 +1,3 @@
--require 'rubygems'
--gem 'test-unit'
- require 'test/unit'
- 
- # for some reason these tests fail when run via TextMate
diff --git a/debian/patches/0003-Downcase-RedCloth.patch b/debian/patches/0003-Downcase-RedCloth.patch
deleted file mode 100644
index 60de8e0..0000000
--- a/debian/patches/0003-Downcase-RedCloth.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Debian Ruby Extras Maintainers
- <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Date: Fri, 2 May 2014 15:38:29 +0900
-Subject: Downcase RedCloth
-
----
- test/helper.rb | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/test/helper.rb b/test/helper.rb
-index 0e794a2..b9d13fc 100644
---- a/test/helper.rb
-+++ b/test/helper.rb
-@@ -1,10 +1,7 @@
- require 'test/unit'
- require 'ostruct'
- require 'redcloth'
--
- require 'jekyll'
--
--require 'RedCloth'
- require 'rdiscount'
- require 'kramdown'
- require 'redcarpet'
diff --git a/debian/patches/0003-Remove-Launchy-Dependencies.patch b/debian/patches/0003-Remove-Launchy-Dependencies.patch
new file mode 100644
index 0000000..2f68091
--- /dev/null
+++ b/debian/patches/0003-Remove-Launchy-Dependencies.patch
@@ -0,0 +1,43 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Tue, 3 Nov 2015 10:20:17 +0900
+Subject: Remove Launchy Dependencies
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ Gemfile  | 1 -
+ Rakefile | 3 +--
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/Gemfile b/Gemfile
+index 19936a2..eb1f9cb 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -4,7 +4,6 @@ gemspec name: 'jekyll'
+ gem 'rake', '~> 10.1'
+ group :development do
+   gem 'rdoc', '~> 4.1'
+-  gem 'launchy', '~> 2.3'
+   gem 'toml', '=> 0.1.0'
+   gem 'pry'
+ end
+diff --git a/Rakefile b/Rakefile
+index ff473e6..937fd26 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -134,7 +134,6 @@ end
+ namespace :site do
+   desc "Generate and view the site locally"
+   task :preview do
+-    require "launchy"
+     require "jekyll"
+ 
+     # Yep, it's a hack! Wait a few seconds for the Jekyll site to generate and
+@@ -142,7 +141,7 @@ namespace :site do
+     Thread.new do
+       sleep 4
+       puts "Opening in browser..."
+-      Launchy.open("http://localhost:4000")
++      sh "xdg-open http://localhost:4000"
+     end
+ 
+     # Generate the site in server mode.
diff --git a/debian/patches/0004-Fix-Gemfile-versioning-toml.patch b/debian/patches/0004-Fix-Gemfile-versioning-toml.patch
new file mode 100644
index 0000000..dc1b75f
--- /dev/null
+++ b/debian/patches/0004-Fix-Gemfile-versioning-toml.patch
@@ -0,0 +1,22 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Wed, 4 Nov 2015 15:01:18 +0900
+Subject: Fix Gemfile versioning: toml
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ Gemfile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Gemfile b/Gemfile
+index eb1f9cb..63cb1bc 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -4,7 +4,7 @@ gemspec name: 'jekyll'
+ gem 'rake', '~> 10.1'
+ group :development do
+   gem 'rdoc', '~> 4.1'
+-  gem 'toml', '=> 0.1.0'
++  gem 'toml', '~> 0.1.0'
+   gem 'pry'
+ end
+ 
diff --git a/debian/patches/0004-Remove-Launchy-Dependencies.patch b/debian/patches/0004-Remove-Launchy-Dependencies.patch
deleted file mode 100644
index 8e7cb8f..0000000
--- a/debian/patches/0004-Remove-Launchy-Dependencies.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Debian Ruby Extras Maintainers
- <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Date: Fri, 2 May 2014 15:38:29 +0900
-Subject: Remove Launchy Dependencies
-
----
- Rakefile       | 4 +---
- jekyll.gemspec | 1 -
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
---- jekyll.orig/Rakefile
-+++ jekyll/Rakefile
-@@ -133,14 +133,12 @@
- namespace :site do
-   desc "Generate and view the site locally"
-   task :preview do
--    require "launchy"
--
-     # Yep, it's a hack! Wait a few seconds for the Jekyll site to generate and
-     # then open it in a browser. Someday we can do better than this, I hope.
-     Thread.new do
-       sleep 4
-       puts "Opening in browser..."
--      Launchy.open("http://localhost:4000")
-+      sh "xdg-open http://localhost:4000"
-     end
- 
-     # Generate the site in server mode.
---- 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('rdiscount', "~> 1.6")
--  s.add_development_dependency('launchy', "~> 2.3")
-   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/0005-Fix-Gemfile-dependencies-drop-redgreen.patch b/debian/patches/0005-Fix-Gemfile-dependencies-drop-redgreen.patch
new file mode 100644
index 0000000..0e55092
--- /dev/null
+++ b/debian/patches/0005-Fix-Gemfile-dependencies-drop-redgreen.patch
@@ -0,0 +1,21 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Wed, 4 Nov 2015 15:14:57 +0900
+Subject: Fix Gemfile dependencies: drop redgreen
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ Gemfile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Gemfile b/Gemfile
+index 63cb1bc..127b521 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -9,7 +9,6 @@ group :development do
+ end
+ 
+ group :test do
+-  gem 'redgreen', '~> 1.2'
+   gem 'shoulda', '~> 3.5'
+   gem 'cucumber', '~> 2.0', '< 2.1'
+   gem 'simplecov', '~> 0.9'
diff --git a/debian/patches/0005-Remove-newline-for-newer-Maruku.patch b/debian/patches/0005-Remove-newline-for-newer-Maruku.patch
deleted file mode 100644
index 676ba98..0000000
--- a/debian/patches/0005-Remove-newline-for-newer-Maruku.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Tue, 10 Jun 2014 16:32:44 +0900
-Subject: Remove newline for newer Maruku
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- test/test_tags.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/test/test_tags.rb
-+++ b/test/test_tags.rb
-@@ -525,7 +525,7 @@ CONTENT
- 
-       # todo: if #112 is merged into maruku, update to remove the newlines inside code block
-       should "render fenced code blocks" do
--        assert_match %r{<pre class=\"ruby\"><code class=\"ruby\">\nputs "Hello world"\n</code></pre>}, @result.strip
-+        assert_match %r{<pre class=\"ruby\"><code class=\"ruby\">puts "Hello world"</code></pre>}, @result.strip
-       end
-     end
- 
diff --git a/debian/patches/0006-Fix-Gemfile-versioning-pygments.rb.patch b/debian/patches/0006-Fix-Gemfile-versioning-pygments.rb.patch
new file mode 100644
index 0000000..5d47930
--- /dev/null
+++ b/debian/patches/0006-Fix-Gemfile-versioning-pygments.rb.patch
@@ -0,0 +1,22 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Sun, 6 Dec 2015 21:48:04 +0900
+Subject: Fix-Gemfile-versioning-pygments.rb
+
+---
+ Gemfile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Gemfile b/Gemfile
+index 127b521..b13fbc9 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -45,7 +45,7 @@ gem 'kramdown', '~> 1.9'
+ 
+ platform :ruby, :mswin, :mingw do
+   gem 'rdiscount', '~> 2.0'
+-  gem 'pygments.rb', '~> 0.6.0'
++  gem 'pygments.rb'
+   gem 'redcarpet', '~> 3.2', '>= 3.2.3'
+   gem 'classifier-reborn', '~> 2.0'
+   gem 'liquid-c', '~> 3.0'
diff --git a/debian/patches/0006-Fix-relative-LOAD_PATH-in-test_redcloth.patch b/debian/patches/0006-Fix-relative-LOAD_PATH-in-test_redcloth.patch
deleted file mode 100644
index 579c805..0000000
--- a/debian/patches/0006-Fix-relative-LOAD_PATH-in-test_redcloth.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Tue, 10 Jun 2014 17:31:51 +0900
-Subject: Fix relative LOAD_PATH in test_redcloth
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- test/test_redcloth.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/test/test_redcloth.rb
-+++ b/test/test_redcloth.rb
-@@ -1,4 +1,4 @@
--require File.dirname(__FILE__) + '/helper'
-+require 'helper'
- 
- class TestRedCloth < Test::Unit::TestCase
- 
diff --git a/debian/patches/0007-Add-newline-in-test_coffee_script.patch b/debian/patches/0007-Add-newline-in-test_coffee_script.patch
deleted file mode 100644
index ac909e9..0000000
--- a/debian/patches/0007-Add-newline-in-test_coffee_script.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Tue, 10 Jun 2014 17:58:52 +0900
-Subject: Add newline in test_coffee_script
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- test/test_coffeescript.rb | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/test/test_coffeescript.rb
-+++ b/test/test_coffeescript.rb
-@@ -11,6 +11,7 @@ class TestCoffeeScript < Test::Unit::TestCase
-       @test_coffeescript_file = dest_dir("js/coffeescript.js")
-       @js_output = <<-JS
- (function() {
-+
-   $(function() {
-     var cube, cubes, list, num, square;
-     list = [1, 2, 3, 4, 5];
diff --git a/debian/patches/0007-Fix-Gemfile-drop-liquid-c.patch b/debian/patches/0007-Fix-Gemfile-drop-liquid-c.patch
new file mode 100644
index 0000000..b27f3cd
--- /dev/null
+++ b/debian/patches/0007-Fix-Gemfile-drop-liquid-c.patch
@@ -0,0 +1,19 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Sun, 6 Dec 2015 21:48:04 +0900
+Subject: Fix-Gemfile-drop-liquid-c
+
+---
+ Gemfile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Gemfile b/Gemfile
+index b13fbc9..89f52f4 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -48,5 +48,4 @@ platform :ruby, :mswin, :mingw do
+   gem 'pygments.rb'
+   gem 'redcarpet', '~> 3.2', '>= 3.2.3'
+   gem 'classifier-reborn', '~> 2.0'
+-  gem 'liquid-c', '~> 3.0'
+ end
diff --git a/debian/patches/0008-Add-patch-Replace-git-execution-from-gemspec.patch b/debian/patches/0008-Add-patch-Replace-git-execution-from-gemspec.patch
new file mode 100644
index 0000000..94cc006
--- /dev/null
+++ b/debian/patches/0008-Add-patch-Replace-git-execution-from-gemspec.patch
@@ -0,0 +1,20 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Sun, 6 Dec 2015 21:49:02 +0900
+Subject: Add patch: Replace git execution from gemspec
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ jekyll.gemspec | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/jekyll.gemspec
++++ b/jekyll.gemspec
+@@ -20,7 +20,7 @@
+   s.email         = 'tom at mojombo.com'
+   s.homepage      = 'https://github.com/jekyll/jekyll'
+ 
+-  all_files       = `git ls-files -z`.split("\x0")
++  all_files       = [".gitignore",".jrubyrc",".travis.yml","CONDUCT.md","CONTRIBUTING.markdown","Gemfile","History.markdown","LICENSE","README.markdown","Rakefile","benchmark/end-with-vs-regexp","benchmark/flat-map","benchmark/hash-fetch","benchmark/jekyll-sanitize-path","benchmark/proc-call-vs-yield","benchmark/sequential-assignment","benchmark/string-concat","benchmark/string-replacement","benchmark/symbol-to-proc","bin/jekyll","checksums.yaml.gz","docs/jp/CONTRIBUTING.jp.markdown","d [...]
+   s.files         = all_files.grep(%r{^(bin|lib)/})
+   s.executables   = all_files.grep(%r{^bin/}) { |f| File.basename(f) }
+   s.require_paths = ['lib']
diff --git a/debian/patches/0008-Update-test-for-newer-RDiscount.patch b/debian/patches/0008-Update-test-for-newer-RDiscount.patch
deleted file mode 100644
index d6f182a..0000000
--- a/debian/patches/0008-Update-test-for-newer-RDiscount.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Debian Ruby Extras Maintainers
- <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Date: Tue, 10 Jun 2014 18:34:50 +0900
-Subject: Update test for newer RDiscount
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- test/test_rdiscount.rb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- jekyll.orig/test/test_rdiscount.rb
-+++ jekyll/test/test_rdiscount.rb
-@@ -16,7 +16,7 @@
-     end
- 
-     should "render toc" do
--      assert_equal "<h1 id=\"Header+1\">Header 1</h1>\n\n<h2 id=\"Header+2\">Header 2</h2>\n\n<p>\n <ul>\n <li><a href=\"#Header+1\">Header 1</a>\n  <ul>\n  <li><a href=\"#Header+2\">Header 2</a>  </li>\n  </ul>\n </li>\n </ul>\n\n</p>", @markdown.convert("# Header 1\n\n## Header 2\n\n{:toc}").strip
-+      assert_equal "<a name=\"Header.1\"></a>\n<h1>Header 1</h1>\n\n<a name=\"Header.2\"></a>\n<h2>Header 2</h2>\n\n<p><ul>\n <li><a href=\"#Header.1\">Header 1</a>\n <ul>\n  <li><a href=\"#Header.2\">Header 2</a></li>\n </ul>\n </li>\n</ul>\n\n</p>", @markdown.convert("# Header 1\n\n## Header 2\n\n{:toc}").strip
-     end
-   end
- end
diff --git a/debian/patches/activesupport4 b/debian/patches/activesupport4
deleted file mode 100644
index ae657d6..0000000
--- a/debian/patches/activesupport4
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Christian Hofstaedtler <zeha at debian.org>
-Subject: drop version from activesupport dependency
-
-Upstream changelog noted that the explicit dependency on 3.2.x is
-only there to keep running on Ruby <= 1.9.2, but as jessie only
-ships 1.9.3+, we can ignore that. And Rails 3.2.x went out, so we
-MUST ignore that.
-
-Index: jekyll/jekyll.gemspec
-===================================================================
---- jekyll.orig/jekyll.gemspec	2014-11-09 16:16:40.538191014 +0100
-+++ jekyll/jekyll.gemspec	2014-11-09 16:17:11.414172834 +0100
-@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
-   s.add_development_dependency('maruku', "~> 0.7.0")
-   s.add_development_dependency('rdiscount', "~> 1.6")
-   s.add_development_dependency('mime-types', "~> 1.5")
--  s.add_development_dependency('activesupport', '~> 3.2.13')
-+  s.add_development_dependency('activesupport')
-   s.add_development_dependency('jekyll_test_plugin')
-   s.add_development_dependency('jekyll_test_plugin_malicious')
-   s.add_development_dependency('rouge', '~> 1.3')
diff --git a/debian/patches/series b/debian/patches/series
index f75dd1b..2499445 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
-0001-Drop-SimpleCov-dependencies.patch
-0002-Drop-RubyGems-Depends.patch
-0003-Downcase-RedCloth.patch
-0004-Remove-Launchy-Dependencies.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
-activesupport4
+0001-Drop-Ruby-Minitest-Profile.patch
+0002-Downgrading-RDoc-as-4.1.patch
+0003-Remove-Launchy-Dependencies.patch
+0004-Fix-Gemfile-versioning-toml.patch
+0005-Fix-Gemfile-dependencies-drop-redgreen.patch
+0006-Fix-Gemfile-versioning-pygments.rb.patch
+0007-Fix-Gemfile-drop-liquid-c.patch
+0008-Add-patch-Replace-git-execution-from-gemspec.patch
diff --git a/debian/rules b/debian/rules
index 2016948..eda33ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,40 +14,40 @@
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
-override_dh_auto_clean: recover_original_test_sources
+override_dh_auto_clean:
 	dh_auto_clean
-	rm -fr $(CURDIR)/site/js
-	rm -fr $(CURDIR)/site/_includes/css/normalize.css
-	rm -fr $(CURDIR)/test/dest
 	rm -fr $(CURDIR)/.sass-cache
+	rm -fr $(CURDIR)/test/dest
+	rm -fr $(CURDIR)/coverage
+	rm -fr $(CURDIR)/test/source/.jekyll-metadata
 
-override_dh_auto_build: prepare_test
-	dh_auto_build
-	mkdir -p $(CURDIR)/site/js
-	cp debian/missing-sources/*.js $(CURDIR)/site/js
-	cp debian/missing-sources/normalize.css $(CURDIR)/site/_includes/css/
+# override_dh_auto_build: prepare_test
+# 	dh_auto_build
+# 	mkdir -p $(CURDIR)/site/js
+# 	cp debian/missing-sources/*.js $(CURDIR)/site/js
+# 	cp debian/missing-sources/normalize.css $(CURDIR)/site/_includes/css/
 
-override_dh_installchangelogs:
-	dh_installchangelogs History.markdown
+# override_dh_installchangelogs:
+# 	dh_installchangelogs History.markdown
 
-prepare_test:
-	( cd  $(CURDIR)/test/source/_methods && \
-	  rm -f um_hi.md && ln -s ./site/generate.md um_hi.md )
-	( cd  $(CURDIR)/test/source/_data && \
-	  rm -f products.yml && ln -s ../products.yml products.yml )
-	( cd $(CURDIR)/test/source/_includes && rm -f tmp && ln -s /tmp tmp )
-	( cd $(CURDIR)/test/source/symlink-test && \
-	  rm -f _data && ln -s ../_data . && \
-	  rm -f symlinked-dir && ln -s ../css symlinked-dir && \
-	  rm -f symlinked-file && ln -s ../index.html symlinked-file )
+# prepare_test:
+# 	( cd  $(CURDIR)/test/source/_methods && \
+# 	  rm -f um_hi.md && ln -s ./site/generate.md um_hi.md )
+# 	( cd  $(CURDIR)/test/source/_data && \
+# 	  rm -f products.yml && ln -s ../products.yml products.yml )
+# 	( cd $(CURDIR)/test/source/_includes && rm -f tmp && ln -s /tmp tmp )
+# 	( cd $(CURDIR)/test/source/symlink-test && \
+# 	  rm -f _data && ln -s ../_data . && \
+# 	  rm -f symlinked-dir && ln -s ../css symlinked-dir && \
+# 	  rm -f symlinked-file && ln -s ../index.html symlinked-file )
 
-recover_original_test_sources:
-	( cd $(CURDIR)/test/source/_methods && \
-	  rm -f um_hi.md && cp $(CURDIR)/debian/test-sources/um_hi.md . )
-	( cd $(CURDIR)/test/source/_data && \
-	  rm -f products.yml && cp $(CURDIR)/debian/test-sources/products.yml . )
-	( cd $(CURDIR)/test/source/_includes && rm -f tmp )
-	( cd $(CURDIR)/test/source/symlink-test && \
-	  rm -fr _data  && \
-	  rm -fr symlinked-dir && \
-	  rm -fr symlinked-file && cp $(CURDIR)/debian/test-sources/symlinked-file . )
+# recover_original_test_sources:
+# 	( cd $(CURDIR)/test/source/_methods && \
+# 	  rm -f um_hi.md && cp $(CURDIR)/debian/test-sources/um_hi.md . )
+# 	( cd $(CURDIR)/test/source/_data && \
+# 	  rm -f products.yml && cp $(CURDIR)/debian/test-sources/products.yml . )
+# 	( cd $(CURDIR)/test/source/_includes && rm -f tmp )
+# 	( cd $(CURDIR)/test/source/symlink-test && \
+# 	  rm -fr _data  && \
+# 	  rm -fr symlinked-dir && \
+# 	  rm -fr symlinked-file && cp $(CURDIR)/debian/test-sources/symlinked-file . )

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



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