[DRE-commits] [SCM] ruby-activesupport-2.3.git branch, master, updated. debian/2.3.14-3-3-g846defe

[Paul van Tilburg]

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

    Bumped the gem2deb build-dep and standards-version; dropped alternative lib*-ruby deps

diff --git a/debian/changelog b/debian/changelog
index 354f20d..5a50402 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ruby-activesupport-2.3 (2.3.14-4) UNRELEASED; urgency=low
+
+  * Team upload.
+  * debian/control.in:
+    - Bumped standards-version to 3.9.3.
+    - Bumped build-dependency on gem2deb to >= 0.3.0~.
+    - Dropped unneeded alternative depends on lib*-ruby packages.
+    - Changed conflicts into breaks.
+
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 29 Jun 2012 19:26:55 +0200
+
 ruby-activesupport-2.3 (2.3.14-3) unstable; urgency=low
 
   * Add gbp configuration for PRE
diff --git a/debian/control.in b/debian/control.in
index c92cbd5..6bd7543 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,12 +5,12 @@ 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~),
-	       ruby-builder (>= 2.1.2~) | libbuilder-ruby (>= 2.1.2~),
-	       ruby-i18n (>= 0.4.1~) | libi18n-ruby (>= 0.4.1~),
-	       ruby-memcache-client (>= 1.7.4~) | libmemcache-client-ruby (>= 1.7.4),
-	       ruby-tzinfo (>= 0.3.12~) | libtzinfo-ruby (>= 0.3.12~)
-Standards-Version: 3.9.2
+	       gem2deb (>= 0.3.0~),
+	       ruby-builder (>= 2.1.2~),
+	       ruby-i18n (>= 0.4.1~),
+	       ruby-memcache-client (>= 1.7.4~),
+	       ruby-tzinfo (>= 0.3.12~)
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-activesupport-2.3.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-activesupport-2.3.git
 Homepage: http://www.rubyonrails.org
@@ -22,12 +22,12 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ruby | ruby-interpreter,
-	 ruby-builder (>= 2.1.2~) | libbuilder-ruby (>= 2.1.2~),
-	 ruby-i18n (>= 0.4.1~) | libi18n-ruby (>= 0.4.1~),
-	 ruby-memcache-client (>= 1.7.4~) | libmemcache-client-ruby (>= 1.7.4),
-	 ruby-tzinfo (>= 0.3.12~) | libtzinfo-ruby (>= 0.3.12~)
+	 ruby-builder (>= 2.1.2~),
+	 ruby-i18n (>= 0.4.1~),
+	 ruby-memcache-client (>= 1.7.4~),
+	 ruby-tzinfo (>= 0.3.12~)
 Replaces: libactivesupport-ruby (<< 2.3.11-1~), libactivesupport-ruby1.8 (<< 2.3.11-1~), libactivesupport-ruby1.9.1 (<< 2.3.11-1~)
-Conflicts: libactivesupport-ruby (<< 2.3.11-1~), libactivesupport-ruby1.8 (<< 2.3.11-1~), libactivesupport-ruby1.9.1 (<< 2.3.11-1~)
+Breaks: libactivesupport-ruby (<< 2.3.11-1~), libactivesupport-ruby1.8 (<< 2.3.11-1~), libactivesupport-ruby1.9.1 (<< 2.3.11-1~)
 Provides: libactivesupport-ruby, libactivesupport-ruby1.8, libactivesupport-ruby1.9.1
 Description: Support and utility classes used by the Rails 2.3 framework
  ActiveSupport consists of utility classes and extensions to the Ruby

-- 
ruby-activesupport-2.3.git