[DRE-commits] [ruby-handlebars-assets] 03/05: refresh patches
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Mon Mar 7 09:01:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository ruby-handlebars-assets.
commit 8e6c7bc2f4be5b986bb521c60d071da54e0033a3
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Mon Mar 7 13:51:48 2016 +0530
refresh patches
---
debian/changelog | 1 +
...ath-before-each-test-to-fix-the-first-one.patch | 36 +++++++++----------
debian/patches/engine-root.patch | 8 ++---
debian/patches/relax-tilt-version.patch | 42 ----------------------
debian/patches/series | 1 -
5 files changed, 23 insertions(+), 65 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index aa04f27..8eff623 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-handlebars-assets (2:0.23.0-1) UNRELEASED; urgency=medium
* New upstream release
* Drop libjs-* binaries
+ * Refresh patches
-- Pirate Praveen <praveen at debian.org> Mon, 07 Mar 2016 13:38:49 +0530
diff --git a/debian/patches/0003-Reset-path-before-each-test-to-fix-the-first-one.patch b/debian/patches/0003-Reset-path-before-each-test-to-fix-the-first-one.patch
index 9b0e310..9b5a7bf 100644
--- a/debian/patches/0003-Reset-path-before-each-test-to-fix-the-first-one.patch
+++ b/debian/patches/0003-Reset-path-before-each-test-to-fix-the-first-one.patch
@@ -9,10 +9,10 @@ Subject: Reset path before each test to fix the first one
test/handlebars_assets/tilt_handlebars_test.rb | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/test/handlebars_assets/compiling_test.rb b/test/handlebars_assets/compiling_test.rb
-index e3dc992..850cc50 100644
---- a/test/handlebars_assets/compiling_test.rb
-+++ b/test/handlebars_assets/compiling_test.rb
+Index: ruby-handlebars-assets/test/handlebars_assets/compiling_test.rb
+===================================================================
+--- ruby-handlebars-assets.orig/test/handlebars_assets/compiling_test.rb
++++ ruby-handlebars-assets/test/handlebars_assets/compiling_test.rb
@@ -3,7 +3,7 @@ require 'test_helper'
module HandlebarsAssets
class CompilingTest < ::MiniTest::Test
@@ -22,10 +22,10 @@ index e3dc992..850cc50 100644
HandlebarsAssets::Config.reset!
HandlebarsAssets::Handlebars.reset!
end
-diff --git a/test/handlebars_assets/hamlbars_test.rb b/test/handlebars_assets/hamlbars_test.rb
-index 7afce25..74a9560 100644
---- a/test/handlebars_assets/hamlbars_test.rb
-+++ b/test/handlebars_assets/hamlbars_test.rb
+Index: ruby-handlebars-assets/test/handlebars_assets/hamlbars_test.rb
+===================================================================
+--- ruby-handlebars-assets.orig/test/handlebars_assets/hamlbars_test.rb
++++ ruby-handlebars-assets/test/handlebars_assets/hamlbars_test.rb
@@ -9,7 +9,7 @@ module HandlebarsAssets
(Haml::Engine.new(source, HandlebarsAssets::Config.haml_options).render).chomp
end
@@ -35,10 +35,10 @@ index 7afce25..74a9560 100644
HandlebarsAssets::Config.reset!
HandlebarsAssets::Handlebars.reset!
end
-diff --git a/test/handlebars_assets/slimbars_test.rb b/test/handlebars_assets/slimbars_test.rb
-index 2002f26..110a977 100644
---- a/test/handlebars_assets/slimbars_test.rb
-+++ b/test/handlebars_assets/slimbars_test.rb
+Index: ruby-handlebars-assets/test/handlebars_assets/slimbars_test.rb
+===================================================================
+--- ruby-handlebars-assets.orig/test/handlebars_assets/slimbars_test.rb
++++ ruby-handlebars-assets/test/handlebars_assets/slimbars_test.rb
@@ -5,7 +5,7 @@ module HandlebarsAssets
include SprocketsScope
include CompilerSupport
@@ -48,13 +48,13 @@ index 2002f26..110a977 100644
HandlebarsAssets::Config.reset!
HandlebarsAssets::Handlebars.reset!
end
-diff --git a/test/handlebars_assets/tilt_handlebars_test.rb b/test/handlebars_assets/tilt_handlebars_test.rb
-index 57b4983..67852d0 100644
---- a/test/handlebars_assets/tilt_handlebars_test.rb
-+++ b/test/handlebars_assets/tilt_handlebars_test.rb
+Index: ruby-handlebars-assets/test/handlebars_assets/tilt_handlebars_test.rb
+===================================================================
+--- ruby-handlebars-assets.orig/test/handlebars_assets/tilt_handlebars_test.rb
++++ ruby-handlebars-assets/test/handlebars_assets/tilt_handlebars_test.rb
@@ -5,7 +5,7 @@ module HandlebarsAssets
- include CompilerSupport
- include SprocketsScope
+ class HandlebarsTemplateTest < Minitest::Test
+ include AdapterTests
- def teardown
+ def setup
diff --git a/debian/patches/engine-root.patch b/debian/patches/engine-root.patch
index 8267358..6953176 100644
--- a/debian/patches/engine-root.patch
+++ b/debian/patches/engine-root.patch
@@ -13,15 +13,15 @@ Index: ruby-handlebars-assets/lib/handlebars_assets/engine.rb
class Engine < ::Rails::Engine
+ config.root = '/usr/share/ruby-handlebars-assets'
initializer "handlebars_assets.assets.register", :group => :all do |app|
- ::HandlebarsAssets::register_extensions(app.assets)
- app.assets.version += "#{::HandlebarsAssets::VERSION}"
+ config.assets.configure do |sprockets_env|
+ ::HandlebarsAssets::register_extensions(sprockets_env)
Index: ruby-handlebars-assets/lib/handlebars_assets.rb
===================================================================
--- ruby-handlebars-assets.orig/lib/handlebars_assets.rb
+++ ruby-handlebars-assets/lib/handlebars_assets.rb
-@@ -5,7 +5,7 @@ module HandlebarsAssets
- autoload(:Handlebars, 'handlebars_assets/handlebars')
+@@ -6,7 +6,7 @@ module HandlebarsAssets
autoload(:HandlebarsTemplate, 'handlebars_assets/handlebars_template')
+ autoload(:HandlebarsProcessor, 'handlebars_assets/handlebars_template')
- PATH = File.expand_path('../../vendor/assets/javascripts', __FILE__)
+ PATH = File.expand_path('/usr/share/ruby-handlebars-assets/vendor/assets/javascripts', __FILE__)
diff --git a/debian/patches/relax-tilt-version.patch b/debian/patches/relax-tilt-version.patch
deleted file mode 100644
index c53335d..0000000
--- a/debian/patches/relax-tilt-version.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: ruby-handlebars-assets/handlebars_assets.gemspec
-===================================================================
---- ruby-handlebars-assets.orig/handlebars_assets.gemspec
-+++ ruby-handlebars-assets/handlebars_assets.gemspec
-@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
- s.require_paths = ["lib"]
-
- s.add_runtime_dependency "execjs", "~> 2.0"
-- s.add_runtime_dependency "tilt", "~> 1.2"
-+ s.add_runtime_dependency "tilt", ">= 1.2", "< 3.0"
- s.add_runtime_dependency "multi_json", "~> 1.0"
- s.add_runtime_dependency "sprockets", ">= 2.0.0", "< 4.0"
-
-Index: ruby-handlebars-assets/metadata.yml
-===================================================================
---- ruby-handlebars-assets.orig/metadata.yml
-+++ ruby-handlebars-assets/metadata.yml
-@@ -28,16 +28,22 @@ dependencies:
- name: tilt
- requirement: !ruby/object:Gem::Requirement
- requirements:
-- - - "~>"
-+ - - ">="
- - !ruby/object:Gem::Version
- version: '1.2'
-+ - - "<"
-+ - !ruby/object:Gem::Version
-+ version: '3.0'
- type: :runtime
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
-- - - "~>"
-+ - - ">="
- - !ruby/object:Gem::Version
- version: '1.2'
-+ - - "<"
-+ - !ruby/object:Gem::Version
-+ version: '3.0'
- - !ruby/object:Gem::Dependency
- name: multi_json
- requirement: !ruby/object:Gem::Requirement
diff --git a/debian/patches/series b/debian/patches/series
index b7709b1..b1d538e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ engine-root.patch
0002-Fix-slimbars-test.patch
0003-Reset-path-before-each-test-to-fix-the-first-one.patch
0004-require-slim-haml.patch
-relax-tilt-version.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-handlebars-assets.git
More information about the Pkg-ruby-extras-commits
mailing list