[DRE-commits] [ruby-bson] 02/07: Drop patches merged upstream

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository ruby-bson.

commit 6d7075aa3a25d4553c099089d822c8737ad2230f
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Mon Dec 19 17:09:39 2016 +0200

    Drop patches merged upstream
    
     + Update_BSON_ObjectId_validation.patch
     + remove_rubygems_from_bins.patch
    
    Git-Dch: Full
---
 .../patches/Update_BSON_ObjectId_validation.patch  | 18 --------
 debian/patches/remove_rubygems_from_bins.patch     | 48 ----------------------
 debian/patches/series                              |  2 -
 3 files changed, 68 deletions(-)

diff --git a/debian/patches/Update_BSON_ObjectId_validation.patch b/debian/patches/Update_BSON_ObjectId_validation.patch
deleted file mode 100644
index 559932b..0000000
--- a/debian/patches/Update_BSON_ObjectId_validation.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From bb544c2f6fd62940f04ddc1abeeaa3f23c1a9ade Mon Sep 17 00:00:00 2001
-From: Emily Stolfo <emily at 10gen.com>
-Date: Thu, 4 Jun 2015 11:19:36 -0400
-Subject: [PATCH] RUBY-941 Update BSON ObjectId validation
-
-diff --git a/lib/bson/types/object_id.rb b/lib/bson/types/object_id.rb
-index 5de7f66..6e44efa 100644
---- a/lib/bson/types/object_id.rb
-+++ b/lib/bson/types/object_id.rb
-@@ -51,7 +51,7 @@ def initialize(data=nil, time=nil)
-     #
-     # @return [Boolean]
-     def self.legal?(str)
--      str =~ /^[0-9a-f]{24}$/i ? true : false
-+      str =~ /\A[0-9a-f]{24}\z/i ? true : false
-     end
- 
-     # Create an object id from the given time. This is useful for doing range
diff --git a/debian/patches/remove_rubygems_from_bins.patch b/debian/patches/remove_rubygems_from_bins.patch
deleted file mode 100644
index df52524..0000000
--- a/debian/patches/remove_rubygems_from_bins.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: remove use of and messages about rubygems
-Author: Cédric Boutillier <boutil at debian.org>,
- Prach Pongpanich <prachpub at gmail.com>
-Forwarded: no
-Last-Updated: 2013-06-11
---- a/bin/j2bson
-+++ b/bin/j2bson
-@@ -15,19 +15,11 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--require 'rubygems'
- require 'bson'
- 
- # Note that, at the moment, this will not properly round-trip
- # in all cases from the output generated by b2json.
--begin
- require 'json/pure'  # broken with 'json/ext'
--rescue LoadError
--  puts "This script requires json/pure. Please install one of the following:"
--  puts "  gem install json_pure"
--  puts "  gem install json"
--  Process.exit
--end
- 
- # Convert all JSON objects in an IO into BSON.
- def print_j2bson(io)
---- a/bin/b2json
-+++ b/bin/b2json
-@@ -15,18 +15,11 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--require 'rubygems'
- require 'bson'
- 
- # Note that this will not properly round-trip in all cases
- # from the output generated by j2bson.
--begin
- require 'yajl'
--rescue LoadError
--  puts "This script requires yajl. Please install as follows:"
--  puts "  gem install yajl-ruby"
--  Process.exit
--end
- 
- # Convert all documents in an IO into JSON.
- def print_b2json(io)
diff --git a/debian/patches/series b/debian/patches/series
index c269047..9d38537 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,3 @@
 #add_require_rbconfig.patch
 #change_require_activesupport.patch
 #add_to_bson_code.patch
-remove_rubygems_from_bins.patch
-Update_BSON_ObjectId_validation.patch

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