[DRE-commits] [ruby-sass-rails] 04/07: refresh sprockets-2.x.patch

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-sass-rails.

commit 5d3479c9e1eda71e9ea32019910d9d4f9bdd9506
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Nov 20 01:07:48 2014 +0530

    refresh sprockets-2.x.patch
---
 debian/patches/sprockets-2.x.patch | 77 +++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/debian/patches/sprockets-2.x.patch b/debian/patches/sprockets-2.x.patch
index 73d0ac7..1d0885f 100644
--- a/debian/patches/sprockets-2.x.patch
+++ b/debian/patches/sprockets-2.x.patch
@@ -13,8 +13,10 @@ Author:
  Matthew Draper <matthew at trebex.net>,
 Reviewed-By: Antonio Terceiro <terceiro at debian.org>
 
---- a/lib/sass/rails/railtie.rb
-+++ b/lib/sass/rails/railtie.rb
+Index: ruby-sass-rails/lib/sass/rails/railtie.rb
+===================================================================
+--- ruby-sass-rails.orig/lib/sass/rails/railtie.rb
++++ ruby-sass-rails/lib/sass/rails/railtie.rb
 @@ -52,6 +52,9 @@ module Sass::Rails
        end
  
@@ -25,8 +27,10 @@ Reviewed-By: Antonio Terceiro <terceiro at debian.org>
          app.assets.context_class.extend(SassContext)
          app.assets.context_class.sass_config = app.config.sass
        end
---- a/lib/sass/rails/template.rb
-+++ b/lib/sass/rails/template.rb
+Index: ruby-sass-rails/lib/sass/rails/template.rb
+===================================================================
+--- ruby-sass-rails.orig/lib/sass/rails/template.rb
++++ ruby-sass-rails/lib/sass/rails/template.rb
 @@ -1,28 +1,42 @@
  require "sprockets/sass_template"
  
@@ -91,38 +95,44 @@ Reviewed-By: Antonio Terceiro <terceiro at debian.org>
      end
    end
  end
---- a/sass-rails.gemspec
-+++ b/sass-rails.gemspec
+Index: ruby-sass-rails/sass-rails.gemspec
+===================================================================
+--- ruby-sass-rails.orig/sass-rails.gemspec
++++ ruby-sass-rails/sass-rails.gemspec
 @@ -15,10 +15,10 @@ Gem::Specification.new do |s|
  
    s.rubyforge_project = "sass-rails"
  
--  s.add_dependency 'sass',            '~> 3.2.0'
+-  s.add_dependency 'sass',            '~> 3.2.2'
 +  s.add_dependency 'sass',            '~> 3.2'
    s.add_dependency 'railties',        '>= 4.0.0', '< 5.0'
    s.add_dependency 'sprockets-rails', '~> 2.0'
--  s.add_dependency 'sprockets',       '~> 2.8', '<= 2.11.0'
+-  s.add_dependency 'sprockets',       '~> 2.8', '< 2.12'
 +  s.add_dependency 'sprockets',       '~> 2.12'
  
