[DRE-commits] [SCM] ruby-railties-3.2.git branch, master, updated. debian/3.2.3-1-13-g254176a

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit bedbcafd1474bf5f34641d77dcb4943482726812
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 16 22:45:29 2012 -0300

    Update packaging to 3.2.6-1 + provide /usr/bin/rails

diff --git a/debian/changelog b/debian/changelog
index f586383..8b10259 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ruby-railties-3.2 (3.2.6-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + Conflict with ruby-rails-2.3, which also provides Rails core code.
+    + Conflict with rails (<< 3:3.2.0), which also provides /usr/bin/rails
+  * debian/rules:
+    + Do not move /usr/bin/rails away. That is now handled by a conflict
+      releationship with the package rails.
+
+ -- Antonio Terceiro <terceiro at debian.org>  Sat, 16 Jun 2012 22:42:46 -0300
+
 ruby-railties-3.2 (3.2.3-1) unstable; urgency=low
 
   * Initial release (Closes: #620253)
diff --git a/debian/control b/debian/control
index cac215f..5010462 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,21 @@ Source: ruby-railties-3.2
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Ondřej Surý <ondrej at debian.org>
+Uploaders:
+	Ondřej Surý <ondrej at debian.org>,
+	Antonio Terceiro <terceiro at debian.org>,
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~),
 	       gem2deb (>= 0.2.13~),
 	       rake (>= 0.8.7),
 	       ruby-thor (>= 0.14.6),
 	       ruby-rack-ssl (>= 1.3.2),
-	       ruby-activesupport-3.2 (>= 3.2.3),
-	       ruby-activesupport-3.2 (<< 3.2.3.),
-	       ruby-actionpack-3.2 (>= 3.2.3),
-	       ruby-actionpack-3.2 (<< 3.2.3.),
-	       ruby-actionmailer-3.2 (>= 3.2.3),
-	       ruby-actionmailer-3.2 (<< 3.2.3.),
+	       ruby-activesupport-3.2 (>= 3.2.6),
+	       ruby-activesupport-3.2 (<< 3.2.6.),
+	       ruby-actionpack-3.2 (>= 3.2.6),
+	       ruby-actionpack-3.2 (<< 3.2.6.),
+	       ruby-actionmailer-3.2 (>= 3.2.6),
+	       ruby-actionmailer-3.2 (<< 3.2.6.),
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-railties-3.2.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-railties-3.2.git;a=summary
@@ -30,12 +32,13 @@ Depends: ${shlibs:Depends},
 	 rake (>= 0.8.7),
 	 ruby-thor (>= 0.14.6),
 	 ruby-rack-ssl (>= 1.3.2),
-	 ruby-activesupport-3.2 (>= 3.2.3),
-	 ruby-activesupport-3.2 (<< 3.2.3.),
-	 ruby-actionpack-3.2 (>= 3.2.3),
-	 ruby-actionpack-3.2 (<< 3.2.3.),
-	 ruby-actionmailer-3.2 (>= 3.2.3),
-	 ruby-actionmailer-3.2 (<< 3.2.3.),
+	 ruby-activesupport-3.2 (>= 3.2.6),
+	 ruby-activesupport-3.2 (<< 3.2.6.),
+	 ruby-actionpack-3.2 (>= 3.2.6),
+	 ruby-actionpack-3.2 (<< 3.2.6.),
+	 ruby-actionmailer-3.2 (>= 3.2.6),
+	 ruby-actionmailer-3.2 (<< 3.2.6.),
+Conflicts: ruby-rails-2.3, rails (<< 3:3.2.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.
diff --git a/debian/control.in b/debian/control.in
index c407068..e687b77 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,9 @@ Source: ruby-railties-3.2
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Ondřej Surý <ondrej at debian.org>
+Uploaders:
+	Ondřej Surý <ondrej at debian.org>,
+	Antonio Terceiro <terceiro at debian.org>,
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~),
 	       gem2deb (>= 0.2.13~),
@@ -36,6 +38,7 @@ Depends: ${shlibs:Depends},
 	 ruby-actionpack-3.2 (<< @RAILS_VERSION at .),
 	 ruby-actionmailer-3.2 (>= @RAILS_VERSION@),
 	 ruby-actionmailer-3.2 (<< @RAILS_VERSION at .),
+Conflicts: ruby-rails-2.3, rails (<< 3:3.2.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.
diff --git a/debian/rules b/debian/rules
index d3be422..fe202a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,3 @@ debian/control: debian/control.in metadata.yml
 
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGELOG.md
-
-override_dh_install:
-	dh_install -O--buildsystem=ruby
-	mv $(CURDIR)/debian/ruby-railties-3.2/usr/bin/rails $(CURDIR)/debian/ruby-railties-3.2/usr/bin/rails-3.2

-- 
ruby-railties-3.2.git