[DRE-commits] [ruby-actionpack-3.2] 05/08: Update patches for 3.2.13 release
Ondrej Sury
ondrej at moszumanska.debian.org
Sun Dec 15 15:37:28 UTC 2013
This is an automated email from the git hooks/post-receive script.
ondrej pushed a commit to branch master
in repository ruby-actionpack-3.2.
commit 4da2ba8588a524bf37293e4ab0e9d72ffd90e360
Author: Ondřej Surý <ondrej at sury.org>
Date: Thu Dec 5 11:08:25 2013 +0100
Update patches for 3.2.13 release
---
.../patches/0001-loosen_sprockets_dependency.patch | 10 +++---
.../0002-fix_sprockets_speed_regression.patch | 11 -------
.../patches/0003-allow_newer_rack_versions.patch | 16 ++++-----
debian/patches/0004-allow_newer_versions.patch | 38 ++++++++++------------
debian/patches/rack-1.5.patch | 8 ++---
debian/patches/series | 1 -
6 files changed, 33 insertions(+), 51 deletions(-)
diff --git a/debian/patches/0001-loosen_sprockets_dependency.patch b/debian/patches/0001-loosen_sprockets_dependency.patch
index 9ab9ec5..a18e2d8 100644
--- a/debian/patches/0001-loosen_sprockets_dependency.patch
+++ b/debian/patches/0001-loosen_sprockets_dependency.patch
@@ -1,16 +1,16 @@
---- a/metadata.yml
-+++ b/metadata.yml
+--- ruby-actionpack-3.2.orig/metadata.yml
++++ ruby-actionpack-3.2/metadata.yml
@@ -114,14 +114,14 @@ dependencies:
requirements:
- - - ~>
+ - - "~>"
- !ruby/object:Gem::Version
- version: 2.2.1
-+ version: '2.2'
++ version: 2.2
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - - ~>
+ - - "~>"
- !ruby/object:Gem::Version
- version: 2.2.1
+ version: 2.2
diff --git a/debian/patches/0002-fix_sprockets_speed_regression.patch b/debian/patches/0002-fix_sprockets_speed_regression.patch
deleted file mode 100644
index afec4d0..0000000
--- a/debian/patches/0002-fix_sprockets_speed_regression.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/sprockets/helpers/rails_helper.rb
-+++ b/lib/sprockets/helpers/rails_helper.rb
-@@ -163,7 +163,7 @@ module Sprockets
- source
- elsif source_ext.blank?
- "#{source}.#{ext}"
-- elsif exact_match_present?(source)
-+ elsif File.exists?(source) || exact_match_present?(source)
- source
- else
- "#{source}.#{ext}"
diff --git a/debian/patches/0003-allow_newer_rack_versions.patch b/debian/patches/0003-allow_newer_rack_versions.patch
index 3423b8e..9282c7e 100644
--- a/debian/patches/0003-allow_newer_rack_versions.patch
+++ b/debian/patches/0003-allow_newer_rack_versions.patch
@@ -1,21 +1,19 @@
-Index: ruby-actionpack-3.2/metadata.yml
-===================================================================
---- ruby-actionpack-3.2.orig/metadata.yml 2013-06-03 17:11:05.907536739 +0200
-+++ ruby-actionpack-3.2/metadata.yml 2013-06-03 17:11:54.934957091 +0200
-@@ -70,14 +70,14 @@
+--- ruby-actionpack-3.2.orig/metadata.yml
++++ ruby-actionpack-3.2/metadata.yml
+@@ -70,14 +70,14 @@ dependencies:
name: rack
requirement: !ruby/object:Gem::Requirement
requirements:
-- - - ~>
-+ - - '>='
+- - - "~>"
++ - - ">="
- !ruby/object:Gem::Version
version: 1.4.5
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
-- - - ~>
-+ - - '>='
+- - - "~>"
++ - - ">="
- !ruby/object:Gem::Version
version: 1.4.5
- !ruby/object:Gem::Dependency
diff --git a/debian/patches/0004-allow_newer_versions.patch b/debian/patches/0004-allow_newer_versions.patch
index d73ca01..b12fb01 100644
--- a/debian/patches/0004-allow_newer_versions.patch
+++ b/debian/patches/0004-allow_newer_versions.patch
@@ -1,55 +1,53 @@
-Index: ruby-actionpack-3.2/metadata.yml
-===================================================================
---- ruby-actionpack-3.2.orig/metadata.yml 2013-06-03 17:43:57.335381335 +0200
-+++ ruby-actionpack-3.2/metadata.yml 2013-06-03 17:45:51.377948068 +0200
-@@ -56,14 +56,14 @@
+--- ruby-actionpack-3.2.orig/metadata.yml
++++ ruby-actionpack-3.2/metadata.yml
+@@ -56,14 +56,14 @@ dependencies:
name: builder
requirement: !ruby/object:Gem::Requirement
requirements:
-- - - ~>
-+ - - '>='
+- - - "~>"
++ - - ">="
- !ruby/object:Gem::Version
version: 3.0.0
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
-- - - ~>
-+ - - '>='
+- - - "~>"
++ - - ">="
- !ruby/object:Gem::Version
version: 3.0.0
- !ruby/object:Gem::Dependency
-@@ -112,14 +112,14 @@
+@@ -112,14 +112,14 @@ dependencies:
name: sprockets
requirement: !ruby/object:Gem::Requirement
requirements:
-- - - ~>
-+ - - '>='
+- - - "~>"
++ - - ">="
- !ruby/object:Gem::Version
- version: '2.2'
+ version: 2.2
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
-- - - ~>
-+ - - '>='
+- - - "~>"
++ - - ">="
- !ruby/object:Gem::Version
version: 2.2
- !ruby/object:Gem::Dependency
-@@ -140,14 +140,14 @@
+@@ -140,14 +140,14 @@ dependencies:
name: tzinfo
requirement: !ruby/object:Gem::Requirement
requirements:
-- - - ~>
-+ - - '>='
+- - - "~>"
++ - - ">="
- !ruby/object:Gem::Version
version: 0.3.29
type: :development
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
-- - - ~>
-+ - - '>='
+- - - "~>"
++ - - ">="
- !ruby/object:Gem::Version
version: 0.3.29
description: Web apps on Rails. Simple, battle-tested conventions for building and
diff --git a/debian/patches/rack-1.5.patch b/debian/patches/rack-1.5.patch
index 09c3c5f..f055c58 100644
--- a/debian/patches/rack-1.5.patch
+++ b/debian/patches/rack-1.5.patch
@@ -7,11 +7,9 @@ Comment:
https://github.com/rails/rails/commit/7d624e0e8cfa3adffd8f475e3588d83f3b367c24
-diff --git a/lib/action_controller/test_case.rb b/lib/action_controller/test_case.rb
-index bc6828a..d0214ed 100644
---- a/lib/action_controller/test_case.rb
-+++ b/lib/action_controller/test_case.rb
-@@ -225,13 +225,24 @@ module ActionController
+--- ruby-actionpack-3.2.orig/lib/action_controller/test_case.rb
++++ ruby-actionpack-3.2/lib/action_controller/test_case.rb
+@@ -240,13 +240,24 @@ module ActionController
def initialize(session = {})
super(nil, nil)
diff --git a/debian/patches/series b/debian/patches/series
index f559359..0a15cce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
0001-loosen_sprockets_dependency.patch
-0002-fix_sprockets_speed_regression.patch
0003-allow_newer_rack_versions.patch
0004-allow_newer_versions.patch
rack-1.5.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-actionpack-3.2.git
More information about the Pkg-ruby-extras-commits
mailing list