[DRE-commits] [SCM] pkg-ruby-extras.git branch, master, updated. 59d93f6cec472185671e892a8a64149049978a53

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 59d93f6cec472185671e892a8a64149049978a53
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Mon Jun 11 23:55:07 2012 +0200

    Update master repository

diff --git a/.gitignore b/.gitignore
index 1ca84f5..30833c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ rbot
 rcov
 rdtool
 redmine
+rttool
 ruby-actionmailer-2.3
 ruby-actionmailer-3.2
 ruby-actionpack-2.3
@@ -83,6 +84,7 @@ ruby-dbd-sqlite3
 ruby-dbi
 ruby-dbus
 ruby-debian-doc
+ruby-dep-selector
 ruby-deprecated
 ruby-diff-lcs
 ruby-directory-watcher
@@ -174,6 +176,7 @@ ruby-mechanize
 ruby-memcache-client
 ruby-merb-assets
 ruby-merb-core
+ruby-merb-haml
 ruby-merb-helpers
 ruby-merb-param-protection
 ruby-metaclass
diff --git a/.mrconfig b/.mrconfig
index 89cc406..14266b4 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -97,6 +97,9 @@ checkout = git_checkout rdtool
 [redmine]
 checkout = git_checkout redmine
 
+[rttool]
+checkout = git_checkout rttool
+
 [ruby-actionmailer-2.3]
 checkout = git_checkout ruby-actionmailer-2.3
 
@@ -271,6 +274,9 @@ checkout = git_checkout ruby-dbus
 [ruby-debian-doc]
 checkout = git_checkout ruby-debian-doc
 
+[ruby-dep-selector]
+checkout = git_checkout ruby-dep-selector
+
 [ruby-deprecated]
 checkout = git_checkout ruby-deprecated
 
@@ -544,6 +550,9 @@ checkout = git_checkout ruby-merb-assets
 [ruby-merb-core]
 checkout = git_checkout ruby-merb-core
 
+[ruby-merb-haml]
+checkout = git_checkout ruby-merb-haml
+
 [ruby-merb-helpers]
 checkout = git_checkout ruby-merb-helpers
 

-- 
pkg-ruby-extras.git