[DRE-commits] [SCM] pkg-ruby-extras.git branch, master, updated. 972e39a8697a2f312fa48348c0023629dcc0484b

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 972e39a8697a2f312fa48348c0023629dcc0484b
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Sun Apr 22 17:39:12 2012 +0200

    Update master repository

diff --git a/.gitignore b/.gitignore
index 77fc9bd..c06b3b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,6 +87,7 @@ ruby-ffi
 ruby-fftw3
 ruby-flexmock
 ruby-formatador
+ruby-gd
 ruby-gelf
 ruby-gettext
 ruby-gettext-activerecord
@@ -136,6 +137,7 @@ ruby-mathml
 ruby-mecab
 ruby-mechanize
 ruby-memcache-client
+ruby-merb-core
 ruby-metaclass
 ruby-method-source
 ruby-mime-types
@@ -190,6 +192,7 @@ ruby-polyglot
 ruby-prawn
 ruby-progressbar
 ruby-rack
+ruby-rack-protection
 ruby-rack-test
 ruby-rails-2.3
 ruby-raindrops
diff --git a/.mrconfig b/.mrconfig
index d2bdde6..3ff7f3b 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -283,6 +283,9 @@ checkout = git_checkout ruby-flexmock
 [ruby-formatador]
 checkout = git_checkout ruby-formatador
 
+[ruby-gd]
+checkout = git_checkout ruby-gd
+
 [ruby-gelf]
 checkout = git_checkout ruby-gelf
 
@@ -430,6 +433,9 @@ checkout = git_checkout ruby-mechanize
 [ruby-memcache-client]
 checkout = git_checkout ruby-memcache-client
 
+[ruby-merb-core]
+checkout = git_checkout ruby-merb-core
+
 [ruby-metaclass]
 checkout = git_checkout ruby-metaclass
 
@@ -592,6 +598,9 @@ checkout = git_checkout ruby-progressbar
 [ruby-rack]
 checkout = git_checkout ruby-rack
 
+[ruby-rack-protection]
+checkout = git_checkout ruby-rack-protection
+
 [ruby-rack-test]
 checkout = git_checkout ruby-rack-test
 

-- 
pkg-ruby-extras.git