[DRE-commits] [ruby-whitewash] 02/02: New upstream release 2.1

[Dmitry Borodaenko]

This is an automated email from the git hooks/post-receive script.

angdraug pushed a commit to branch master
in repository ruby-whitewash.

commit db9bcd6355952db49a5ed8c55e1f502d1c8eab79
Author: Dmitry Borodaenko <angdraug at gmail.com>
Date:   Sun Apr 17 19:09:06 2016 -0700

    New upstream release 2.1
---
 debian/changelog                                  | 21 ++++++++++
 debian/patches/0002-add-support-for-ruby2.2.patch | 47 -----------------------
 debian/patches/series                             |  1 -
 3 files changed, 21 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d442e0a..a409e6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+ruby-whitewash (2.1-1) unstable; urgency=medium
+
+  [ Dmitry Borodaenko ]
+  * New upstream release.
+  * Remove patches:
+    - 0002-add-support-for-ruby2.2.patch (fixed upstream).
+
+  [ Cédric Boutillier ]
+  * debian/control: remove obsolete DM-Upload-Allowed flag.
+  * debian/copyright: use DEP5 copyright-format/1.0 official URL for Format
+    field.
+  * Remove version in the gem2deb build-dependency.
+  * Use https:// in Vcs-* fields.
+  * Bump Standards-Version to 3.9.7 (no changes needed).
+  * Run wrap-and-sort on packaging files.
+
+  [ Miguel Landaeta ]
+  * Add support for Ruby 2.2.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Sun, 17 Apr 2016 19:03:12 -0700
+
 ruby-whitewash (2.0-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0002-add-support-for-ruby2.2.patch b/debian/patches/0002-add-support-for-ruby2.2.patch
deleted file mode 100644
index 7aee290..0000000
--- a/debian/patches/0002-add-support-for-ruby2.2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Add support for Ruby 2.2
-Author: Miguel Landaeta <nomadium at debian.org>
-Origin: upstream, https://github.com/tenderlove/syck/issues/9
-Forwarded: no
-Last-Update: 2015-08-21
-
---- ruby-whitewash-2.0.orig/lib/whitewash.rb
-+++ ruby-whitewash-2.0/lib/whitewash.rb
-@@ -17,24 +17,24 @@ class WhitewashError < RuntimeError; end
- 
- class Whitewash
- 
--  if RUBY_VERSION < '1.9.3'
-+#  if RUBY_VERSION < '1.9.3'
-     def Whitewash.load(string)
-       YAML.load(string)
-     end
- 
--  else
--    # use Syck to parse the whitelist until Psych issue #36 is fixed
--    #
--    def Whitewash.load(string)
--      Mutex.new.synchronize do
--        yamler = YAML::ENGINE.yamler
--        YAML::ENGINE.yamler = 'syck'
--        whitelist = YAML.load(string)
--        YAML::ENGINE.yamler = yamler
--        whitelist
--      end
--    end
--  end
-+#  else
-+#    # use Syck to parse the whitelist until Psych issue #36 is fixed
-+#    #
-+#    def Whitewash.load(string)
-+#      Mutex.new.synchronize do
-+#        yamler = YAML::ENGINE.yamler
-+#        YAML::ENGINE.yamler = 'syck'
-+#        whitelist = YAML.load(string)
-+#        YAML::ENGINE.yamler = yamler
-+#        whitelist
-+#      end
-+#    end
-+#  end
- 
-   def Whitewash.default_whitelist
-     unless found = PATH.find {|dir| File.readable?(File.join(dir, WHITELIST)) }
diff --git a/debian/patches/series b/debian/patches/series
index 8634d96..b884c58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-rename-data-dir-to-ruby-whitewash.patch
-0002-add-support-for-ruby2.2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-whitewash.git