[libmongodbx-class-perl] 04/07: Update patches.

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libmongodbx-class-perl.

commit 850ea6d0f121dad3bdddff34d0157bc3b952b90f
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue May 13 21:28:40 2014 +0200

    Update patches.
    
    Drop fix-super-connection, merged upstream.
    Refresh fix-cursor-expand-bug (offset).
    Refresh and combine the two spelling fix patches into one.
---
 debian/patches/fix-cursor-expand-bug |  2 +-
 debian/patches/fix-pod-typo          | 13 ------------
 debian/patches/fix-spelling          | 13 +++++++++++-
 debian/patches/fix-super-connection  | 38 ------------------------------------
 debian/patches/series                |  2 --
 5 files changed, 13 insertions(+), 55 deletions(-)

diff --git a/debian/patches/fix-cursor-expand-bug b/debian/patches/fix-cursor-expand-bug
index d56517e..4c622e2 100644
--- a/debian/patches/fix-cursor-expand-bug
+++ b/debian/patches/fix-cursor-expand-bug
@@ -2,7 +2,7 @@ Description: Fix cursor expand bug
 Author: dod
 --- a/lib/MongoDBx/Class/Cursor.pm
 +++ b/lib/MongoDBx/Class/Cursor.pm
-@@ -56,7 +56,7 @@
+@@ -57,7 +57,7 @@
  =cut
  
  around 'next' => sub {
diff --git a/debian/patches/fix-pod-typo b/debian/patches/fix-pod-typo
deleted file mode 100644
index e9f1531..0000000
--- a/debian/patches/fix-pod-typo
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Fix pod typo
-Author: dod
---- a/lib/MongoDBx/Class/Cursor.pm
-+++ b/lib/MongoDBx/Class/Cursor.pm
-@@ -43,7 +43,7 @@
- 
- =head1 OBJECT METHODS
- 
--Aside from methods provided by L<MonogDB::Cursor>, the following method
-+Aside from methods provided by L<MongoDB::Cursor>, the following method
- modifications are performed:
- 
- =head2 next( [ $do_not_expand ] )
diff --git a/debian/patches/fix-spelling b/debian/patches/fix-spelling
index a6dfd46..3bf14ab 100644
--- a/debian/patches/fix-spelling
+++ b/debian/patches/fix-spelling
@@ -2,7 +2,7 @@ Description: Fix spelling in pod doc
 Author: dod
 --- a/lib/MongoDBx/Class.pm
 +++ b/lib/MongoDBx/Class.pm
-@@ -195,7 +195,7 @@
+@@ -197,7 +197,7 @@
  
  =over
  
@@ -42,3 +42,14 @@ Author: dod
  it with C<belongs_to>) will not be removed too.
  
  =cut
+--- a/lib/MongoDBx/Class/Cursor.pm
++++ b/lib/MongoDBx/Class/Cursor.pm
+@@ -44,7 +44,7 @@
+ 
+ =head1 OBJECT METHODS
+ 
+-Aside from methods provided by L<MonogDB::Cursor>, the following method
++Aside from methods provided by L<MongoDB::Cursor>, the following method
+ modifications are performed:
+ 
+ =head2 next( [ $do_not_expand ] )
diff --git a/debian/patches/fix-super-connection b/debian/patches/fix-super-connection
deleted file mode 100644
index 34afc49..0000000
--- a/debian/patches/fix-super-connection
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: fix weird Moose assert failure 
- _connection sub tries to call $self->SUPER. But the base class uses
- AUTOLOAD. AUTOLOAD intercepts the call to _connection from base class and
- provides the wrong object. Hence this (slightly edited) error message:
- .
- Couldn't load application from file "script": Attribute (_connection)
- does not pass the type constraint because: Validation failed for
- 'MongoDB::Connection' with value MongoDBx::Class::Collection{
- _database: MongoDBx::Class::Database{ _connection:
- MongoDBx::Class::Connection=HASH(0x3f80c38), name: "admin" }, name:
- "SUPER" } at constructor MongoDBx::Class::Cursor::new (defined at
- .../lib/MongoDBx/Class/Cursor.pm line 145) line 34
- .
- This patch thwarts AUTOLOAD by spelling out the method to call in the base
- class.
-Author: dod
---- a/lib/MongoDBx/Class/Cursor.pm
-+++ b/lib/MongoDBx/Class/Cursor.pm
-@@ -85,7 +85,7 @@
- };
- 
- sub _connection {
--	version->parse($MongoDB::VERSION) < v0.502.0 ? $_[0]->SUPER : $_[0]->_client;
-+	version->parse($MongoDB::VERSION) < v0.502.0 ? $_[0]->SUPER::_connection : $_[0]->_client;
- }
- 
- =head1 AUTHOR
---- a/lib/MongoDBx/Class/Database.pm
-+++ b/lib/MongoDBx/Class/Database.pm
-@@ -50,7 +50,7 @@
- };
- 
- sub _connection {
--	version->parse($MongoDB::VERSION) < v0.502.0 ? $_[0]->SUPER : $_[0]->_client;
-+	version->parse($MongoDB::VERSION) < v0.502.0 ? $_[0]->SUPER::_connection : $_[0]->_client;
- }
- 
- =head1 AUTHOR
diff --git a/debian/patches/series b/debian/patches/series
index 429f02c..1ccb27d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 fix-spelling
 fix-cursor-expand-bug
-fix-pod-typo
-fix-super-connection

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