[libmongodb-perl] 01/03: Rebase spelling patch, drop fix-broken-test patch (applied upstream)

[dom at earth.li]

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

dom pushed a commit to branch master
in repository libmongodb-perl.

commit 4899cbc1c8a171cea548baf30a0cf782e3fac194
Author: Dominic Hargreaves <dom at earth.li>
Date:   Sat Aug 17 20:37:14 2013 +0200

    Rebase spelling patch, drop fix-broken-test patch (applied upstream)
---
 debian/changelog                          |    1 +
 debian/patches/fix-broken-test.patch      |   28 ----------------------------
 debian/patches/fix-manpage-spelling.patch |   13 ++++++++-----
 debian/patches/series                     |    1 -
 4 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4aac3c..66f6499 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ libmongodb-perl (0.702.1+ds-1) UNRELEASED; urgency=low
     licensing in parts and isn't needed
   * New upstream release
   * Don't delete a shipped editor backup file
+  * Rebase spelling patch, drop fix-broken-test patch (applied upstream)
 
  -- Dominic Hargreaves <dom at earth.li>  Fri, 16 Aug 2013 14:13:39 +0200
 
diff --git a/debian/patches/fix-broken-test.patch b/debian/patches/fix-broken-test.patch
deleted file mode 100644
index e6845cb..0000000
--- a/debian/patches/fix-broken-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Ken Williams <kwilliams at cpan.org>
-Subject: [PATCH] Fix a test failure when connecting to db version v2.4.3
-Origin: https://github.com/mongodb/mongo-perl-driver/commit/e836c19861acf6308bfd9b971c604789bbfd1069
-Bug: https://jira.mongodb.org/browse/PERL-226
-Reviewed-by: Harlan Lieberman-Berg <H.LiebermanBerg at gmail.com>
-Applied-Upstream: 0.700.1
-
-Apparently the error message has changed.
----
- t/db.t | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/db.t b/t/db.t
-index 3b2f7ff..1610e11 100644
---- a/t/db.t
-+++ b/t/db.t
-@@ -43,7 +43,7 @@ my $hello = $db->eval('function(x) { return "hello, "+x; }', ["world"]);
- is('hello, world', $hello, 'db eval');
- 
- my $err = $db->eval('function(x) { xreturn "hello, "+x; }', ["world"]);
--like($err, qr/compile failed/, 'js err');
-+like($err, qr/(?:compile|execution) failed/, 'js err');
- 
- # tie
- {
--- 
-1.8.1.6
-
diff --git a/debian/patches/fix-manpage-spelling.patch b/debian/patches/fix-manpage-spelling.patch
index 838cd86..26431d3 100644
--- a/debian/patches/fix-manpage-spelling.patch
+++ b/debian/patches/fix-manpage-spelling.patch
@@ -1,26 +1,29 @@
 Description: Fix minor spelling error
 Author: Harlan Lieberman-Berg <H.LiebermanBerg at gmail.com>
+Author: Dominic Hargreaves <dom at earth.li>
 Bug: https://jira.mongodb.org/browse/PERL-239
 Forwarded: yes
 --- a/lib/MongoDB/Connection.pm
 +++ b/lib/MongoDB/Connection.pm
-@@ -186,7 +186,7 @@
+@@ -183,7 +183,7 @@ safe insert times out and croaks.
  I<MongoDB server version 2.0+: "majority" and Data Center Awareness>
  
  As of MongoDB 2.0+, the 'w' parameter can be passed strings. This can be done by passing it the string "majority" this will wait till the B<majority> of 
--of the nodes in the relica set have recieved the data. For more information see: http://www.mongodb.org/display/DOCS/getLastError+Command#getLastErrorCommand-majority
-+of the nodes in the relica set have received the data. For more information see: http://www.mongodb.org/display/DOCS/getLastError+Command#getLastErrorCommand-majority
+-of the nodes in the replica set have recieved the data. For more information see: http://www.mongodb.org/display/DOCS/getLastError+Command#getLastErrorCommand-majority
++of the nodes in the replica set have received the data. For more information see: http://www.mongodb.org/display/DOCS/getLastError+Command#getLastErrorCommand-majority
  
  This can be useful for "Data Center Awareness." In v2.0+, you can "tag" replica members. With "tagging" you can specify a new "getLastErrorMode" where you can create new
  rules on how your data is replicated. To used you getLastErrorMode, you pass in the name of the mode to the 'w' parameter. For more infomation see: http://www.mongodb.org/display/DOCS/Data+Center+Awareness
+diff --git a/lib/MongoDB/OID.pm b/lib/MongoDB/OID.pm
+index fe24e8c..b1be426 100644
 --- a/lib/MongoDB/OID.pm
 +++ b/lib/MongoDB/OID.pm
-@@ -95,7 +95,7 @@
+@@ -96,7 +96,7 @@ C<_id> field will be added with a new C<MongoDB::OID> as its value.
  
      my $id = $collection->insert({'name' => 'Alice', age => 20});
  
 -C<$id> will be a C<MongoDB::OID> that can be used to retreive or update the 
-+C<$id> will be a C<MongoDB::OID> that can be used to retrieve or update the
++C<$id> will be a C<MongoDB::OID> that can be used to retrieve or update the 
  saved document:
  
      $collection->update({_id => $id}, {'age' => {'$inc' => 1}});
diff --git a/debian/patches/series b/debian/patches/series
index 86aeafc..fca8825 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix-manpage-spelling.patch
-fix-broken-test.patch
 5.14-ccflags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmongodb-perl.git