[DRE-commits] [ruby-sinatra] 01/02: Drop bluecloth development/convenience dependency

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository ruby-sinatra.

commit 48fbe9d052eaa43c0bca9615b12d438cdb230f84
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue Jul 5 15:47:51 2016 +0200

    Drop bluecloth development/convenience dependency
---
 .../Drop-bluecloth-development-dependency.patch    | 22 ++++++++++++++++++++++
 debian/patches/i18n-fix.patch                      | 15 ++++++++++-----
 debian/patches/series                              |  1 +
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/debian/patches/Drop-bluecloth-development-dependency.patch b/debian/patches/Drop-bluecloth-development-dependency.patch
new file mode 100644
index 0000000..444e8a9
--- /dev/null
+++ b/debian/patches/Drop-bluecloth-development-dependency.patch
@@ -0,0 +1,22 @@
+From: Christian Hofstaedtler <zeha at debian.org>
+Date: Tue, 5 Jul 2016 15:45:57 +0200
+Subject: Drop bluecloth development dependency
+
+bluecloth is obsolete, and sinatra does not directly use it. Patch
+it out of Gemfile, so we can remove bluecloth.
+---
+ Gemfile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Gemfile b/Gemfile
+index 4df6d3c..011f54c 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -38,7 +38,6 @@ if RUBY_ENGINE == "ruby" and RUBY_VERSION > '1.9.2'
+   gem 'therubyracer'
+   gem 'redcarpet'
+   gem 'wlang', '>= 2.0.1'
+-  gem 'bluecloth'
+   gem 'rdiscount'
+   gem 'RedCloth'
+   gem 'puma'
diff --git a/debian/patches/i18n-fix.patch b/debian/patches/i18n-fix.patch
index bfd0d4e..d2bd2b2 100644
--- a/debian/patches/i18n-fix.patch
+++ b/debian/patches/i18n-fix.patch
@@ -1,11 +1,16 @@
-Description: Specify available locales during tests.
-Author: Balasankar C <balasankarc at autistici.org>
-Last-Update: 2016-02-24
+From: Balasankar C <balasankarc at autistici.org>
+Date: Tue, 5 Jul 2016 15:47:54 +0200
+Subject: Specify available locales during tests.
+
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ test/helper.rb | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/test/helper.rb b/test/helper.rb
+index 1e1e665..a731e0a 100644
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -21,6 +21,9 @@
+@@ -21,6 +21,9 @@ require 'contest'
  require 'rack/test'
  require 'sinatra/base'
  
diff --git a/debian/patches/series b/debian/patches/series
index 065b498..a72c3ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 i18n-fix.patch
+Drop-bluecloth-development-dependency.patch

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