[DRE-commits] [jekyll] 01/03: Update Build-Depends ruby-activesupport-3.2

[zeha at debian.org]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository jekyll.

commit 7cb3df74c8b7386acd65d26c7cbbbc10076dadd4
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Sun Nov 9 16:19:15 2014 +0100

    Update Build-Depends ruby-activesupport-3.2
    
    to ruby-activesupport, which is the 4.0 version that we're going to
    ship in jessie.
    
    Closes: #768697
    Git-Dch: full
    Thanks: Lucas Nussbaum <lucas at lucas-nussbaum.net>
---
 debian/control                |  2 +-
 debian/patches/activesupport4 | 21 +++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 2eaf702..b356542 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Build-Depends: debhelper (>= 9),
                ruby-rdiscount,
                xdg-utils,
                ruby-mime-types,
-               ruby-activesupport-3.2,
+               ruby-activesupport,
                ruby-jekyll-test-plugin,
                ruby-jekyll-test-plugin-malicious,
                ruby-rouge
diff --git a/debian/patches/activesupport4 b/debian/patches/activesupport4
new file mode 100644
index 0000000..ae657d6
--- /dev/null
+++ b/debian/patches/activesupport4
@@ -0,0 +1,21 @@
+From: Christian Hofstaedtler <zeha at 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 --git a/debian/patches/series b/debian/patches/series
index 6d841a1..f75dd1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/jekyll.git