[DRE-commits] [diaspora] 03/07: rails-timeago is only tiny version ahead

[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 0fbc3570056c55e98920e8ee5ed8eac1b43ea216
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Aug 27 16:10:01 2015 +0530

    rails-timeago is only tiny version ahead
---
 debian/patches/018-loosen-rails-timeago.patch | 13 -------------
 debian/patches/030-loosen-tiny-versions.patch |  8 ++++++--
 debian/patches/series                         |  1 -
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/debian/patches/018-loosen-rails-timeago.patch b/debian/patches/018-loosen-rails-timeago.patch
deleted file mode 100644
index 55558c7..0000000
--- a/debian/patches/018-loosen-rails-timeago.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -167,7 +167,7 @@ gem "gon",                     "5.2.3"
- gem "haml",                    "4.0.6"
- gem "mobile-fu",               "1.3.1"
- gem "will_paginate",           "3.0.7"
--gem "rails-timeago",           "2.11.0"
-+gem "rails-timeago",           "~>2.11"
- 
- # Logging
- 
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 0a2546c..0955f5e 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -85,7 +85,7 @@ 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,16 +155,16 @@ gem "acts-as-taggable-on", "3.5.0"
+@@ -155,19 +155,19 @@ gem "acts-as-taggable-on", "3.5.0"
  
  # URIs and HTTP
  
@@ -105,7 +105,11 @@ Index: diaspora/Gemfile
 +gem "haml",                    "~> 4.0.5"
  gem "mobile-fu",               "1.3.1"
  gem "will_paginate",           "3.0.7"
- gem "rails-timeago",           "~>2.11"
+-gem "rails-timeago",           "2.11.0"
++gem "rails-timeago",           "~> 2.11.0"
+ 
+ # Logging
+ 
 @@ -175,7 +175,7 @@ gem "logging-rails", "0.5.0", require: "
  
  # Reading and writing zip files
diff --git a/debian/patches/series b/debian/patches/series
index 04f4622..c96f43b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
 006-loosen-messagebus-ruby-api-version.patch
 007-loosen-roxml-version.patch
 010-loosen-responders-version.patch
-018-loosen-rails-timeago.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