[DRE-commits] [rails] 36/44: Drop versioning from rails package, we won't to provide just the last stable upstream major version

Ondrej Sury ondrej at moszumanska.debian.org
Wed Jul 16 15:04:02 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 1f94e629bca3bc4c9977c50421bb352d040bbadc
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Jul 16 14:56:32 2014 +0200

    Drop versioning from rails package, we won't to provide just the last stable upstream major version
---
 debian/control                                     | 89 +++++++++-------------
 ...ctionmailer-4.0.docs => ruby-actionmailer.docs} |  0
 ...by-actionpack-4.0.docs => ruby-actionpack.docs} |  0
 ...-activemodel-4.0.docs => ruby-activemodel.docs} |  0
 ...ctiverecord-4.0.docs => ruby-activerecord.docs} |  0
 ...ord-4.0.examples => ruby-activerecord.examples} |  0
 ...ivesupport-4.0.docs => ruby-activesupport.docs} |  0
 debian/{ruby-rails-4.0.docs => ruby-rails.docs}    |  0
 debian/ruby-railties-4.0.lintian-overrides         |  1 -
 .../{ruby-railties-4.0.docs => ruby-railties.docs} |  0
 debian/ruby-railties.lintian-overrides             |  1 +
 11 files changed, 39 insertions(+), 52 deletions(-)

diff --git a/debian/control b/debian/control
index 6784114..5f38baf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: rails-4.0
+Source: rails
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
@@ -8,12 +8,12 @@ Build-Depends: debhelper (>= 9),
 	       gem2deb (>= 0.4.0~),
 	       racc
 Standards-Version: 3.9.4
-Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/rails-4.0.git
-Vcs-Browser: http://anonscm.debian.org/git/?p=pkg-ruby-extras/rails-4.0.git;a=summary
+Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/rails.git
+Vcs-Browser: http://anonscm.debian.org/git/?p=pkg-ruby-extras/rails.git;a=summary
 Homepage: http://www.rubyonrails.org
 XS-Ruby-Versions: all
 
-Package: ruby-activesupport-4.0
+Package: ruby-activesupport
 Architecture: all
 X-DhRuby-Root: activesupport/
 XB-Ruby-Versions: ${ruby:Versions}
@@ -25,36 +25,32 @@ Depends: ${shlibs:Depends},
 	 ruby-tzinfo (>= 0.3.37),
 	 ruby-minitest (>= 4.2),
 	 ruby-thread-safe (>= 0.1)
-Provides: ruby-activesupport
-Conflicts: ruby-activesupport
-Breaks: ruby-activesupport-2.3, ruby-activesupport-3.2
-Replaces: ruby-activesupport, ruby-activesupport-2.3, ruby-activesupport-3.2
-Description: Support and utility classes used by the Rails 4.0 framework
+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
  standard library that were required for Rails but found to be
  generally useful.
 
-Package: ruby-activerecord-4.0
+Package: ruby-activerecord
 Architecture: all
 X-DhRuby-Root: activerecord/
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${misc:Depends},
 	 ruby | ruby-interpreter,
-	 ruby-activesupport-4.0 (= ${source:Version}),
-	 ruby-activemodel-4.0 (= ${source:Version}),
+	 ruby-activesupport (= ${source:Version}),
+	 ruby-activemodel (= ${source:Version}),
 	 ruby-arel (>= 4.0.0)
 Recommends: ruby-activerecord-deprecated-finders (>= 1.0.2),
-Provides: ruby-activerecord
-Conflicts: ruby-activerecord
-Breaks: ruby-activerecord-2.3, ruby-activerecord-3.2
-Replaces: ruby-activerecord, ruby-activerecord-2.3, ruby-activerecord-3.2
+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
  a persistent domain model by mapping database tables to Ruby classes.
  Strong conventions for associations, validations, aggregations,
  migrations, and testing come baked-in.
 
-Package: ruby-activemodel-4.0
+Package: ruby-activemodel
 Architecture: all
 X-DhRuby-Root: activemodel/
 XB-Ruby-Versions: ${ruby:Versions}
@@ -62,56 +58,51 @@ Depends: ${misc:Depends},
 	 ruby | ruby-interpreter,
 	 ruby-builder (>= 3.1.0),
 	 ruby-bcrypt (>= 3.0.0),
-	 ruby-activesupport-4.0 (= ${source:Version})
-Provides: ruby-activemodel
-Conflicts: ruby-activemodel
-Breaks: ruby-activemodel-3.2
-Replaces: ruby-activemodel, ruby-activemodel-3.2
+	 ruby-activesupport (= ${source:Version})
+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
  Active Record and Active Resource.  This includes a rich support for
  attributes, callbacks, validations, observers, serialization,
  internationalization, and testing.
 
-Package: ruby-actionpack-4.0
+Package: ruby-actionpack
 Architecture: all
 X-DhRuby-Root: actionpack/
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${misc:Depends},
 	 ruby | ruby-interpreter,
-	 ruby-activesupport-4.0 (= ${source:Version}),
+	 ruby-activesupport (= ${source:Version}),
 	 ruby-rack (>= 1.5.2),
 	 ruby-rack-test (>= 0.6.2),
 	 ruby-builder (>= 3.1.0),
 	 ruby-erubis (>= 2.7.0~)
-Provides: ruby-actionpack
-Conflicts: ruby-actionpack
-Breaks: ruby-actionpack-2.3, ruby-actionpack-3.2
-Replaces: ruby-actionpack, ruby-actionpack-2.3, ruby-actionpack-3.2
+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,
  battle-tested conventions for building and testing MVC web
  applications. Works with any Rack-compatible server.
 
