Merge lp:~logan/ubuntu/raring/rbbr/0.6.0-6 into lp:ubuntu/raring/rbbr

[Logan Rosen]

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-29 18:52:01 +0000
+++ debian/changelog	2013-01-12 04:28:21 +0000
@@ -1,3 +1,21 @@
+rbbr (0.6.0-6ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Depends on ri, instead of recommends.
+
+ -- Logan Rosen <[e-mail]>  Fri, 11 Jan 2013 19:24:57 -0500
+
+rbbr (0.6.0-6) unstable; urgency=low
+
+  * QA upload.
+  * Build-depend on ruby1.8 rather than ruby (closes: #679799, #681217).
+  * Allow build-dependency to be satisfied by ruby-gettext (>= 2.2.1-1)
+    rather than libruby-gettext-util.
+  * Add ${misc:Depends}.
+  * Add build-arch and build-indep targets.
+
+ -- Colin Watson <[e-mail]>  Tue, 08 Jan 2013 11:51:58 +0000
+
 rbbr (0.6.0-5ubuntu1) raring; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
 
=== modified file 'debian/control'
--- debian/control	2012-11-29 18:52:01 +0000
+++ debian/control	2013-01-12 04:28:21 +0000
@@ -1,6 +1,6 @@
 Source: rbbr
 Build-Depends: debhelper (>= 4)
-Build-Depends-Indep: ruby, docbook-to-man, libgettext-ruby-util, ruby-gettext
+Build-Depends-Indep: ruby1.8, docbook-to-man, ruby-gettext, ruby-gettext (>= 2.2.1-1) | libruby-gettext-util
 Section: devel
 Priority: extra
 Maintainer: Ubuntu MOTU Developers <[e-mail]>
@@ -9,7 +9,7 @@
 
 Package: rbbr
 Architecture: all
-Depends: ruby1.8, libgettext-ruby1.8 (>= 0.5.2), libgtk2-ruby (>= 0.9.1), ri
+Depends: ${misc:Depends}, ruby1.8, libgettext-ruby1.8 (>= 0.5.2), libgtk2-ruby (>= 0.9.1), ri
 Description: a browser for Ruby classes and documentation
  Rbbr is an application for browsing Ruby's hierarchy of classes and modules
  and viewing their constants, methods and documentation.
 
=== modified file 'debian/rules'
--- debian/rules	2006-04-03 10:57:30 +0000
+++ debian/rules	2013-01-12 04:28:21 +0000
@@ -17,7 +17,9 @@
 	ruby install.rb setup
 	touch build-stamp
 
-build: build-stamp
+build build-indep: build-stamp
+
+build-arch:
 
 debian/rbbr.1: debian/rbbr.xml
 	docbook-to-man $< > $@