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

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit d002532849d9fa754550ba1a88dfb221e1f6276a
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Sun Dec 25 17:36:45 2011 +0300

    new upstream release 2.0

diff --git a/debian/changelog b/debian/changelog
index 5bc9afe..86ec3cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ruby-whitewash (2.0-1) unstable; urgency=low
+
+  * New upstream release:
+    - use Nokogiri instead of REXML and Tidy
+    - compatibility fixes for Ruby 1.9.3
+    - RSpec tests added.
+  * Depends updated: tidy dropped, ruby-nokogiri added.
+  * Run RSpec tests during build.
+  * require-yaml.patch dropped, merged upstream.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Sun, 25 Dec 2011 17:32:34 +0300
+
 ruby-whitewash (1.0-1) unstable; urgency=low
 
   * Initial release. Closes: #573967 (ITP).
diff --git a/debian/control b/debian/control
index 3f691d8..c1137ca 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Dmitry Borodaenko <angdraug at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.8~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.8~), ruby-rspec, ruby-nokogiri
 Standards-Version: 3.9.2
 Vcs-Git: git://github.com/angdraug/whitewash.git
 Vcs-Browser: https://github.com/angdraug/whitewash
@@ -14,7 +14,7 @@ XS-Ruby-Versions: all
 Package: ruby-whitewash
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, tidy
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-nokogiri
 Description: Whitelist-based HTML filter for Ruby
  This module allows Ruby programs to clean up any HTML document or fragment
  coming from an untrusted source and to remove all dangerous constructs that
diff --git a/debian/patches/0001-rename-data-dir-to-ruby-whitewash.patch b/debian/patches/0001-rename-data-dir-to-ruby-whitewash.patch
index 3c1eb4c..7bb1ff1 100644
--- a/debian/patches/0001-rename-data-dir-to-ruby-whitewash.patch
+++ b/debian/patches/0001-rename-data-dir-to-ruby-whitewash.patch
@@ -7,20 +7,20 @@ Subject: rename data dir to ruby-whitewash
  1 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/lib/whitewash.rb b/lib/whitewash.rb
-index 268ef54..ba81b66 100644
+index 1446894..33f963e 100644
 --- a/lib/whitewash.rb
 +++ b/lib/whitewash.rb
-@@ -140,9 +140,9 @@ class Whitewash
+@@ -120,9 +120,9 @@ class Whitewash
  
    private
  
 -  PATH = [ '/etc/whitewash',
--           File.join(Config::CONFIG['datadir'], 'whitewash'),
+-           File.join(RbConfig::CONFIG['datadir'].untaint, 'whitewash'),
 -           '/usr/local/share/whitewash/' ]
 +  PATH = [ '/etc/ruby-whitewash',
-+           File.join(Config::CONFIG['datadir'], 'ruby-whitewash'),
++           File.join(Config::CONFIG['datadir'].untaint, 'ruby-whitewash'),
 +           '/usr/local/share/ruby-whitewash/' ]
  
    WHITELIST = 'whitelist.yaml'
- 
+ end
 -- 
diff --git a/debian/patches/0002-require-yaml.patch b/debian/patches/0002-require-yaml.patch
deleted file mode 100644
index 8048fc9..0000000
--- a/debian/patches/0002-require-yaml.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
index e6f741f..b884c58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-rename-data-dir-to-ruby-whitewash.patch
-0002-require-yaml.patch
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
new file mode 100644
index 0000000..f8e82df
--- /dev/null
+++ b/debian/ruby-tests.rb
@@ -0,0 +1,3 @@
+$: << 'lib' << '.'
+require 'rspec'
+Dir['spec/**/*_spec.rb'].each {|f| require f }

-- 
ruby-whitewash.git