[DRE-commits] [jekyll] 01/01: Refresh patches, Drop obsolete patch (Closes: #746607)
Youhei SASAKI
uwabami-guest at moszumanska.debian.org
Fri May 2 06:42:25 UTC 2014
This is an automated email from the git hooks/post-receive script.
uwabami-guest pushed a commit to branch master
in repository jekyll.
commit ee2b520ad252dc9cb5fb1e2f1607eb0151028ea0
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date: Fri May 2 15:40:58 2014 +0900
Refresh patches, Drop obsolete patch (Closes: #746607)
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
...atch => 0001-Drop-SimpleCov-dependencies.patch} | 8 +++++---
...ends.patch => 0002-Drop-RubyGems-Depends.patch} | 10 ++++++----
...RedCloth.patch => 0003-Downcase-RedCloth.patch} | 8 +++++---
.../0003-use-colored-instead-of-colorator.patch | 20 --------------------
...ency => 0004-Remove-Launchy-Dependencies.patch} | 22 ++++++++++++++++------
debian/patches/series | 9 ++++-----
6 files changed, 36 insertions(+), 41 deletions(-)
diff --git a/debian/patches/0001-Drop-coverage-simplecov-dependencies.patch b/debian/patches/0001-Drop-SimpleCov-dependencies.patch
similarity index 71%
rename from debian/patches/0001-Drop-coverage-simplecov-dependencies.patch
rename to debian/patches/0001-Drop-SimpleCov-dependencies.patch
index b7517a5..1d14a73 100644
--- a/debian/patches/0001-Drop-coverage-simplecov-dependencies.patch
+++ b/debian/patches/0001-Drop-SimpleCov-dependencies.patch
@@ -1,6 +1,8 @@
-Description:Drop coverage simplecov dependencies.patch
-Subject:Drop coverage(simplecov) dependencies
-From:Youhei SASAKI <uwabami at gfd-dennou.org>
+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(-)
diff --git a/debian/patches/0002-Drop-rubygems-Depends.patch b/debian/patches/0002-Drop-RubyGems-Depends.patch
similarity index 81%
rename from debian/patches/0002-Drop-rubygems-Depends.patch
rename to debian/patches/0002-Drop-RubyGems-Depends.patch
index 3abace4..3f058b1 100644
--- a/debian/patches/0002-Drop-rubygems-Depends.patch
+++ b/debian/patches/0002-Drop-RubyGems-Depends.patch
@@ -1,6 +1,8 @@
-Description:Drop rubygems Depends.patch
-Subject:Drop rubygems Depends
-From:Youhei SASAKI <uwabami at gfd-dennou.org>
+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 +--
@@ -8,7 +10,7 @@ From:Youhei SASAKI <uwabami at gfd-dennou.org>
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
-index 4d6af06..5995ff1 100644
+index a2a97ba..a81ca7d 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -12,9 +12,6 @@ def require_all(path)
diff --git a/debian/patches/0004-Downcase-RedCloth.patch b/debian/patches/0003-Downcase-RedCloth.patch
similarity index 69%
rename from debian/patches/0004-Downcase-RedCloth.patch
rename to debian/patches/0003-Downcase-RedCloth.patch
index d0ba82b..60de8e0 100644
--- a/debian/patches/0004-Downcase-RedCloth.patch
+++ b/debian/patches/0003-Downcase-RedCloth.patch
@@ -1,6 +1,8 @@
-Description:Downcase RedCloth.patch
-Subject:Downcase: RedCloth
-From:Youhei SASAKI <uwabami at gfd-dennou.org>
+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/debian/patches/0003-use-colored-instead-of-colorator.patch b/debian/patches/0003-use-colored-instead-of-colorator.patch
deleted file mode 100644
index 34ac60b..0000000
--- a/debian/patches/0003-use-colored-instead-of-colorator.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description:0003 use colored instead of colorator.patch
-Subject:use colored instead of colorator
-From:Youhei SASAKI <uwabami at gfd-dennou.org>
----
- lib/jekyll.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/jekyll.rb b/lib/jekyll.rb
-index 5995ff1..5efda92 100644
---- a/lib/jekyll.rb
-+++ b/lib/jekyll.rb
-@@ -22,7 +22,7 @@ require 'pathname'
- # 3rd party
- require 'liquid'
- require 'maruku'
--require 'colorator'
-+require 'colored'
- require 'toml'
-
- # internal requires
diff --git a/debian/patches/remove-launchy-dependency b/debian/patches/0004-Remove-Launchy-Dependencies.patch
similarity index 66%
rename from debian/patches/remove-launchy-dependency
rename to debian/patches/0004-Remove-Launchy-Dependencies.patch
index f4f74a9..7c9aa23 100644
--- a/debian/patches/remove-launchy-dependency
+++ b/debian/patches/0004-Remove-Launchy-Dependencies.patch
@@ -1,10 +1,18 @@
-Description:Remove launchy dependency
- call to cross platform launchy to launch a web browser
- is replaced with direct call to xdg-open
-Author:dod at debian.org
+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(-)
+
+diff --git a/Rakefile b/Rakefile
+index b8eb85a..f0a504d 100644
--- a/Rakefile
+++ b/Rakefile
-@@ -137,14 +137,12 @@
+@@ -137,14 +137,12 @@ end
namespace :site do
desc "Generate and view the site locally"
task :preview do
@@ -20,9 +28,11 @@ Author:dod at debian.org
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 @@
+@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
s.add_development_dependency('RedCloth', "~> 4.2")
s.add_development_dependency('kramdown', "~> 1.2")
s.add_development_dependency('rdiscount', "~> 1.6")
diff --git a/debian/patches/series b/debian/patches/series
index bcdd124..41fb08e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
-0001-Drop-coverage-simplecov-dependencies.patch
-0002-Drop-rubygems-Depends.patch
-0003-use-colored-instead-of-colorator.patch
-0004-Downcase-RedCloth.patch
-remove-launchy-dependency
+0001-Drop-SimpleCov-dependencies.patch
+0002-Drop-RubyGems-Depends.patch
+0003-Downcase-RedCloth.patch
+0004-Remove-Launchy-Dependencies.patch
--
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