[DRE-commits] [ruby-sinatra-contrib] 02/05: Refresh patches

[Jérémy Bobbio]

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

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

commit 9c167c9cd954640af660ffd0a4a21044bb3001f9
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Dec 1 11:10:34 2016 +0100

    Refresh patches
---
 .../patches/remove-unpackaged-dependencies.patch   | 140 ++++++---------------
 1 file changed, 38 insertions(+), 102 deletions(-)

diff --git a/debian/patches/remove-unpackaged-dependencies.patch b/debian/patches/remove-unpackaged-dependencies.patch
index 5bcd7d8..91fa2be 100644
--- a/debian/patches/remove-unpackaged-dependencies.patch
+++ b/debian/patches/remove-unpackaged-dependencies.patch
@@ -1,104 +1,16 @@
-Description: remove unpackaged dependencies
- less, markaby, and radius are not in Debian. As they are just used
- how Sinatra behave with these engines loaded, we simply remove them.
-Author: Jérémy Bobbio <lunar at debian.org>
-Forwarded: not-needed
-Last-Update: 2015-09-09
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
+Date: Thu, 1 Dec 2016 11:19:11 +0100
+Subject: Remove unpackaged optional dependencies
 
-Index: git/metadata.yml
-===================================================================
---- git.orig/metadata.yml
-+++ git/metadata.yml
-@@ -204,20 +204,6 @@ dependencies:
-       - !ruby/object:Gem::Version
-         version: '0'
- - !ruby/object:Gem::Dependency
--  name: less
--  requirement: !ruby/object:Gem::Requirement
--    requirements:
--    - - ">="
--      - !ruby/object:Gem::Version
--        version: '0'
--  type: :development
--  prerelease: false
--  version_requirements: !ruby/object:Gem::Requirement
--    requirements:
--    - - ">="
--      - !ruby/object:Gem::Version
--        version: '0'
--- !ruby/object:Gem::Dependency
-   name: sass
-   requirement: !ruby/object:Gem::Requirement
-     requirements:
-@@ -302,20 +288,6 @@ dependencies:
-       - !ruby/object:Gem::Version
-         version: '0'
- - !ruby/object:Gem::Dependency
--  name: radius
--  requirement: !ruby/object:Gem::Requirement
--    requirements:
--    - - ">="
--      - !ruby/object:Gem::Version
--        version: '0'
--  type: :development
--  prerelease: false
--  version_requirements: !ruby/object:Gem::Requirement
--    requirements:
--    - - ">="
--      - !ruby/object:Gem::Version
--        version: '0'
--- !ruby/object:Gem::Dependency
-   name: coffee-script
-   requirement: !ruby/object:Gem::Requirement
-     requirements:
-@@ -362,20 +334,6 @@ dependencies:
-   requirement: !ruby/object:Gem::Requirement
-     requirements:
-     - - ">="
--      - !ruby/object:Gem::Version
--        version: '0'
--  type: :development
--  prerelease: false
--  version_requirements: !ruby/object:Gem::Requirement
--    requirements:
--    - - ">="
--      - !ruby/object:Gem::Version
--        version: '0'
--- !ruby/object:Gem::Dependency
--  name: markaby
--  requirement: !ruby/object:Gem::Requirement
--    requirements:
--    - - ">="
-       - !ruby/object:Gem::Version
-         version: '0'
-   type: :development
-Index: git/sinatra-contrib.gemspec
-===================================================================
---- git.orig/sinatra-contrib.gemspec
-+++ git/sinatra-contrib.gemspec
-@@ -219,18 +219,15 @@ Gem::Specification.new do |s|
-   s.add_development_dependency "haml"
-   s.add_development_dependency "erubis"
-   s.add_development_dependency "slim"
--  s.add_development_dependency "less"
-   s.add_development_dependency "sass"
-   s.add_development_dependency "builder"
-   s.add_development_dependency "liquid"
-   s.add_development_dependency "redcarpet"
-   s.add_development_dependency "RedCloth"
-   s.add_development_dependency "asciidoctor"
--  s.add_development_dependency "radius"
-   s.add_development_dependency "coffee-script"
-   s.add_development_dependency "nokogiri"
-   s.add_development_dependency "creole"
-   s.add_development_dependency "wikicloth"
--  s.add_development_dependency "markaby"
-   s.add_development_dependency "rake"
- end
-Index: git/lib/sinatra/respond_with.rb
-===================================================================
---- git.orig/lib/sinatra/respond_with.rb
-+++ git/lib/sinatra/respond_with.rb
+---
+ lib/sinatra/respond_with.rb | 9 ++++-----
+ sinatra-contrib.gemspec     | 3 ---
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/lib/sinatra/respond_with.rb b/lib/sinatra/respond_with.rb
+index 1ff8989..4f45cea 100644
+--- a/lib/sinatra/respond_with.rb
++++ b/lib/sinatra/respond_with.rb
 @@ -216,7 +216,6 @@ module Sinatra
  
      def rendering_method(engine)
@@ -107,7 +19,7 @@ Index: git/lib/sinatra/respond_with.rb
        [:render, :engine]
      end
  
-@@ -238,13 +237,12 @@ module Sinatra
+@@ -238,13 +237,13 @@ module Sinatra
  
      def self.engines
        engines = {
@@ -120,7 +32,31 @@ Index: git/lib/sinatra/respond_with.rb
            :markdown, :textile, :rdoc],
 -        :all =>  (Sinatra::Templates.instance_methods.map(&:to_sym) +
 -          [:mab] - [:find_template, :markaby]),
-+        :all =>  (Sinatra::Templates.instance_methods.map(&:to_sym) - [:find_template, :less, :radius, :markaby]),
++        :all =>  (Sinatra::Templates.instance_methods.map(&:to_sym) -
++          [:find_template, :less, :radius, :markaby]),
          :json => [:yajl],
        }
        engines.default = []
+diff --git a/sinatra-contrib.gemspec b/sinatra-contrib.gemspec
+index 6ee6d0c..b63654b 100644
+--- a/sinatra-contrib.gemspec
++++ b/sinatra-contrib.gemspec
+@@ -224,18 +224,15 @@ Gem::Specification.new do |s|
+   s.add_development_dependency "haml"
+   s.add_development_dependency "erubis"
+   s.add_development_dependency "slim"
+-  s.add_development_dependency "less"
+   s.add_development_dependency "sass"
+   s.add_development_dependency "builder"
+   s.add_development_dependency "liquid"
+   s.add_development_dependency "redcarpet"
+   s.add_development_dependency "RedCloth"
+   s.add_development_dependency "asciidoctor"
+-  s.add_development_dependency "radius"
+   s.add_development_dependency "coffee-script"
+   s.add_development_dependency "nokogiri"
+   s.add_development_dependency "creole"
+   s.add_development_dependency "wikicloth"
+-  s.add_development_dependency "markaby"
+   s.add_development_dependency "rake", "< 11"
+ end

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