-   s.files         = [".gitignore",".travis.yml","CHANGELOG.md","Gemfile","MIT-LICENSE","README.md","Rakefile","lib/rails/generators/sass/assets/assets_generator.rb","lib/rails/generators/sass/assets/templates/stylesheet.css.sass","lib/rails/generators/sass/scaffold/scaffold_generator.rb","lib/rails/generators/sass_scaffold.rb","lib/rails/generators/scss/assets/assets_generator.rb","lib/rails/generators/scss/assets/templates/stylesheet.css.scss","lib/rails/generators/scss/scaffold/scaffo [...]
-   s.test_files    = ["test/fixtures/alternate_config_project/.gitignore","test/fixtures/alternate_config_project/Gemfile","test/fixtures/alternate_config_project/README","test/fixtures/alternate_config_project/Rakefile","test/fixtures/alternate_config_project/app/assets/images/1x1.png","test/fixtures/alternate_config_project/app/assets/images/rails.png","test/fixtures/alternate_config_project/app/assets/javascripts/application.js","test/fixtures/alternate_config_project/app/assets/style [...]
---- a/sass-rails.gemspec.erb
-+++ b/sass-rails.gemspec.erb
+   s.files         = [".gitignore",".travis.yml","CHANGELOG.md","Gemfile","MIT-LICENSE","README.md","Rakefile","lib/rails/generators/sass/assets/assets_generator.rb","lib/rails/generators/sass/assets/templates/stylesheet.css.sass","lib/rails/generators/sass/scaffold/scaffold_generator.rb","lib/rails/generators/sass_scaffold.rb","lib/rails/generators/scss/assets/assets_generator.rb","lib/rails/generators/scss/assets/templates/stylesheet.css.scss","lib/rails/generators/scss/scaffold/scaffo [...]
+   s.executables   = []
+Index: ruby-sass-rails/sass-rails.gemspec.erb
+===================================================================
+--- ruby-sass-rails.orig/sass-rails.gemspec.erb
++++ ruby-sass-rails/sass-rails.gemspec.erb
 @@ -15,10 +15,10 @@ Gem::Specification.new do |s|
  
    s.rubyforge_project = "sass-rails"
  
--  s.add_dependency 'sass',            '~> 3.2.0'
+-  s.add_dependency 'sass',            '~> 3.2.2'
 +  s.add_dependency 'sass',            '~> 3.2'
    s.add_dependency 'railties',        '>= 4.0.0', '< 5.0'
    s.add_dependency 'sprockets-rails', '~> 2.0'
--  s.add_dependency 'sprockets',       '~> 2.8', '<= 2.11.0'
+-  s.add_dependency 'sprockets',       '~> 2.8', '< 2.12'
 +  s.add_dependency 'sprockets',       '~> 2.12'
  
    s.files         = [<%= files.map(&:inspect).join ',' %>]
-   s.test_files    = [<%= test_files.map(&:inspect).join ',' %>]
---- a/lib/sass/rails/importer.rb
-+++ b/lib/sass/rails/importer.rb
+   s.executables   = [<%= executables.map(&:inspect).join ',' %>]
+Index: ruby-sass-rails/lib/sass/rails/importer.rb
+===================================================================
+--- ruby-sass-rails.orig/lib/sass/rails/importer.rb
++++ ruby-sass-rails/lib/sass/rails/importer.rb
 @@ -1,104 +1,96 @@
  require 'sprockets/sass_importer'
  
@@ -305,45 +315,34 @@ Reviewed-By: Antonio Terceiro <terceiro at debian.org>
 +    end
    end
  end
---- a/metadata.yml
-+++ b/metadata.yml
+Index: ruby-sass-rails/metadata.yml
+===================================================================
+--- ruby-sass-rails.orig/metadata.yml
++++ ruby-sass-rails/metadata.yml
 @@ -17,14 +17,14 @@ dependencies:
      requirements:
      - - "~>"
        - !ruby/object:Gem::Version
--        version: 3.2.0
-+        version: '3.2'
+-        version: 3.2.2
++        version: 3.2
    type: :runtime
    prerelease: false
    version_requirements: !ruby/object:Gem::Requirement
      requirements:
      - - "~>"
        - !ruby/object:Gem::Version
--        version: 3.2.0
-+        version: '3.2'
+-        version: 3.2.2
++        version: 3.2
  - !ruby/object:Gem::Dependency
    name: railties
    requirement: !ruby/object:Gem::Requirement
-@@ -65,20 +65,14 @@ dependencies:
+@@ -65,9 +65,6 @@ dependencies:
      requirements:
      - - "~>"
        - !ruby/object:Gem::Version
 -        version: '2.8'
--    - - "<="
+-    - - "<"
 -      - !ruby/object:Gem::Version
--        version: 2.11.0
-+        version: '2.12'
+         version: '2.12'
    type: :runtime
    prerelease: false
-   version_requirements: !ruby/object:Gem::Requirement
-     requirements:
-     - - "~>"
-       - !ruby/object:Gem::Version
--        version: '2.8'
--    - - "<="
--      - !ruby/object:Gem::Version
--        version: 2.11.0
-+        version: '2.12'
- description: Sass adapter for the Rails asset pipeline.
- email:
- - wycats at gmail.com

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