Added patch to remove a subroutine definition which is currently replaced and results...

diff --git a/debian/patches/103_fix-view_object-warning.diff b/debian/patches/103_fix-view_object-warning.diff
new file mode 100644 (file)
index 0000000..34d1a1d
--- /dev/null
+++ b/debian/patches/103_fix-view_object-warning.diff
@@ -0,0 +1,16 @@
+--- maypole.orig/lib/Maypole.pm
++++ maypole/lib/Maypole.pm
+@@ -495,13 +495,6 @@
+     return $self->NEXT::DISTINCT::get_template_root( $r, @_ );
+ }
+ 
+-sub view_object {
+-    my $self = shift;
+-    my $r    = shift;
+-    return $r->parent->view_object if $r->{parent};
+-    return $self->NEXT::DISTINCT::view_object( $r, @_ );
+-}
+-
+ # Instead of making plugin authors use the NEXT::DISTINCT hoopla to ensure other 
+ # plugins also get to call the hook, we can cycle through the application's 
+ # @ISA and call them all here. Doesn't work for setup() though, because it's 

diff --git a/debian/patches/series b/debian/patches/series
index 1b38d8c842443cbe7957e49c293793ec419e954e..834be6e20c1e4054576e0d1da08489b8d0610eab 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 101_fix-extension-mime-type.diff
 102_fix-apache_mvc-test.diff
+103_fix-view_object-warning.diff
 201_no-file-mmagic-xs.diff