[DRE-commits] [rails] 39/44: Update dependencies in d/control based on information from gemspec files

Ondrej Sury ondrej at moszumanska.debian.org
Wed Jul 16 15:04:05 UTC 2014


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

ondrej pushed a commit to branch master
in repository rails.

commit d732e3c2a7ddf6bb8c234fd3017c4643d03b834e
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Jul 16 15:17:21 2014 +0200

    Update dependencies in d/control based on information from gemspec files
---
 debian/control                         | 60 +++++++++++++++++++++++++---------
 debian/patches/relax-dependencies      | 38 ---------------------
 debian/patches/series                  |  1 -
 debian/ruby-railties.lintian-overrides |  2 +-
 4 files changed, 46 insertions(+), 55 deletions(-)

diff --git a/debian/control b/debian/control
index 5f38baf..de4f8a9 100644
--- a/debian/control
+++ b/debian/control
@@ -20,11 +20,16 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ruby | ruby-interpreter,
-	 ruby-i18n (>= 0.6.4),
-	 ruby-multi-json (>= 1.3),
-	 ruby-tzinfo (>= 0.3.37),
-	 ruby-minitest (>= 4.2),
-	 ruby-thread-safe (>= 0.1)
+	 ruby-i18n (>= 0.6.9),
+	 ruby-i18n (<< 1.0),
+	 ruby-json (>= 1.7.7),
+	 ruby-json (<< 2.0),
+	 ruby-tzinfo (>= 1.1),
+	 ruby-tzinfo (<< 2.0),
+	 ruby-minitest (>= 5.1),
+	 ruby-minitest (<< 6.0),
+	 ruby-thread-safe (>= 0.1),
+	 ruby-thread-safe (<< 1.0)
 Breaks: ruby-activesupport-2.3, ruby-activesupport-3.2, ruby-activesupport-4.0
 Replaces: ruby-activesupport-2.3, ruby-activesupport-3.2, ruby-activesupport-4.0
 Description: Support and utility classes used by the Rails 4.1 framework
@@ -40,8 +45,8 @@ Depends: ${misc:Depends},
 	 ruby | ruby-interpreter,
 	 ruby-activesupport (= ${source:Version}),
 	 ruby-activemodel (= ${source:Version}),
-	 ruby-arel (>= 4.0.0)
-Recommends: ruby-activerecord-deprecated-finders (>= 1.0.2),
+	 ruby-arel (>= 5.0.0),
+	 ruby-arel (<< 5.1.0)
 Breaks: ruby-activerecord-2.3, ruby-activerecord-3.2, ruby-activerecord-4.0
 Replaces: ruby-activerecord-2.3, ruby-activerecord-3.2, ruby-activerecord-4.0
 Description: object-relational mapper framework (part of Rails)
@@ -56,9 +61,9 @@ X-DhRuby-Root: activemodel/
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${misc:Depends},
 	 ruby | ruby-interpreter,
-	 ruby-builder (>= 3.1.0),
-	 ruby-bcrypt (>= 3.0.0),
-	 ruby-activesupport (= ${source:Version})
+	 ruby-activesupport (= ${source:Version}),
+	 ruby-builder (>= 3.1),
+	 ruby-builder (<< 4.0),
 Breaks: ruby-activemodel-3.2, ruby-activemodel-4.0
 Replaces: ruby-activemodel-3.2, ruby-activemodel-4.0
 Description: toolkit for building modeling frameworks (part of Rails)
@@ -67,6 +72,24 @@ Description: toolkit for building modeling frameworks (part of Rails)
  attributes, callbacks, validations, observers, serialization,
  internationalization, and testing.
 
+Package: ruby-actionview
+Architecture: all
+X-DhRuby-Root: actionview/
+XB-Ruby-Versions: ${ruby:Versions}
+Depends: ${misc:Depends},
+	 ruby | ruby-interpreter,
+	 ruby-activesupport (= ${source:Version}),
+	 ruby-builder (>= 3.1),
+	 ruby-builder (<< 4.0),
+	 ruby-erubis (>= 2.7.0),
+	 ruby-erubis (<< 2.8)
+Description: framework for handling view template lookup and rendering (part of Rails)
+ Action View is a framework for handling view template lookup and
+ rendering, and provides view helpers that assist when building HTML
+ forms, Atom feeds and more. Template formats that Action View handles
+ are ERB (embedded Ruby, typically used to inline short Ruby snippets
+ inside HTML), and XML Builder.
+
 Package: ruby-actionpack
 Architecture: all
 X-DhRuby-Root: actionpack/
@@ -74,10 +97,11 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${misc:Depends},
 	 ruby | ruby-interpreter,
 	 ruby-activesupport (= ${source:Version}),
+	 ruby-actionview (= ${source:Version}),
 	 ruby-rack (>= 1.5.2),
+	 ruby-rack (<< 1.6),
 	 ruby-rack-test (>= 0.6.2),
-	 ruby-builder (>= 3.1.0),
-	 ruby-erubis (>= 2.7.0~)
+	 ruby-rack-test (<< 0.7)
 Breaks: ruby-actionpack-2.3, ruby-actionpack-3.2, ruby-actionpack-4.0
 Replaces: ruby-actionpack-2.3, ruby-actionpack-3.2, ruby-actionpack-4.0
 Description: web-flow and rendering framework putting the VC in MVC (part of Rails)
