[DRE-commits] [SCM] rails-2.3.git branch, master, updated. debian/2.3.14-2-6-ga8340a4

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit ab8e4da58ac6bf9b4a2d23d2b079263ea4dfdab2
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Jun 29 19:55:46 2012 +0200

    Bumped the gem2deb build-dep and standards-version

diff --git a/debian/changelog b/debian/changelog
index 0ae5bcb..729ab80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruby-rails-2.3 (2.3.14-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * debian/control.in:
+    - Bumped standards-version to 3.9.3.
+    - Bumped build-dependency on gem2deb to >= 0.3.0~.
+    - Changed conflicts into breaks.
+
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 29 Jun 2012 19:55:28 +0200
+
 ruby-rails-2.3 (2.3.14-2) unstable; urgency=low
 
   * Add dependency on symlinked javascript libraries
diff --git a/debian/control.in b/debian/control.in
index 9973598..d15ca17 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -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.3~),
+	       gem2deb (>= 0.3.0~),
 	       rake (>= 0.8.3),
 	       ruby-activesupport-2.3 (>= @RAILS_VERSION@),
 	       ruby-activesupport-2.3 (<< @RAILS_VERSION at .1),
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 7.0.50~),
 	       ruby-actionmailer-2.3 (<< @RAILS_VERSION at .1),
 	       ruby-activeresource-2.3 (>= @RAILS_VERSION@),
 	       ruby-activeresource-2.3 (<< @RAILS_VERSION at .1)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-rails-2.3.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-rails-2.3.git;a=summary
 Homepage: http://www.rubyonrails.org
@@ -40,7 +40,7 @@ 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~)
+Breaks: 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-2.3.git