From 5d50dee71febb90021f03a353c2730d1f5ef787f Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Fri, 15 Sep 2006 10:13:27 +0000
Subject: [PATCH] Version updates and missing licenses

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5120 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activerecord/lib/active_record/version.rb |  2 +-
 activeresource/MIT-LICENSE                | 20 ++++++++++++++++++++
 activesupport/MIT-LICENSE                 | 20 ++++++++++++++++++++
 railties/Rakefile                         |  6 +++---
 4 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 activeresource/MIT-LICENSE
 create mode 100644 activesupport/MIT-LICENSE

diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index 3158040d47..4568a1b4b4 100644
--- a/activerecord/lib/active_record/version.rb
+++ b/activerecord/lib/active_record/version.rb
@@ -2,7 +2,7 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 14
-    TINY  = 2
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/activeresource/MIT-LICENSE b/activeresource/MIT-LICENSE
new file mode 100644
index 0000000000..7f65dd1989
--- /dev/null
+++ b/activeresource/MIT-LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2006 David Heinemeier Hansson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/activesupport/MIT-LICENSE b/activesupport/MIT-LICENSE
new file mode 100644
index 0000000000..c1caf0bfc1
--- /dev/null
+++ b/activesupport/MIT-LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2005-2006 David Heinemeier Hansson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/railties/Rakefile b/railties/Rakefile
index bef6921494..19cfa04a05 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -280,9 +280,9 @@ spec = Gem::Specification.new do |s|
 
   s.add_dependency('rake', '>= 0.7.1')
   s.add_dependency('activesupport',    '= 1.3.1' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 1.14.2' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 1.12.1' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 1.2.1' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 1.14.4' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 1.12.5' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 1.2.5' + PKG_BUILD)
   s.add_dependency('actionwebservice', '= 1.1.2' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'