[DRE-commits] [SCM] ruby-activerecord-2.3.git branch, master, updated. debian/2.3.14-1-5-g286c025

[Paul van Tilburg]

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

    Bumped the gem2deb build-dep and standards-version

diff --git a/debian/changelog b/debian/changelog
index 2d36b94..f1b1b21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruby-activerecord-2.3 (2.3.14-2) 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:31:39 +0200
+
 ruby-activerecord-2.3 (2.3.14-1) unstable; urgency=low
 
   * Imported Upstream version 2.3.14
diff --git a/debian/control.in b/debian/control.in
index dbaca21..54a9005 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,10 +5,10 @@ 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~),
 	       ruby-activesupport-2.3 (>= @RAILS_VERSION@),
 	       ruby-activesupport-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-activerecord-2.3.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-activerecord-2.3.git
 Homepage: http://www.rubyonrails.org
@@ -25,9 +25,9 @@ Depends: ${shlibs:Depends},
 Replaces: libactiverecord-ruby (<< 2.3.11-1~),
 	  libactiverecord-ruby1.8 (<< 2.3.11-1~),
 	  libactiverecord-ruby1.9.1 (<< 2.3.11-1~)
-Conflicts: libactiverecord-ruby (<< 2.3.11-1~),
-	   libactiverecord-ruby1.8 (<< 2.3.11-1~),
-	   libactiverecord-ruby1.9.1 (<< 2.3.11-1~)
+Breaks: libactiverecord-ruby (<< 2.3.11-1~),
+	libactiverecord-ruby1.8 (<< 2.3.11-1~),
+	libactiverecord-ruby1.9.1 (<< 2.3.11-1~)
 Provides: libactiverecord-ruby,
 	  libactiverecord-ruby1.8,
 	  libactiverecord-ruby1.9.1

-- 
ruby-activerecord-2.3.git