Merge lp:~logan/ubuntu/raring/rbbr/debian-merge into lp:ubuntu/raring/rbbr

[Logan Rosen]

=== modified file 'debian/changelog'
--- debian/changelog	2007-03-30 14:33:20 +0000
+++ debian/changelog	2012-11-29 18:55:24 +0000
@@ -1,3 +1,23 @@
+rbbr (0.6.0-5ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Depends on ri, instead of recommends.
+
+ -- Logan Rosen <[e-mail]>  Thu, 29 Nov 2012 13:51:21 -0500
+
+rbbr (0.6.0-5) unstable; urgency=low
+
+  * QA upload.
+  * Build-depend on ruby-gettext (Closes: #676105).
+
+ -- Luk Claes <[e-mail]>  Sun, 08 Jul 2012 02:07:15 +0000
+
+rbbr (0.6.0-4) unstable; urgency=low
+
+  * Orphan package.
+
+ -- Dafydd Harries <[e-mail]>  Fri, 22 Jun 2012 16:40:25 -0400
+
 rbbr (0.6.0-3ubuntu1) feisty; urgency=low
 
   * debian/control:

=== modified file 'debian/control'
--- debian/control	2007-03-30 14:33:20 +0000
+++ debian/control	2012-11-29 18:55:24 +0000
@@ -1,9 +1,10 @@
 Source: rbbr
-Build-Depends-Indep: ruby, debhelper (>= 4), docbook-to-man, libgettext-ruby-util
+Build-Depends: debhelper (>= 4)
+Build-Depends-Indep: ruby, docbook-to-man, libgettext-ruby-util, ruby-gettext
 Section: devel
 Priority: extra
 Maintainer: Ubuntu MOTU Developers <[e-mail]>
-XSBC-Original-Maintainer: Dafydd Harries <[e-mail]>
+XSBC-Original-Maintainer: Debian QA Group <[e-mail]>
 Standards-Version: 3.6.2
 
 Package: rbbr