diff -Nru ruby-actionpack-action-caching-1.1.1/debian/changelog ruby-actionpack-action-caching-1.1.1/debian/changelog --- ruby-actionpack-action-caching-1.1.1/debian/changelog 2014-11-17 19:45:25.000000000 +0000 +++ ruby-actionpack-action-caching-1.1.1/debian/changelog 2015-12-14 11:17:21.000000000 +0000 @@ -1,3 +1,11 @@ +ruby-actionpack-action-caching (1.1.1-4) unstable; urgency=medium + + * debian/copyright: fill in Source: URL + * Add debian/patches/Fix-Failing-Tests.patch, from upstream + * Update packaging with a new dh-make-ruby run + + -- Antonio Terceiro Mon, 14 Dec 2015 09:06:34 -0200 + ruby-actionpack-action-caching (1.1.1-3) unstable; urgency=medium * Breaks/Replaces against ruby-actionpack-2.3, ruby-actionpack-3.2 to diff -Nru ruby-actionpack-action-caching-1.1.1/debian/compat ruby-actionpack-action-caching-1.1.1/debian/compat --- ruby-actionpack-action-caching-1.1.1/debian/compat 2014-11-17 19:45:25.000000000 +0000 +++ ruby-actionpack-action-caching-1.1.1/debian/compat 2015-12-14 11:17:21.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru ruby-actionpack-action-caching-1.1.1/debian/control ruby-actionpack-action-caching-1.1.1/debian/control --- ruby-actionpack-action-caching-1.1.1/debian/control 2014-11-17 19:45:25.000000000 +0000 +++ ruby-actionpack-action-caching-1.1.1/debian/control 2015-12-14 11:17:21.000000000 +0000 @@ -3,20 +3,28 @@ Priority: optional Maintainer: Debian Ruby Extras Maintainers Uploaders: Antonio Terceiro -Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.9.0~), ruby-mocha, ruby-rails, rake -Standards-Version: 3.9.5 +Build-Depends: debhelper (>= 9~), + gem2deb, + rake, + ruby-actionpack (<< 2:5.0), + ruby-actionpack (>= 2:4.0.0), + ruby-mocha, + ruby-rails, +Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-actionpack-action-caching.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-actionpack-action-caching.git;a=summary +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-actionpack-action-caching.git Homepage: https://github.com/rails/actionpack-action_caching -Testsuite: autopkgtest +Testsuite: autopkgtest-pkg-ruby XS-Ruby-Versions: all Package: ruby-actionpack-action-caching Architecture: all XB-Ruby-Versions: ${ruby:Versions} -Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-actionpack (>> 2:4) -Breaks: ruby-actionpack-2.3, ruby-actionpack-3.2 -Replaces: ruby-actionpack-2.3, ruby-actionpack-3.2 +Depends: ruby | ruby-interpreter, + ruby-actionpack (<< 2:5.0), + ruby-actionpack (>= 2:4.0.0), + ${misc:Depends}, + ${shlibs:Depends} Description: action caching for Action Pack This package provides the functionality of caching the results of Rails controller actions, which was removed from the Rails core with the 4.0 diff -Nru ruby-actionpack-action-caching-1.1.1/debian/copyright ruby-actionpack-action-caching-1.1.1/debian/copyright --- ruby-actionpack-action-caching-1.1.1/debian/copyright 2014-11-17 19:45:25.000000000 +0000 +++ ruby-actionpack-action-caching-1.1.1/debian/copyright 2015-12-14 11:17:21.000000000 +0000 @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: actionpack-action_caching -Source: FIXME +Source: https://github.com/rails/actionpack-action_caching Files: * Copyright: 2012 David Heinemeier Hansson diff -Nru ruby-actionpack-action-caching-1.1.1/debian/patches/Fix-Failing-Tests.patch ruby-actionpack-action-caching-1.1.1/debian/patches/Fix-Failing-Tests.patch --- ruby-actionpack-action-caching-1.1.1/debian/patches/Fix-Failing-Tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ ruby-actionpack-action-caching-1.1.1/debian/patches/Fix-Failing-Tests.patch 2015-12-14 11:17:21.000000000 +0000 @@ -0,0 +1,22 @@ +From b604120c789f7b9e50075ff29e569c3451a50f87 Mon Sep 17 00:00:00 2001 +From: claudiob +Date: Tue, 6 Jan 2015 08:47:14 -0800 +Subject: [PATCH] Fix failing tests by requiring mocha + +Now that the rails gem points to 4.2, we need to require mocha in order +to use the `expects` syntax, otherwise tests will fail. See: +https://travis-ci.org/rails/actionpack-action_caching/jobs/46021642 +--- + test/caching_test.rb | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/caching_test.rb b/test/caching_test.rb +index 71d74fd..53f99ab 100644 +--- a/test/caching_test.rb ++++ b/test/caching_test.rb +@@ -1,4 +1,5 @@ + require 'abstract_unit' ++require 'mocha/setup' + + CACHE_DIR = 'test_cache' + # Don't change '/../temp/' cavalierly or you might hose something you don't want hosed diff -Nru ruby-actionpack-action-caching-1.1.1/debian/patches/series ruby-actionpack-action-caching-1.1.1/debian/patches/series --- ruby-actionpack-action-caching-1.1.1/debian/patches/series 2014-11-17 19:45:25.000000000 +0000 +++ ruby-actionpack-action-caching-1.1.1/debian/patches/series 2015-12-14 11:17:21.000000000 +0000 @@ -1 +1,2 @@ dont-use-bundler-in-tests.patch +Fix-Failing-Tests.patch diff -Nru ruby-actionpack-action-caching-1.1.1/debian/rules ruby-actionpack-action-caching-1.1.1/debian/rules --- ruby-actionpack-action-caching-1.1.1/debian/rules 2014-11-17 19:45:25.000000000 +0000 +++ ruby-actionpack-action-caching-1.1.1/debian/rules 2015-12-14 11:17:21.000000000 +0000 @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export GEM2DEB_TEST_RUNNER = --check-dependencies + %: dh $@ --buildsystem=ruby --with ruby diff -Nru ruby-actionpack-action-caching-1.1.1/debian/tests/control ruby-actionpack-action-caching-1.1.1/debian/tests/control --- ruby-actionpack-action-caching-1.1.1/debian/tests/control 2014-11-17 19:45:25.000000000 +0000 +++ ruby-actionpack-action-caching-1.1.1/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -Test-Command: gem2deb-test-runner --autopkgtest 2>&1 -Depends: @, gem2deb-test-runner, ruby-rails, ruby-mocha, rake -Restrictions: allow-stderr