[DRE-commits] [diaspora] 05/06: ruby-responders is in sync deleted: debian/patches/010-loosen-responders-version.patch

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora.

commit e21f6efe20358b5e90080ff755016d753a2f095f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Aug 28 22:28:43 2015 +0530

    ruby-responders is in sync
    	deleted:    debian/patches/010-loosen-responders-version.patch
---
 debian/changelog                                   |  1 +
 debian/control                                     |  1 +
 debian/patches/010-loosen-responders-version.patch | 13 -------------
 debian/patches/series                              |  1 -
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c74a26d..f187999 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ diaspora (0.5.2.0+debian-7) UNRELEASED; urgency=medium
   * Stop diaspora before upgrade
   * Set minimum version for ruby-rails-assets-markdown-it, ruby-fog,
     ruby-rack-rewrite, ruby-uuid, ruby-mini-magick (Closes: #796979)
+  * Add ruby-responders to dependencies
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 28 Aug 2015 14:52:07 +0530
 
diff --git a/debian/control b/debian/control
index 6861cb7..df57f3e 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  bundler (>= 1.9),
  ruby-rails (>= 2:4.2.3-4~),
  ruby-rails (<< 2:5.0),
+ ruby-responders (>= 2.1.0),
  ruby-actionpack-action-caching,
  ruby-actionpack-page-caching,
  unicorn (>= 4.9.0),
diff --git a/debian/patches/010-loosen-responders-version.patch b/debian/patches/010-loosen-responders-version.patch
deleted file mode 100644
index 7c73fc3..0000000
--- a/debian/patches/010-loosen-responders-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -4,7 +4,7 @@ gem "rails", "4.2.3"
- 
- # Legacy Rails features, remove me!
- # responders (class level)
--gem "responders", "2.1.0"
-+gem "responders", "~> 2.0"
- 
- # Appserver
- 
diff --git a/debian/patches/series b/debian/patches/series
index c96f43b..e21991e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 002-remove-development-test-from-gemfile.patch
 006-loosen-messagebus-ruby-api-version.patch
 007-loosen-roxml-version.patch
-010-loosen-responders-version.patch
 019-remove-diaspora-vines.patch
 020-loosen-minor-versions.patch
 030-loosen-tiny-versions.patch

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