[DRE-commits] [diaspora] 01/03: sync ruby-zip

[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 fb78a6b7308460148a6b69b06485446d76a12d09
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 10:11:03 2015 +0530

    sync ruby-zip
---
 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 0f3bb4d..768f723 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +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, ruby-rack-protection,
-    ruby-rails-admin
+    ruby-rails-admin, ruby-zip
   * 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 0adbaae..c27b5fe 100644
--- a/debian/control
+++ b/debian/control
@@ -79,7 +79,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-will-paginate,
  ruby-rails-timeago,
  ruby-logging-rails,
- ruby-zip-zip,
+ ruby-zip (>= 1.1.7),
  ruby-entypo-rails (>= 2.2.3),
 # ruby-bootstrap-sass,
  ruby-compass-rails (>= 2.0.5),
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index a5869ca..5ad8b99 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -96,12 +96,3 @@ Index: diaspora/Gemfile
  
  # Logging
  
-@@ -175,7 +175,7 @@ gem "logging-rails", "0.5.0", require: "
- 
- # Reading and writing zip files
- 
--gem "rubyzip", "1.1.7"
-+gem "rubyzip", "~> 1.1.6"
- 
- # Prevent occasions where minitest is not bundled in
- # packaged versions of ruby. See following issues/prs:

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