@@ -93,7 +117,9 @@ Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ruby | ruby-interpreter,
 	 ruby-actionpack (= ${source:Version}),
-	 ruby-mail (>= 2.5.3~)
+	 ruby-actionview (= ${source:Version}),
+	 ruby-mail (>= 2.5.4),
+	 ruby-mail (<< 2.6)
 Breaks: ruby-actionmailer-2.3, ruby-actionmailer-3.2, ruby-actionmailer-4.0
 Replaces: ruby-actionmailer-2.3, ruby-actionmailer-3.2, ruby-actionmailer-4.0
 Description: email composition, delivery, and receiving framework (part of Rails)
@@ -110,7 +136,7 @@ Depends: ${misc:Depends},
 	 ruby | ruby-interpreter,
 	 rake (>= 0.8.7),
 	 ruby-thor (>= 0.18.1),
-	 ruby-rack-ssl (>= 1.3.2),
+	 ruby-thor (<< 2.0),
 	 ruby-activesupport (= ${source:Version}),
 	 ruby-actionpack (= ${source:Version})
 Breaks: ruby-rails-2.3, ruby-railties-3.2, rails (<< 3:3.2.0), rails3, ruby-railties-4.0
@@ -132,11 +158,15 @@ Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ruby-activesupport (= ${source:Version}),
 	 ruby-actionpack (= ${source:Version}),
+	 ruby-actionview (= ${source:Version}),
+	 ruby-activemodel (= ${source:Version}),
 	 ruby-activerecord (= ${source:Version}),
 	 ruby-actionmailer (= ${source:Version}),
 	 ruby-railties (= ${source:Version}),
 	 bundler (>= 1.3.0),
-	 ruby-sprockets-rails (>= 2.0.0~rc4)
+	 bundler (<< 2.0),
+	 ruby-sprockets-rails (>= 2.0),
+	 ruby-sprockets-rails (<< 3.0)
 Breaks: ruby-rails-2.3, ruby-rails-3.2, ruby-activeresource-3.2, ruby-rails-4.0
 Replaces: ruby-rails-2.3, ruby-rails-3.2, ruby-rails-4.0
 Description: MVC ruby based framework geared for web application development
diff --git a/debian/patches/relax-dependencies b/debian/patches/relax-dependencies
deleted file mode 100644
index 1033b7f..0000000
--- a/debian/patches/relax-dependencies
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: rails-4.0/activesupport/activesupport.gemspec
-===================================================================
---- rails-4.0.orig/activesupport/activesupport.gemspec	2014-01-16 14:15:03.177738377 +0100
-+++ rails-4.0/activesupport/activesupport.gemspec	2014-01-16 14:15:03.173738401 +0100
-@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
- 
-   s.add_dependency('i18n',       '~> 0.6', '>= 0.6.4')
-   s.add_dependency 'multi_json', '~> 1.3'
--  s.add_dependency 'tzinfo',     '~> 0.3.37'
--  s.add_dependency 'minitest',   '~> 4.2'
-+  s.add_dependency 'tzinfo',     '>= 0.3.37'
-+  s.add_dependency 'minitest',   '> 4.2'
-   s.add_dependency 'thread_safe','~> 0.1'
- end
-Index: rails-4.0/actionpack/actionpack.gemspec
-===================================================================
---- rails-4.0.orig/actionpack/actionpack.gemspec	2013-06-03 13:14:42.100796407 +0200
-+++ rails-4.0/actionpack/actionpack.gemspec	2014-01-16 14:15:38.925520202 +0100
-@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
-   s.requirements << 'none'
- 
-   s.add_dependency 'activesupport', version
--  s.add_dependency 'builder',       '~> 3.1.0'
-+  s.add_dependency 'builder',       '> 3.1'
-   s.add_dependency 'rack',          '~> 1.5.2'
-   s.add_dependency 'rack-test',     '~> 0.6.2'
-   s.add_dependency 'erubis',        '~> 2.7.0'
-Index: rails-4.0/activemodel/activemodel.gemspec
-===================================================================
---- rails-4.0.orig/activemodel/activemodel.gemspec	2013-06-03 13:14:42.136795912 +0200
-+++ rails-4.0/activemodel/activemodel.gemspec	2014-01-16 14:15:50.241451140 +0100
-@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
- 
-   s.add_dependency 'activesupport', version
- 
--  s.add_dependency 'builder', '~> 3.1.0'
-+  s.add_dependency 'builder', '> 3.1'
- end
diff --git a/debian/patches/series b/debian/patches/series
index 25026da..bb07559 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-relax-dependencies
 mona_lisa.jpg_is_PD-Art_and_has_been_removed.patch
 be-carefull-with-that-bundler.patch
diff --git a/debian/ruby-railties.lintian-overrides b/debian/ruby-railties.lintian-overrides
index 470903f..2cb0251 100644
--- a/debian/ruby-railties.lintian-overrides
+++ b/debian/ruby-railties.lintian-overrides
@@ -1 +1 @@
-ruby-railties-4.1: extra-license-file usr/lib/ruby/vendor_ruby/rails/generators/rails/plugin_new/templates/MIT-LICENSE
+ruby-railties: extra-license-file usr/lib/ruby/vendor_ruby/rails/generators/rails/plugin_new/templates/MIT-LICENSE

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



More information about the Pkg-ruby-extras-commits mailing list