[SCM] Debian packaging of libmojomojo-perl branch, master, updated. debian/1.05+dfsg-3-13-gdcecdb8

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 0ebea715a2a7e6a81e8986e0d55c8ee67701799f
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Mon Aug 13 21:57:03 2012 +0200

    dropping digest-sha.patch, bug680796.patch, applied upstream

diff --git a/debian/patches/bug680796.patch b/debian/patches/bug680796.patch
deleted file mode 100644
index d703155..0000000
--- a/debian/patches/bug680796.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix FTBFS due to updated Catalyst-Plugin-SubRequest
- Remove workaround for a limitation in Catalyst-Plugin-SubRequest, which was
- fixed in a backwards-incompatible manner in version 0.18 (uploaded as part of
- libcatalyst-modules-perl 44). Fix picked from upstream git, will become part
- of MojoMojo 1.06.
-Origin: https://github.com/marcusramberg/mojomojo/commit/f52d2941c0c2ddc59a1015563c622f0fbb26a19d
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680796
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=78821
-Bug: https://github.com/marcusramberg/mojomojo/issues/101
-Reviewed-by: Florian Schlichting <fschlich at zedat.fu-berlin.de>
-
-
---- a/lib/MojoMojo/Formatter/Include.pm
-+++ b/lib/MojoMojo/Formatter/Include.pm
-@@ -80,7 +80,7 @@
-     my $rel = $url->rel( $c->req->base );
-     if (not $rel->scheme) {
-         # if so, then return the inline version of the page is requests
--        return $c->subreq( '/inline', { path => $rel.'' eq './' ? '/' : '/'.$rel } );
-+        return $c->subreq( ($rel.'' eq './' ? '/' : '/'.$rel).'.inline' );
-     }
-     my $res = URI::Fetch->fetch( $url, Cache => $c->cache );
-     return $res->content if defined $res;
diff --git a/debian/patches/digest-sha.patch b/debian/patches/digest-sha.patch
deleted file mode 100644
index 12abc7f..0000000
--- a/debian/patches/digest-sha.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: use Digest::SHA (in core) instead of Digest::SHA1 (removed from Debian)
-Origin: vendor
-Bug: https://github.com/marcusramberg/mojomojo/issues/100
-Bug-Debian: http://bugs.debian.org/655825
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2012-01-14
-Forwarded: yes
-
---- a/lib/MojoMojo/Schema/Result/Person.pm
-+++ b/lib/MojoMojo/Schema/Result/Person.pm
-@@ -3,7 +3,7 @@
- use strict;
- use warnings;
- 
--use Digest::SHA1;
-+use Digest::SHA;
- 
- use parent qw/MojoMojo::Schema::Base::Result/;
- 
-@@ -228,7 +228,7 @@
- 
- sub hashed {
-     my ( $self, $secret ) = @_;
--    return Digest::SHA1::sha1_hex( $self->id . $secret );
-+    return Digest::SHA::sha1_hex( $self->id . $secret );
- }
- 
- # FIXME: the formatter is arbitrarily taken to be Textile; it could be MultiMarkdown
diff --git a/debian/patches/series b/debian/patches/series
index 6ece333..5299247 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 spelling.patch
-digest-sha.patch
-bug680796.patch

-- 
Debian packaging of libmojomojo-perl