Bug#684209: unblock: libmojomojo-perl/1.05+dfsg-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package libmojomojo-perl
libmojomojo-perl/1.05+dfsg-3 contains a one-line fix picked from
upstream git, removing a workaround for a previous limitation in
Catalyst::Plugins::SubRequest. This limitation was fixed in a
backward-incompatible manner starting from Catalyst::Plugins::SubRequest
version 0.18, causing libmojomojo-perl to FTBFS.
Catalyst::Plugins::SubRequest version 0.18 is packaged as a part of
libcatalyst-modules-perl version 44, so in addition to patching the
upstream source, this upload tightens this dependency accordingly.
unblock libmojomojo-perl/1.05+dfsg-3
Thank you,
Florian
diff -Nru libmojomojo-perl-1.05+dfsg/debian/changelog libmojomojo-perl-1.05+dfsg/debian/changelog
--- libmojomojo-perl-1.05+dfsg/debian/changelog 2012-01-14 17:13:41.000000000 +0100
+++ libmojomojo-perl-1.05+dfsg/debian/changelog 2012-08-07 20:36:07.000000000 +0200
@@ -1,3 +1,11 @@
+libmojomojo-perl (1.05+dfsg-3) unstable; urgency=low
+
+ * Team upload.
+ * Fix FTBFS caused by updated Catalyst::Plugins::SubRequest.
+ Closes: #680796
+
+ -- Florian Schlichting <fschlich@zedat.fu-berlin.de> Tue, 07 Aug 2012 20:35:24 +0200
+
libmojomojo-perl (1.05+dfsg-2) unstable; urgency=low
* Add patch to use Digest::SHA instead of Digest::SHA1.
diff -Nru libmojomojo-perl-1.05+dfsg/debian/control libmojomojo-perl-1.05+dfsg/debian/control
--- libmojomojo-perl-1.05+dfsg/debian/control 2012-01-14 17:13:41.000000000 +0100
+++ libmojomojo-perl-1.05+dfsg/debian/control 2012-08-07 20:33:50.000000000 +0200
@@ -9,7 +9,7 @@
libcache-fastmmap-perl (>= 1.31),
libcatalyst-engine-psgi-perl,
libcatalyst-modules-extra-perl,
- libcatalyst-modules-perl (>= 42),
+ libcatalyst-modules-perl (>= 44),
libcatalyst-perl (>= 5.71001),
libcatalyst-view-tt-perl,
libconfig-general-perl,
@@ -85,7 +85,7 @@
libcache-fastmmap-perl (>= 1.31),
libcatalyst-engine-psgi-perl,
libcatalyst-modules-extra-perl,
- libcatalyst-modules-perl (>= 42),
+ libcatalyst-modules-perl (>= 44),
libcatalyst-perl (>= 5.71001),
libcatalyst-view-tt-perl,
libconfig-general-perl,
diff -Nru libmojomojo-perl-1.05+dfsg/debian/patches/bug680796.patch libmojomojo-perl-1.05+dfsg/debian/patches/bug680796.patch
--- libmojomojo-perl-1.05+dfsg/debian/patches/bug680796.patch 1970-01-01 01:00:00.000000000 +0100
+++ libmojomojo-perl-1.05+dfsg/debian/patches/bug680796.patch 2012-08-07 20:31:24.000000000 +0200
@@ -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@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 -Nru libmojomojo-perl-1.05+dfsg/debian/patches/series libmojomojo-perl-1.05+dfsg/debian/patches/series
--- libmojomojo-perl-1.05+dfsg/debian/patches/series 2012-01-14 17:13:41.000000000 +0100
+++ libmojomojo-perl-1.05+dfsg/debian/patches/series 2012-08-07 20:31:24.000000000 +0200
@@ -1,2 +1,3 @@
spelling.patch
digest-sha.patch
+bug680796.patch
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Reply to: