[DRE-commits] [SCM] ruby-i18n.git branch, master, updated. upstream/0.5.0-8-g5a3cc5f

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 68435724b1f7688f0ae6b7e187f4f01a7dda87bc
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Nov 4 12:37:22 2011 -0200

    Use Breaks: instead of Replaces:

diff --git a/debian/changelog b/debian/changelog
index e28e118..627eea5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ ruby-i18n (0.6.0-1) UNRELEASED; urgency=low
 
   [ Antonio Terceiro ]
   * New upstream release: 0.6.0
+  * Updated Standards-Version to 3.9.2 No changes neeed.
 
- -- Antonio Terceiro <terceiro at debian.org>  Fri, 04 Nov 2011 12:04:07 -0200
+ -- Antonio Terceiro <terceiro at debian.org>  Fri, 04 Nov 2011 12:36:39 -0200
 
 libi18n-ruby (0.4.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7a08acb..a0d61f4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
 Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>, Antonio Terceiro <terceiro at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1), ruby-activesupport, ruby-mocha, ruby-test-declarative
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-i18n.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-i18n.git;a=summary
 Homepage: http://ruby-i18n.org/
@@ -15,8 +15,8 @@ Package: ruby-i18n
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
-Replaces: libi18n-ruby (<< 0.5.0-1~), libi18n-ruby1.8 (<< 0.5.0-1~), libi18n-ruby1.9.1 (<< 0.5.0-1~)
-Conflicts: libi18n-ruby (<< 0.5.0-1~), libi18n-ruby1.8 (<< 0.5.0-1~), libi18n-ruby1.9.1 (<< 0.5.0-1~)
+Replaces: libi18n-ruby (<< 0.6.0-1~), libi18n-ruby1.8 (<< 0.6.0-1~), libi18n-ruby1.9.1 (<< 0.6.0-1~)
+Breaks: libi18n-ruby (<< 0.6.0-1~), libi18n-ruby1.8 (<< 0.6.0-1~), libi18n-ruby1.9.1 (<< 0.6.0-1~)
 Provides: libi18n-ruby, libi18n-ruby1.8, libi18n-ruby1.9.1
 Description: I18n and localization solution for Ruby
  Implementation of the Ruby on Rails I18n core API.  This is the same I18n

-- 
ruby-i18n.git