[DRE-commits] [rails] 01/02: fix upgrades from wheezy
Antonio Terceiro
terceiro at moszumanska.debian.org
Tue Oct 7 19:26:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository rails.
commit 131c84e25f2cd62848037034dc7700bb139c04b0
Author: Antonio Terceiro <terceiro at debian.org>
Date: Mon Sep 29 20:51:12 2014 -0300
fix upgrades from wheezy
---
debian/changelog | 13 +++++++++++++
debian/control | 14 ++++----------
debian/copyright | 7 ++++---
3 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8a3e5ba..a42b42a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+rails (2:4.1.6-2) UNRELEASED; urgency=medium
+
+ * fix upgrades from wheezy:
+ - Remove Breaks: against old packages provided by previous versions of
+ Rails The Replaces: fields, left untouched, outght to be enough.
+ - ruby-actionview: Replaces ruby-actionpack-{2.3,3.2} since
+ ruby-actionview contains files that used to be in ruby-actionpack-*
+ - ruby-railties: Breaks/Replaces rails (<< 2:4) since ruby-railties
+ contains /usr/bin/rails which used to be in rails.
+ * debian/copyright: minor updates
+
+ -- Antonio Terceiro <terceiro at debian.org> Sun, 28 Sep 2014 22:28:50 -0300
+
rails (2:4.1.6-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/control b/debian/control
index 4460159..b77245b 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,6 @@ Depends: ruby | ruby-interpreter,
ruby-tzinfo (>= 1.1),
${misc:Depends},
${shlibs:Depends}
-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
ActiveSupport consists of utility classes and extensions to the Ruby
@@ -45,7 +44,6 @@ Depends: ruby | ruby-interpreter,
ruby-arel (<< 5.1.0),
ruby-arel (>= 5.0.0),
${misc:Depends}
-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)
Active Records is a framework to work with databases on Rails. Build
@@ -62,7 +60,6 @@ Depends: ruby | ruby-interpreter,
ruby-builder (<< 4.0),
ruby-builder (>= 3.1),
${misc:Depends}
-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)
Active Model is a toolkit for building modeling frameworks like
@@ -81,6 +78,7 @@ Depends: ruby | ruby-interpreter,
ruby-erubis (<< 2.8),
ruby-erubis (>= 2.7.0),
${misc:Depends}
+Replaces: ruby-actionpack-2.3, ruby-actionpack-3.2
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
@@ -100,7 +98,6 @@ Depends: ruby | ruby-interpreter,
ruby-rack-test (<< 0.7),
ruby-rack-test (>= 0.6.2),
${misc:Depends}
-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)
Action Pack is a framework for web apps on Rails. Simple,
@@ -117,7 +114,6 @@ Depends: ruby | ruby-interpreter,
ruby-mail (>= 2.5.4),
${misc:Depends},
${shlibs:Depends}
-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)
Action Mailer is a framework for working with email on Rails.
@@ -136,8 +132,8 @@ Depends: rake (>= 0.8.7),
ruby-thor (<< 2.0),
ruby-thor (>= 0.18.1),
${misc:Depends}
-Breaks: ruby-rails-2.3, ruby-railties-3.2, ruby-railties-4.0
-Replaces: ruby-rails-2.3, ruby-railties-3.2, ruby-railties-4.0
+Breaks: rails (<< 2:4)
+Replaces: rails (<< 2:4), ruby-rails-2.3, ruby-railties-3.2, ruby-railties-4.0
Description: tools for creating, working with, and running Rails applications
This package contains the Rails internals, i.e. components that implement
and/or control application bootup, plugins, generators, and rake tasks.
@@ -169,8 +165,7 @@ Recommends: ruby-coffee-rails,
ruby-sqlite3,
ruby-turbolinks,
ruby-uglifier
-Conflicts: ruby-activeresource-3.2
-Breaks: ruby-rails-2.3, ruby-rails-3.2, ruby-rails-4.0
+Breaks: ruby-activeresource-3.2
Replaces: ruby-rails-2.3, ruby-rails-3.2, ruby-rails-4.0
Description: MVC ruby based framework geared for web application development
Rails is a full-stack, open-source web framework in Ruby for writing
@@ -184,7 +179,6 @@ Description: MVC ruby based framework geared for web application development
Package: rails
Architecture: all
Depends: ruby-rails (= ${source:Version}), ${misc:Depends}
-Breaks: rails3
Replaces: rails3
Description: MVC ruby based framework geared for web application development (metapackage)
Rails is a full-stack, open-source web framework in Ruby for writing
diff --git a/debian/copyright b/debian/copyright
index 710750c..08be865 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,15 +18,16 @@ License: GPL or Expat
Files: actionpack/test/controller/selector_test.rb
actionpack/test/controller/assert_select_test.rb
- actionpack/lib/action_view/vendor/html-scanner/html/selector.rb
+ actionview/lib/action_view/vendor/html-scanner/html/selector.rb
actionpack/lib/action_dispatch/testing/assertions/selector.rb
Copyright: 2006 Assaf Arkin (http://labnotes.org)
License: Expat or CC-BY-3.0
Files: actionpack/test/fixtures/multipart/mona_lisa.jpg
Copyright: Musée du Louvre
-License: Public Domain
- This work is in the public domain
+License: public-domain
+ This files is a reproduction of the famous Mona Lisa, a painting from the
+ 16th century which is already the public domain.
Files: debian/*
Copyright: Copyright 2011 Ondřej Surý <ondrej at debian.org>
--
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