[SCM] Debian packaging of libmojomojo-perl branch, master, updated. debian/1.05+dfsg-2-4-gdec34f5

[Florian Schlichting]

The following commit has been merged in the master branch:
commit dec34f5db3df3a3cb02bf0be8f0ba03b0f7140ae
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Tue Aug 7 20:17:17 2012 +0200

    bug680796.patch: Fix FTBFS caused by updated Catalyst::Plugins::SubRequest

diff --git a/debian/changelog b/debian/changelog
index e341890..e680957 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 libmojomojo-perl (1.05+dfsg-3) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * debian/control: update {versioned,alternative} (build) dependencies.
 
+  [ Florian Schlichting ]
+  * Fix FTBFS caused by updated Catalyst::Plugins::SubRequest.
+    Closes: #680796
+
  -- gregor herrmann <gregoa at debian.org>  Thu, 05 Jul 2012 12:41:29 -0600
 
 libmojomojo-perl (1.05+dfsg-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a5770de..815eeb8 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends-Indep: perl,
                      libcache-fastmmap-perl,
                      libcatalyst-engine-psgi-perl,
                      libcatalyst-modules-extra-perl,
-                     libcatalyst-modules-perl (>= 42),
+                     libcatalyst-modules-perl (>= 44),
                      libcatalyst-perl,
                      libcatalyst-view-tt-perl,
                      libconfig-general-perl,
@@ -87,7 +87,7 @@ Depends: ${perl:Depends},
          libcache-fastmmap-perl,
          libcatalyst-engine-psgi-perl,
          libcatalyst-modules-extra-perl,
-         libcatalyst-modules-perl (>= 42),
+         libcatalyst-modules-perl (>= 44),
          libcatalyst-perl,
          libcatalyst-view-tt-perl,
          libconfig-general-perl,
diff --git a/debian/patches/bug680796.patch b/debian/patches/bug680796.patch
new file mode 100644
index 0000000..d703155
--- /dev/null
+++ b/debian/patches/bug680796.patch
@@ -0,0 +1,23 @@
+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/series b/debian/patches/series
index 35c2d49..6ece333 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 spelling.patch
 digest-sha.patch
+bug680796.patch

-- 
Debian packaging of libmojomojo-perl