[DRE-commits] [rails-3.2] 01/02: Drop Provides|Conflicts|Replaces agains unversioned packages
Antonio Terceiro
terceiro at moszumanska.debian.org
Fri Mar 28 15:22:18 UTC 2014
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository rails-3.2.
commit 4313f373a77ae3e894ede647a1d885618b53c8d3
Author: Antonio Terceiro <terceiro at debian.org>
Date: Fri Mar 28 11:12:32 2014 -0300
Drop Provides|Conflicts|Replaces agains unversioned packages
unversioned packages = ruby-activerecord, ruby-actionpack etc. There is
no reason for the binaries in this package to avoid the empty dependency
packages from src:rails -- which depend on the ones from src:rails-3.2!
---
actionpack/actionpack.gemspec | 4 +--
activemodel/activemodel.gemspec | 2 +-
activerecord/activerecord.gemspec | 4 +--
.../connection_adapters/mysql2_adapter.rb | 1 -
.../connection_adapters/mysql_adapter.rb | 1 -
.../connection_adapters/postgresql_adapter.rb | 1 -
.../connection_adapters/sqlite3_adapter.rb | 1 -
debian/changelog | 9 ++++++
debian/control | 32 ++++++----------------
railties/lib/rails/generators/app_base.rb | 14 ++--------
railties/lib/rails/tasks/tmp.rake | 14 ++++++----
11 files changed, 33 insertions(+), 50 deletions(-)
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index cd906c0..f997b78 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -22,11 +22,11 @@ Gem::Specification.new do |s|
s.add_dependency('activesupport', version)
s.add_dependency('activemodel', version)
s.add_dependency('rack-cache', '~> 1.2')
- s.add_dependency('builder', '~> 3.0.0')
+ s.add_dependency('builder', '~> 3.0')
s.add_dependency('rack', '~> 1.4.5')
s.add_dependency('rack-test', '~> 0.6.1')
s.add_dependency('journey', '~> 1.0.4')
- s.add_dependency('sprockets', '~> 2.2.1')
+ s.add_dependency('sprockets', '~> 2.2')
s.add_dependency('erubis', '~> 2.7.0')
s.add_development_dependency('tzinfo', '~> 0.3.29')
diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec
index a4f0836..ce70370 100644
--- a/activemodel/activemodel.gemspec
+++ b/activemodel/activemodel.gemspec
@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
s.require_path = 'lib'
s.add_dependency('activesupport', version)
- s.add_dependency('builder', '~> 3.0.0')
+ s.add_dependency('builder', '~> 3.0')
end
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index 7e93d8a..d0f7441 100644
--- a/activerecord/activerecord.gemspec
+++ b/activerecord/activerecord.gemspec
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
s.add_dependency('activesupport', version)
s.add_dependency('activemodel', version)
- s.add_dependency('arel', '~> 3.0.2')
- s.add_dependency('tzinfo', '~> 0.3.29')
+ s.add_dependency('arel', '~> 4.0')
+ s.add_dependency('tzinfo', '~> 1.0')
end
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index c690b98..2157dd5 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -1,6 +1,5 @@
require 'active_record/connection_adapters/abstract_mysql_adapter'
-gem 'mysql2', '~> 0.3.10'
require 'mysql2'
module ActiveRecord
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 4850b68..c70cfc9 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -2,7 +2,6 @@ require 'active_record/connection_adapters/abstract_mysql_adapter'
require 'active_record/connection_adapters/statement_pool'
require 'active_support/core_ext/hash/keys'
-gem 'mysql', '~> 2.8'
require 'mysql'
class Mysql
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index e98337e..0db04ac 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -4,7 +4,6 @@ require 'active_record/connection_adapters/statement_pool'
require 'arel/visitors/bind_visitor'
# Make sure we're using pg high enough for PGResult#values
-gem 'pg', '~> 0.11'
require 'pg'
module ActiveRecord
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index 11bb457..b6b50db 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -1,6 +1,5 @@
require 'active_record/connection_adapters/sqlite_adapter'
-gem 'sqlite3', '~> 1.3.5'
require 'sqlite3'
module ActiveRecord
diff --git a/debian/changelog b/debian/changelog
index 72b64f3..34a969c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+rails-3.2 (3.2.17-2) unstable; urgency=medium
+
+ * Drop Provides|Conflicts|Replaces agains unversioned packages
+ (ruby-activerecord, ruby-actionpack etc). There is no reason for the
+ binaries in this package to avoid the empty dependency packages from
+ src:rails.
+
+ -- Antonio Terceiro <terceiro at debian.org> Fri, 28 Mar 2014 11:19:33 -0300
+
rails-3.2 (3.2.17-1) unstable; urgency=medium
* New upstream release. Includes fixes for the following security issues:
diff --git a/debian/control b/debian/control
index 10b6aa2..1fc39f6 100644
--- a/debian/control
+++ b/debian/control
@@ -24,10 +24,8 @@ Depends: ${shlibs:Depends},
ruby-i18n (>= 0.6~),
ruby-multi-json (>= 1.0~),
ruby-test-unit,
-Provides: ruby-activesupport
-Conflicts: ruby-activesupport
Breaks: ruby-activesupport-2.3
-Replaces: ruby-activesupport, ruby-activesupport-2.3
+Replaces: ruby-activesupport-2.3
Description: Support and utility classes used by the Rails 3.2 framework
ActiveSupport consists of utility classes and extensions to the Ruby
standard library that were required for Rails but found to be
@@ -43,10 +41,8 @@ Depends: ${misc:Depends},
ruby-activemodel-3.2 (= ${source:Version}),
ruby-arel (>= 3.0.2~),
ruby-tzinfo (>= 0.3.29~)
-Provides: ruby-activerecord
-Conflicts: ruby-activerecord
Breaks: ruby-activerecord-2.3
-Replaces: ruby-activerecord, ruby-activerecord-2.3
+Replaces: ruby-activerecord-2.3
Description: object-relational mapper framework (part of Rails)
Active Records is a framework to work with databases on Rails. Build
a persistent domain model by mapping database tables to Ruby classes.
@@ -61,10 +57,8 @@ Depends: ${misc:Depends},
ruby | ruby-interpreter,
ruby-activesupport-3.2 (= ${source:Version}),
ruby-activemodel-3.2 (= ${source:Version})
-Provides: ruby-activeresource
-Conflicts: ruby-activeresource
Breaks: ruby-activeresource-2.3
-Replaces: ruby-activeresource, ruby-activeresource-2.3
+Replaces: ruby-activeresource-2.3
Description: REST modeling framework (part of Rails)
Active Resource (ARes) connects business objects and Representational
State Transfer (REST) web services. It implements object-relational
@@ -80,9 +74,6 @@ Depends: ${misc:Depends},
ruby-builder (>= 3.0.0),
ruby-bcrypt (>= 3.0.0),
ruby-activesupport-3.2 (= ${source:Version})
-Provides: ruby-activemodel
-Conflicts: ruby-activemodel
-Replaces: ruby-activemodel
Description: toolkit for building modeling frameworks (part of Rails)
Active Model is a toolkit for building modeling frameworks like
Active Record and Active Resource. This includes a rich support for
@@ -106,10 +97,8 @@ Depends: ${misc:Depends},
ruby-builder (>= 3.0.0),
ruby-erubis (>= 2.7.0~),
ruby-tzinfo (>= 0.3.29~)
-Provides: ruby-actionpack
-Conflicts: ruby-actionpack
Breaks: ruby-actionpack-2.3
-Replaces: ruby-actionpack, ruby-actionpack-2.3
+Replaces: ruby-actionpack-2.3
Description: web-flow and rendering framework putting the VC in MVC (part of Rails)
Action Pack is a framework for web apps on Rails. Simple,
battle-tested conventions for building and testing MVC web
@@ -127,9 +116,8 @@ Depends: ${shlibs:Depends},
ruby-activesupport-3.2 (= ${source:Version}),
ruby-activerecord-3.2 (= ${source:Version}),
ruby-mail (>= 2.4.4~)
-Provides: ruby-actionmailer
-Breaks: ruby-actionmailer, ruby-actionmailer-2.3
-Replaces: ruby-actionmailer, ruby-actionmailer-2.3
+Breaks: ruby-actionmailer-2.3
+Replaces: ruby-actionmailer-2.3
Description: email composition, delivery, and receiving framework (part of Rails)
Action Mailer is a framework for working with email on Rails.
Compose, deliver, receive, and test emails using the familiar
@@ -150,10 +138,8 @@ Depends: ${misc:Depends},
ruby-actionmailer-3.2 (= ${source:Version}),
ruby-activemodel-3.2 (= ${source:Version}),
ruby-activeresource-3.2 (= ${source:Version})
-Provides: ruby-railties
-Conflicts: ruby-railties
Breaks: ruby-rails-2.3
-Replaces: ruby-railties, ruby-rails-2.3
+Replaces: ruby-rails-2.3
Description: MVC ruby based framework geared for web application development
Rails is a full-stack, open-source web framework in Ruby for writing
real-world applications.
@@ -178,10 +164,8 @@ Depends: ${shlibs:Depends},
bundler,
rubygems-integration,
Recommends: ruby-jquery-rails, ruby-coffee-rails, ruby-sqlite3, ruby-sass-rails, ruby-uglifier
-Provides: ruby-rails
-Conflicts: ruby-rails
Breaks: ruby-rails-2.3
-Replaces: ruby-rails, ruby-rails-2.3
+Replaces: ruby-rails-2.3
Description: MVC ruby based framework geared for web application development
Rails is a full-stack, open-source web framework in Ruby for writing
real-world applications.
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 398319c..16cb881 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -241,21 +241,11 @@ module Rails
def bundle_command(command)
say_status :run, "bundle #{command}"
- # We are going to shell out rather than invoking Bundler::CLI.new(command)
- # because `rails new` loads the Thor gem and on the other hand bundler uses
- # its own vendored Thor, which could be a different version. Running both
- # things in the same process is a recipe for a night with paracetamol.
- #
- # We use backticks and #print here instead of vanilla #system because it
- # is easier to silence stdout in the existing test suite this way. The
- # end-user gets the bundler commands called anyway, so no big deal.
- #
- # Thanks to James Tucker for the Gem tricks involved in this call.
- print `"#{Gem.ruby}" -rubygems "#{Gem.bin_path('bundler', 'bundle')}" #{command}`
+ print `"#{Gem.ruby}" -rubygems /usr/bin/bundle #{command}`
end
def run_bundle
- bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle]
+ bundle_command('install --local') unless options[:skip_gemfile] || options[:skip_bundle]
end
def empty_directory_with_gitkeep(destination, config = {})
diff --git a/railties/lib/rails/tasks/tmp.rake b/railties/lib/rails/tasks/tmp.rake
index 0d6c103..7a11902 100644
--- a/railties/lib/rails/tasks/tmp.rake
+++ b/railties/lib/rails/tasks/tmp.rake
@@ -4,34 +4,38 @@ namespace :tmp do
desc "Creates tmp directories for sessions, cache, sockets, and pids"
task :create do
- FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets tmp/pids tmp/cache/assets ))
+ FileUtils.mkdir_p(File.join(Rails.configuration.paths["tmp"],"sessions"))
+ FileUtils.mkdir_p(File.join(Rails.configuration.paths["tmp"],"cache"))
+ FileUtils.mkdir_p(File.join(Rails.configuration.paths["tmp"],"sockets"))
+ FileUtils.mkdir_p(File.join(Rails.configuration.paths["tmp"],"pids"))
+ FileUtils.mkdir_p(File.join(Rails.configuration.paths["tmp"],"cache/assets"))
end
namespace :sessions do
# desc "Clears all files in tmp/sessions"
task :clear do
- FileUtils.rm(Dir['tmp/sessions/[^.]*'])
+ FileUtils.rm(Dir[File.join(Rails.configuration.paths["tmp"],'sessions/[^.]*')])
end
end
namespace :cache do
# desc "Clears all files and directories in tmp/cache"
task :clear do
- FileUtils.rm_rf(Dir['tmp/cache/[^.]*'])
+ FileUtils.rm_rf(Dir[File.join(Rails.configuration.paths["tmp"],'cache/[^.]*')])
end
end
namespace :sockets do
# desc "Clears all files in tmp/sockets"
task :clear do
- FileUtils.rm(Dir['tmp/sockets/[^.]*'])
+ FileUtils.rm(Dir[File.join(Rails.configuration.paths["tmp"],'sockets/[^.]*')])
end
end
namespace :pids do
# desc "Clears all files in tmp/pids"
task :clear do
- FileUtils.rm(Dir['tmp/pids/[^.]*'])
+ FileUtils.rm(Dir[File.join(Rails.configuration.paths["tmp"],'pids/[^.]*')])
end
end
end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rails-3.2.git
More information about the Pkg-ruby-extras-commits
mailing list