[DRE-commits] [SCM] ruby-i18n.git branch, master, updated. debian/0.6.0-3-17-gdb5f289

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit bf88641abce224b6b7e723bb0d04d3eb3c15563f
Merge: 4a477fecd54a419c007523dc841461f444ab5f6e bfdf05ead97dd3096a18e9bd8dcb24d5669d63c6
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jun 4 00:53:59 2013 +0530

    Christian updated to 0.6.4 and I updated to 0.6.1
    
    within about 5-10 minutes difference causing conflict.
    I tried to remove my upload with dcut, so we could drop
    0.6.1, but it was already accepted in debian. To be able
    to see all changes in packages uploaded to debian,
    merging the two changes.
    
    Conflicts:
    	debian/changelog
    	debian/control
    	lib/i18n.rb
    	lib/i18n/backend/base.rb
    	lib/i18n/version.rb
    	metadata.yml

diff --combined debian/changelog
index 305779f,448fb93..fad6d51
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,18 +1,29 @@@
+ ruby-i18n (0.6.4-1) unstable; urgency=low
+ 
+   * Team upload.
+ 
+   [ Cédric Boutillier ]
+   * debian/control: remove obsolete DM-Upload-Allowed flag
+   * use canonical URI in Vcs-* fields
+ 
+   [ Christian Hofstaedtler ]
+   * New upstream version 0.6.4.
+   * Use ruby-test-unit during build
+   * Bump Standards-Version to 3.9.4 (no changes)
++  
++  [ Praveen Arimbrathodiyil ]
++  * Fix conflicts with 0.6.1-1 upload.
+ 
+  -- Christian Hofstaedtler <christian at hofstaedtler.name>  Mon, 03 Jun 2013 15:34:13 +0200
+ 
 +ruby-i18n (0.6.1-1) unstable; urgency=low
 +
 +  * Team upload.
 +  * New upstream release: 0.6.1
 +  * Remove transitional packages.
 +
 + -- Praveen Arimbrathodiyil <praveen at debian.org>  Mon, 03 Jun 2013 19:20:31 +0530
 +
  ruby-i18n (0.6.0-3) unstable; urgency=low
  
    * Bump build dependency on gem2deb to >= 0.3.0~
diff --combined debian/control
index 5b6e40b,4c86568..85403da
--- a/debian/control
+++ b/debian/control
@@@ -3,7 -3,7 +3,7 @@@ Section: rub
  Priority: optional
  Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
  Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>, Antonio Terceiro <terceiro at debian.org>
- Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-activesupport, ruby-mocha, ruby-test-declarative
+ Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-activesupport, ruby-mocha, ruby-test-declarative, ruby-test-unit
  Standards-Version: 3.9.4
  Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-i18n.git
  Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-i18n.git;a=summary
@@@ -14,8 -14,35 +14,8 @@@ Package: ruby-i18
  Architecture: all
  XB-Ruby-Versions: ${ruby:Versions}
  Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
 -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
   library included in the Ruby on Rails framework, but provided outside of
   that framework for those who wish to use it without pulling the entire
   Ruby on Rails framework.
 -
 -Package: libi18n-ruby
 -Section: oldlibs
 -Architecture: all
 -Depends: ${misc:Depends}, ruby-i18n
 -Description: Transitional package for ruby-i18n
 - This is a transitional package to ease upgrades to the ruby-i18n
 - package. It can safely be removed.
 -
 -Package: libi18n-ruby1.8
 -Section: oldlibs
 -Architecture: all
 -Depends: ${misc:Depends}, ruby-i18n
 -Description: Transitional package for ruby-i18n
 - This is a transitional package to ease upgrades to the ruby-i18n
 - package. It can safely be removed.
 -
 -Package: libi18n-ruby1.9.1
 -Section: oldlibs
 -Architecture: all
 -Depends: ${misc:Depends}, ruby-i18n
 -Description: Transitional package for ruby-i18n
 - This is a transitional package to ease upgrades to the ruby-i18n
 - package. It can safely be removed.

-- 
ruby-i18n.git