[DRE-commits] [diaspora] 01/01: rails-admin 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 c1b23ce3a717374d4a1a03e2f629980564fe71f1
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 09:26:39 2015 +0530

    rails-admin 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 642b5a2..0f3bb4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,8 @@ diaspora (0.5.2.0+debian-7) UNRELEASED; urgency=medium
      diaspora-installer)
   * 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-rack-rewrite, ruby-uuid, ruby-mini-magick, ruby-rack-protection,
+    ruby-rails-admin
   * 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 f9736f7..0adbaae 100644
--- a/debian/control
+++ b/debian/control
@@ -112,7 +112,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-rails-assets-jakobmattsson-jquery-elastic,
  ruby-facebox-rails,
  nodejs,
- ruby-rails-admin,
+ ruby-rails-admin (>= 0.6.8),
  ruby-rack-google-analytics,
  ruby-rack-piwik (>=0.3.0),
  ruby-rack-protection (>= 1.5.3),
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 34debdc..a5869ca 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -105,12 +105,3 @@ Index: diaspora/Gemfile
  
  # Prevent occasions where minitest is not bundled in
  # packaged versions of ruby. See following issues/prs:
-@@ -194,7 +194,7 @@ gem "minitest"
- group :production do # we don"t install these on travis to speed up test runs
-   # Administration
- 
--  gem "rails_admin", "0.6.8"
-+  gem "rails_admin", "~> 0.6.7"
- 
-   # Analytics
- 

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