[DRE-commits] [diaspora] 01/04: addressable is in sync

[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 70bc0d6ca2ba16bf4c528776bfe087a648f15e96
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 17:52:35 2015 +0530

    addressable is in sync
---
 debian/changelog                              | 3 ++-
 debian/control                                | 2 +-
 debian/patches/030-loosen-tiny-versions.patch | 9 ---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0381823..557764b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,8 @@ 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, ruby-rack-protection,
-    ruby-rails-admin, ruby-zip, ruby-haml, ruby-typhoeus, ruby-faraday
+    ruby-rails-admin, ruby-zip, ruby-haml, ruby-typhoeus, ruby-faraday,
+    ruby-addressable
   * 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 e65a24a..0e40ca6 100644
--- a/debian/control
+++ b/debian/control
@@ -67,7 +67,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-active-model-serializers,
  ruby-rails-assets-diaspora-jsxc,
  ruby-acts-as-taggable-on,
- ruby-addressable,
+ ruby-addressable (>= 2.3.8),
  ruby-faraday (>= 0.9.1),
  ruby-faraday-middleware,
  ruby-faraday-cookie-jar,
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 950aae4..9af0421 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -71,15 +71,6 @@ Index: diaspora/Gemfile
    gem "rails-assets-jquery-textchange",             "0.2.3"
    gem "rails-assets-perfect-scrollbar",             "0.6.3"
    gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
-@@ -155,7 +155,7 @@ gem "acts-as-taggable-on", "3.5.0"
- 
- # URIs and HTTP
- 
--gem "addressable",        "2.3.8", require: "addressable/uri"
-+gem "addressable",        "~> 2.3.6", require: "addressable/uri"
- gem "faraday",            "0.9.1"
- gem "faraday_middleware", "0.9.1"
- gem "faraday-cookie_jar", "0.0.6"
 @@ -167,7 +167,7 @@ gem "gon",                     "5.2.3"
  gem "haml",                    "4.0.6"
  gem "mobile-fu",               "1.3.1"

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