-Package: ruby-actionmailer-4.0
+Package: ruby-actionmailer
 Architecture: all
 X-DhRuby-Root: actionmailer/
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ruby | ruby-interpreter,
-	 ruby-actionpack-4.0 (= ${source:Version}),
+	 ruby-actionpack (= ${source:Version}),
 	 ruby-mail (>= 2.5.3~)
-Provides: ruby-actionmailer
-Breaks: ruby-actionmailer, ruby-actionmailer-2.3, ruby-actionmailer-3.2
-Replaces: ruby-actionmailer, ruby-actionmailer-2.3, ruby-actionmailer-3.2
+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.
  Compose, deliver, receive, and test emails using the familiar
  controller/view pattern.  First-class support for multipart email
  and attachments.
 
-Package: ruby-railties-4.0
+Package: ruby-railties
 Architecture: all
 X-DhRuby-Root: railties/
 XB-Ruby-Versions: ${ruby:Versions}
@@ -120,12 +111,10 @@ Depends: ${misc:Depends},
 	 rake (>= 0.8.7),
 	 ruby-thor (>= 0.18.1),
 	 ruby-rack-ssl (>= 1.3.2),
-	 ruby-activesupport-4.0 (= ${source:Version}),
-	 ruby-actionpack-4.0 (= ${source:Version})
-Provides: ruby-railties
-Conflicts: ruby-railties
-Breaks: ruby-rails-2.3, ruby-railties-3.2, rails (<< 3:3.2.0), rails3
-Replaces: ruby-railties, ruby-rails-2.3, ruby-railties-3.2
+	 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
+Replaces: ruby-rails-2.3, ruby-railties-3.2, ruby-railties-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
  real-world applications.
@@ -135,23 +124,21 @@ Description: MVC ruby based framework geared for web application development
  use a single language from top to bottom. Everything from templates to
  control flow to business logic is written in Ruby.
 
-Package: ruby-rails-4.0
+Package: ruby-rails
 Architecture: all
 X-DhRuby-Root: ./
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends},
 	 ${misc:Depends},
-	 ruby-activesupport-4.0 (= ${source:Version}),
-	 ruby-actionpack-4.0 (= ${source:Version}),
-	 ruby-activerecord-4.0 (= ${source:Version}),
-	 ruby-actionmailer-4.0 (= ${source:Version}),
-	 ruby-railties-4.0 (= ${source:Version}),
+	 ruby-activesupport (= ${source:Version}),
+	 ruby-actionpack (= ${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)
-Provides: ruby-rails
-Conflicts: ruby-rails
-Breaks: ruby-rails-2.3, ruby-rails-3.2, ruby-activeresource-3.2
-Replaces: ruby-rails, ruby-rails-2.3, ruby-rails-3.2
+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
  Rails is a full-stack, open-source web framework in Ruby for writing
  real-world applications.
@@ -161,4 +148,4 @@ Description: MVC ruby based framework geared for web application development
  use a single language from top to bottom. Everything from templates to
  control flow to business logic is written in Ruby.
  .
- This package provides Rails version 4.0.
+ This package provides Rails version 4.1.
diff --git a/debian/ruby-actionmailer-4.0.docs b/debian/ruby-actionmailer.docs
similarity index 100%
rename from debian/ruby-actionmailer-4.0.docs
rename to debian/ruby-actionmailer.docs
diff --git a/debian/ruby-actionpack-4.0.docs b/debian/ruby-actionpack.docs
similarity index 100%
rename from debian/ruby-actionpack-4.0.docs
rename to debian/ruby-actionpack.docs
diff --git a/debian/ruby-activemodel-4.0.docs b/debian/ruby-activemodel.docs
similarity index 100%
rename from debian/ruby-activemodel-4.0.docs
rename to debian/ruby-activemodel.docs
diff --git a/debian/ruby-activerecord-4.0.docs b/debian/ruby-activerecord.docs
similarity index 100%
rename from debian/ruby-activerecord-4.0.docs
rename to debian/ruby-activerecord.docs
diff --git a/debian/ruby-activerecord-4.0.examples b/debian/ruby-activerecord.examples
similarity index 100%
rename from debian/ruby-activerecord-4.0.examples
rename to debian/ruby-activerecord.examples
diff --git a/debian/ruby-activesupport-4.0.docs b/debian/ruby-activesupport.docs
similarity index 100%
rename from debian/ruby-activesupport-4.0.docs
rename to debian/ruby-activesupport.docs
diff --git a/debian/ruby-rails-4.0.docs b/debian/ruby-rails.docs
similarity index 100%
rename from debian/ruby-rails-4.0.docs
rename to debian/ruby-rails.docs
diff --git a/debian/ruby-railties-4.0.lintian-overrides b/debian/ruby-railties-4.0.lintian-overrides
deleted file mode 100644
index 3469f81..0000000
--- a/debian/ruby-railties-4.0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-ruby-railties-4.0: extra-license-file usr/lib/ruby/vendor_ruby/rails/generators/rails/plugin_new/templates/MIT-LICENSE
diff --git a/debian/ruby-railties-4.0.docs b/debian/ruby-railties.docs
similarity index 100%
rename from debian/ruby-railties-4.0.docs
rename to debian/ruby-railties.docs
diff --git a/debian/ruby-railties.lintian-overrides b/debian/ruby-railties.lintian-overrides
new file mode 100644
index 0000000..470903f
--- /dev/null
+++ b/debian/ruby-railties.lintian-overrides
@@ -0,0 +1 @@
+ruby-railties-4.1: 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