Bug#768838: unblock: jekyll/2.2.0+dfsg-2

[Christian Hofstaedtler <zeha@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear Release Team,

it has been discovered that jekyll FTBFS inside jessie due to missing
build dependencies (#768697). While fixing this I also discovered
that the suite fails to run (so again FTBFS), causing an additional
change in Build-Depends.

Debdiff attached.

Please unblock package jekyll:

unblock jekyll/2.2.0+dfsg-2


Thanks,
Christian

diff -Nru jekyll-2.2.0+dfsg/debian/changelog jekyll-2.2.0+dfsg/debian/changelog
--- jekyll-2.2.0+dfsg/debian/changelog	2014-07-30 11:21:46.000000000 +0200
+++ jekyll-2.2.0+dfsg/debian/changelog	2014-11-09 16:34:50.000000000 +0100
@@ -1,3 +1,14 @@
+jekyll (2.2.0+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Update Build-Depends ruby-activesupport-3.2
+    to ruby-activesupport, which is the 4.0 version that we're going to
+    ship in jessie.
+    Thanks to Lucas Nussbaum <lucas@lucas-nussbaum.net> (Closes: #768697)
+  * Build-Depend on ruby-test-unit to fix test runner failure
+
+ -- Christian Hofstaedtler <zeha@debian.org>  Sun, 09 Nov 2014 16:34:41 +0100
+
 jekyll (2.2.0+dfsg-1) unstable; urgency=medium
 
   * Imported Upstream version 2.2.0+dfsg
diff -Nru jekyll-2.2.0+dfsg/debian/control jekyll-2.2.0+dfsg/debian/control
--- jekyll-2.2.0+dfsg/debian/control	2014-07-30 11:19:19.000000000 +0200
+++ jekyll-2.2.0+dfsg/debian/control	2014-11-09 16:34:39.000000000 +0100
@@ -29,9 +29,10 @@
                ruby-rdiscount,
                xdg-utils,
                ruby-mime-types,
-               ruby-activesupport-3.2,
+               ruby-activesupport,
                ruby-jekyll-test-plugin,
                ruby-jekyll-test-plugin-malicious,
+               ruby-test-unit,
                ruby-rouge
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/jekyll.git;a=summary
diff -Nru jekyll-2.2.0+dfsg/debian/patches/activesupport4 jekyll-2.2.0+dfsg/debian/patches/activesupport4
--- jekyll-2.2.0+dfsg/debian/patches/activesupport4	1970-01-01 01:00:00.000000000 +0100
+++ jekyll-2.2.0+dfsg/debian/patches/activesupport4	2014-11-09 16:18:46.000000000 +0100
@@ -0,0 +1,21 @@
+From: Christian Hofstaedtler <zeha@debian.org>
+Subject: drop version from activesupport dependency
+
+Upstream changelog noted that the explicit dependency on 3.2.x is
+only there to keep running on Ruby <= 1.9.2, but as jessie only
+ships 1.9.3+, we can ignore that. And Rails 3.2.x went out, so we
+MUST ignore that.
+
+Index: jekyll/jekyll.gemspec
+===================================================================
+--- jekyll.orig/jekyll.gemspec	2014-11-09 16:16:40.538191014 +0100
++++ jekyll/jekyll.gemspec	2014-11-09 16:17:11.414172834 +0100
+@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
+   s.add_development_dependency('maruku', "~> 0.7.0")
+   s.add_development_dependency('rdiscount', "~> 1.6")
+   s.add_development_dependency('mime-types', "~> 1.5")
+-  s.add_development_dependency('activesupport', '~> 3.2.13')
++  s.add_development_dependency('activesupport')
+   s.add_development_dependency('jekyll_test_plugin')
+   s.add_development_dependency('jekyll_test_plugin_malicious')
+   s.add_development_dependency('rouge', '~> 1.3')
diff -Nru jekyll-2.2.0+dfsg/debian/patches/series jekyll-2.2.0+dfsg/debian/patches/series
--- jekyll-2.2.0+dfsg/debian/patches/series	2014-07-30 11:19:19.000000000 +0200
+++ jekyll-2.2.0+dfsg/debian/patches/series	2014-11-09 16:17:02.000000000 +0100
@@ -5,3 +5,4 @@
 0006-Fix-relative-LOAD_PATH-in-test_redcloth.patch
 0007-Add-newline-in-test_coffee_script.patch
 0008-Update-test-for-newer-RDiscount.patch
+activesupport4