[DRE-commits] [SCM] rubygems.git branch, master, updated. debian/1.7.2-1-11-g7c5cb0a

[Daigo Moriwaki]

The following commit has been merged in the master branch:
commit 7c5cb0abce5f751d13f767a75660501783b1ce77
Merge: 2db0ba8019a8634ee96319757144d4d2856effaa ede05c004ec3f58a98f2d8186bd6f3e3eea04baa
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Fri Apr 29 23:25:25 2011 +0900

    Merge branch 'master' of ssh://git.debian.org/git/pkg-ruby-extras/rubygems
    
    Conflicts:
    	debian/control

diff --combined debian/control
index 5fc52d6,6a4131a..122a3ff
--- a/debian/control
+++ b/debian/control
@@@ -4,7 -4,7 +4,7 @@@ Priority: optiona
  Maintainer: Daigo Moriwaki <daigo at debian.org>
  Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Lucas Nussbaum <lucas at lucas-nussbaum.net>
  DM-Upload-Allowed: yes
- Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), gem2deb (>= 0.2.2)
 -Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.2), rake
++Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), gem2deb (>= 0.2.2), rake
  Standards-Version: 3.9.1
  Vcs-Git: git://git.debian.org/pkg-ruby-extras/rubygems.git
  Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/rubygems.git;a=summary
@@@ -14,7 -14,7 +14,7 @@@ XS-Ruby-Versions: ruby1.
  Package: rubygems
  Architecture: all
  XB-Ruby-Versions: ${ruby:Versions}
 -Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8
 +Depends: ${misc:Depends}, ruby1.8
  Recommends: ruby1.8-dev, build-essential
  Replaces: rubygems1.8 (<< 1.7.2-1~), rubygems-doc (<< 1.7.2-1~)
  Conflicts: rubygems1.8 (<< 1.7.2-1~), rubygems-doc (<< 1.7.2-1~)

-- 
rubygems.git