[DRE-commits] [SCM] ruby-whitewash.git branch, master, updated. upstream/1.0-3-gf692652

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit f692652c5520eb5a2a62cc5a7b2157626564f3b2
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Wed Sep 14 18:24:40 2011 +0300

    patches: rename data dir to ruby-whitewash, require yaml

diff --git a/debian/patches/0001-rename-data-dir-to-ruby-whitewash.patch b/debian/patches/0001-rename-data-dir-to-ruby-whitewash.patch
new file mode 100644
index 0000000..3c1eb4c
--- /dev/null
+++ b/debian/patches/0001-rename-data-dir-to-ruby-whitewash.patch
@@ -0,0 +1,26 @@
+From: Dmitry Borodaenko <angdraug at debian.org>
+Date: Wed, 14 Sep 2011 18:10:46 +0300
+Subject: rename data dir to ruby-whitewash
+
+---
+ lib/whitewash.rb |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/whitewash.rb b/lib/whitewash.rb
+index 268ef54..ba81b66 100644
+--- a/lib/whitewash.rb
++++ b/lib/whitewash.rb
+@@ -140,9 +140,9 @@ class Whitewash
+ 
+   private
+ 
+-  PATH = [ '/etc/whitewash',
+-           File.join(Config::CONFIG['datadir'], 'whitewash'),
+-           '/usr/local/share/whitewash/' ]
++  PATH = [ '/etc/ruby-whitewash',
++           File.join(Config::CONFIG['datadir'], 'ruby-whitewash'),
++           '/usr/local/share/ruby-whitewash/' ]
+ 
+   WHITELIST = 'whitelist.yaml'
+ 
+-- 
diff --git a/debian/patches/0002-require-yaml.patch b/debian/patches/0002-require-yaml.patch
new file mode 100644
index 0000000..8048fc9
--- /dev/null
+++ b/debian/patches/0002-require-yaml.patch
@@ -0,0 +1,21 @@
+From: Dmitry Borodaenko <angdraug at debian.org>
+Date: Wed, 14 Sep 2011 18:15:34 +0300
+Subject: require yaml
+
+---
+ lib/whitewash.rb |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/lib/whitewash.rb b/lib/whitewash.rb
+index ba81b66..396b5d2 100644
+--- a/lib/whitewash.rb
++++ b/lib/whitewash.rb
+@@ -11,6 +11,7 @@
+ 
+ require 'rbconfig'
+ require 'rexml/document'
++require 'yaml'
+ require 'whitewash_rexml_attribute_patch'
+ 
+ class WhitewashError < RuntimeError; end
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e6f741f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-rename-data-dir-to-ruby-whitewash.patch
+0002-require-yaml.patch

-- 
ruby-whitewash.git