[DRE-commits] [diaspora] 02/04: rails-assets-jquery-placeholder 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 4bd76cf990b210c34e7f214a3df409699b070e9f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 18:13:05 2015 +0530

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

diff --git a/debian/changelog b/debian/changelog
index 557764b..65df60b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ diaspora (0.5.2.0+debian-7) UNRELEASED; urgency=medium
   * 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-addressable
+    ruby-addressable, ruby-rails-assets-jquery-placeholder
   * 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 0e40ca6..59c7647 100644
--- a/debian/control
+++ b/debian/control
@@ -105,7 +105,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-rails-assets-highlightjs,
  ruby-rails-assets-jeresig-jquery.hotkeys (>= 0.2.0-3),
  ruby-rails-assets-jquery-idletimer,
- ruby-rails-assets-jquery-placeholder,
+ ruby-rails-assets-jquery-placeholder (>= 2.1.2),
  ruby-rails-assets-jquery-textchange,
  ruby-rails-assets-perfect-scrollbar (>= 0.6.3~),
  ruby-rails-assets-perfect-scrollbar (<< 0.7),
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 9af0421..6f34acb 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -62,15 +62,6 @@ Index: diaspora/Gemfile
  
    gem "rails-assets-markdown-it",                         "4.4.0"
    gem "rails-assets-markdown-it-hashtag",                 "0.3.1"
-@@ -104,7 +104,7 @@ source "https://rails-assets.org" do
-   # jQuery plugins
- 
-   gem "rails-assets-jeresig--jquery.hotkeys",       "0.2.0"
--  gem "rails-assets-jquery-placeholder",            "2.1.2"
-+  gem "rails-assets-jquery-placeholder",            "~> 2.1.1"
-   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"
 @@ -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