[DRE-commits] [SCM] rails-2.3.git branch, debian-sid, updated. 0288d3496b551d2b35d0233f10713cb4d65bf2d6

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 9cfa07363264c0768d1ef177ee97757fd22d3353
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Jun 7 15:15:51 2011 +0200

    Add Depends/Replaces/Conflicts on rails-ruby1.8

diff --git a/debian/control b/debian/control
index ed565e5..a1a1150 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
 Uploaders: Ondřej Surý <ondrej at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~),
-	       gem2deb (>= 0.2.4~),
+	       gem2deb (>= 0.2.3~),
 	       rake (>= 0.8.3),
 	       ruby-activesupport-2.3 (>= 2.3.11),
 	       ruby-activesupport-2.3 (<< 2.3.11.1),
@@ -40,6 +40,9 @@ Depends: ${shlibs:Depends},
 	 ruby-actionmailer-2.3 (<< 2.3.11.1),
 	 ruby-activeresource-2.3 (>= 2.3.11),
 	 ruby-activeresource-2.3 (<< 2.3.11.1)
+Conflicts: rails-ruby1.8 (<< 2.3.11-1~)
+Replaces: rails-ruby1.8 (<< 2.3.11-1~)
+Provides: rails-ruby1.8
 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/debian/control.in b/debian/control.in
index e5a079a..9973598 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -40,6 +40,9 @@ Depends: ${shlibs:Depends},
 	 ruby-actionmailer-2.3 (<< @RAILS_VERSION at .1),
 	 ruby-activeresource-2.3 (>= @RAILS_VERSION@),
 	 ruby-activeresource-2.3 (<< @RAILS_VERSION at .1)
+Conflicts: rails-ruby1.8 (<< 2.3.11-1~)
+Replaces: rails-ruby1.8 (<< 2.3.11-1~)
+Provides: rails-ruby1.8
 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.

-- 
rails-2.3.git