[DRE-commits] [diaspora] 186/257: refresh remove-gemfile-lock.patch
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sun Apr 12 14:17:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository diaspora.
commit 02bc9cb77d6b2534d3788f5bc4e18b10ef427731
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Sat Nov 29 23:22:12 2014 +0530
refresh remove-gemfile-lock.patch
---
debian/patches/remove-gemfile-lock.patch | 193 ++++++++++++++++++++-----------
1 file changed, 128 insertions(+), 65 deletions(-)
diff --git a/debian/patches/remove-gemfile-lock.patch b/debian/patches/remove-gemfile-lock.patch
index 0f43854..64be7a8 100644
--- a/debian/patches/remove-gemfile-lock.patch
+++ b/debian/patches/remove-gemfile-lock.patch
@@ -2,34 +2,35 @@ Index: diaspora/Gemfile.lock
===================================================================
--- diaspora.orig/Gemfile.lock
+++ /dev/null
-@@ -1,639 +0,0 @@
+@@ -1,702 +0,0 @@
-GEM
- remote: https://rubygems.org/
- remote: https://rails-assets.org/
- specs:
-- actionmailer (4.1.7)
-- actionpack (= 4.1.7)
-- actionview (= 4.1.7)
+- CFPropertyList (2.2.8)
+- actionmailer (4.1.8)
+- actionpack (= 4.1.8)
+- actionview (= 4.1.8)
- mail (~> 2.5, >= 2.5.4)
-- actionpack (4.1.7)
-- actionview (= 4.1.7)
-- activesupport (= 4.1.7)
+- actionpack (4.1.8)
+- actionview (= 4.1.8)
+- activesupport (= 4.1.8)
- rack (~> 1.5.2)
- rack-test (~> 0.6.2)
- actionpack-action_caching (1.1.1)
- actionpack (>= 4.0.0, < 5.0)
- actionpack-page_caching (1.0.2)
- actionpack (>= 4.0.0, < 5)
-- actionview (4.1.7)
-- activesupport (= 4.1.7)
+- actionview (4.1.8)
+- activesupport (= 4.1.8)
- builder (~> 3.1)
- erubis (~> 2.7.0)
-- activemodel (4.1.7)
-- activesupport (= 4.1.7)
+- activemodel (4.1.8)
+- activesupport (= 4.1.8)
- builder (~> 3.1)
-- activerecord (4.1.7)
-- activemodel (= 4.1.7)
-- activesupport (= 4.1.7)
+- activerecord (4.1.8)
+- activemodel (= 4.1.8)
+- activesupport (= 4.1.8)
- arel (~> 5.0.0)
- activerecord-import (0.6.0)
- activerecord (>= 3.0)
@@ -37,7 +38,7 @@ Index: diaspora/Gemfile.lock
- activemodel (~> 4.0)
- activesupport (~> 4.0)
- rails-observers (~> 0.1.1)
-- activesupport (4.1.7)
+- activesupport (4.1.8)
- i18n (~> 0.6, >= 0.6.9)
- json (~> 1.7, >= 1.7.7)
- minitest (~> 5.1)
@@ -83,8 +84,8 @@ Index: diaspora/Gemfile.lock
- activesupport (>= 3.2.0)
- json (>= 1.7)
- mime-types (>= 1.16)
-- celluloid (0.15.2)
-- timers (~> 1.1.0)
+- celluloid (0.16.0)
+- timers (~> 4.0.0)
- childprocess (0.5.5)
- ffi (~> 1.0, >= 1.0.11)
- chunky_png (1.3.3)
@@ -104,7 +105,7 @@ Index: diaspora/Gemfile.lock
- compass-rails (2.0.0)
- compass (>= 0.12.2)
- configurate (0.2.0)
-- connection_pool (2.0.0)
+- connection_pool (2.1.0)
- crack (0.4.2)
- safe_yaml (~> 1.0.0)
- cucumber (1.3.17)
@@ -128,6 +129,8 @@ Index: diaspora/Gemfile.lock
- responders
- thread_safe (~> 0.1)
- warden (~> 1.2.3)
+- devise-token_authenticatable (0.3.0)
+- devise (~> 3.4.0)
- devise_lastseenable (0.0.4)
- devise
- devise
@@ -135,6 +138,13 @@ Index: diaspora/Gemfile.lock
- rails (>= 3.0.4)
- warden
- warden
+- diaspora-vines (0.1.25)
+- activerecord (~> 4.1.4)
+- bcrypt (~> 3.1)
+- em-hiredis (~> 0.3.0)
+- eventmachine (~> 1.0)
+- http_parser.rb (~> 0.6)
+- nokogiri (~> 1.6)
- diff-lcs (1.2.5)
- eco (1.0.0)
- coffee-script
@@ -142,11 +152,15 @@ Index: diaspora/Gemfile.lock
- execjs
- eco-source (1.1.0.rc.1)
- ejs (1.1.1)
+- em-hiredis (0.3.0)
+- eventmachine (~> 1.0)
+- hiredis (~> 0.5.0)
- entypo-rails (2.2.2)
- railties (>= 3.1, <= 5)
- erubis (2.7.0)
- ethon (0.7.1)
- ffi (>= 1.3.0)
+- eventmachine (1.0.3)
- excon (0.41.0)
- execjs (2.2.2)
- factory_girl (4.5.0)
@@ -159,23 +173,31 @@ Index: diaspora/Gemfile.lock
- faraday_middleware (0.9.1)
- faraday (>= 0.7.4, < 0.10)
- ffi (1.9.6)
+- fission (0.5.0)
+- CFPropertyList (~> 2.2)
- fixture_builder (0.3.6)
- activerecord (>= 2)
- activesupport (>= 2)
-- fog (1.24.0)
-- fog-brightbox
-- fog-core (~> 1.23)
+- fog (1.25.0)
+- fog-brightbox (~> 0.4)
+- fog-core (~> 1.25)
- fog-json
+- fog-profitbricks
- fog-radosgw (>= 0.0.2)
- fog-sakuracloud (>= 0.0.4)
- fog-softlayer
+- fog-terremark
+- fog-vmfusion
+- fog-voxel
+- fog-xml (~> 0.1.1)
- ipaddress (~> 0.5)
- nokogiri (~> 1.5, >= 1.5.11)
+- opennebula
- fog-brightbox (0.6.1)
- fog-core (~> 1.22)
- fog-json
- inflecto
-- fog-core (1.24.0)
+- fog-core (1.25.0)
- builder
- excon (~> 0.38)
- formatador (~> 0.2)
@@ -184,6 +206,10 @@ Index: diaspora/Gemfile.lock
- net-ssh (>= 2.1.3)
- fog-json (1.0.0)
- multi_json (~> 1.0)
+- fog-profitbricks (0.0.1)
+- fog-core
+- fog-xml
+- nokogiri
- fog-radosgw (0.0.3)
- fog-core (>= 1.21.0)
- fog-json
@@ -194,6 +220,15 @@ Index: diaspora/Gemfile.lock
- fog-softlayer (0.3.24)
- fog-core
- fog-json
+- fog-terremark (0.0.3)
+- fog-core
+- fog-xml
+- fog-vmfusion (0.0.1)
+- fission
+- fog-core
+- fog-voxel (0.0.1)
+- fog-core
+- fog-xml
- fog-xml (0.1.1)
- fog-core
- nokogiri (~> 1.5, >= 1.5.11)
@@ -215,7 +250,7 @@ Index: diaspora/Gemfile.lock
- json
- multi_json
- request_store (>= 1.0.5)
-- guard (2.7.3)
+- guard (2.8.2)
- formatador (>= 0.2.4)
- listen (~> 2.7)
- lumberjack (~> 1.0)
@@ -227,9 +262,9 @@ Index: diaspora/Gemfile.lock
- guard-rspec (4.3.1)
- guard (~> 2.1)
- rspec (>= 2.14, < 4.0)
-- guard-spork (1.5.1)
+- guard-spork (2.0.1)
- childprocess (>= 0.2.3)
-- guard (>= 1.1)
+- guard (~> 2.8.2)
- spork (>= 0.8.4)
- haml (4.0.5)
- tilt
@@ -240,7 +275,10 @@ Index: diaspora/Gemfile.lock
- tilt
- hashie (3.3.1)
- hike (1.2.3)
+- hiredis (0.5.2)
+- hitimes (1.2.2)
- http_accept_language (2.0.2)
+- http_parser.rb (0.6.0)
- i18n (0.6.11)
- i18n-inflector (2.6.7)
- i18n (>= 0.4.1)
@@ -251,12 +289,12 @@ Index: diaspora/Gemfile.lock
- ice_cube (0.11.1)
- inflecto (0.0.2)
- ipaddress (0.8.0)
-- jasmine (2.0.3)
-- jasmine-core (~> 2.0.0)
+- jasmine (2.1.0)
+- jasmine-core (~> 2.1.0)
- phantomjs
- rack (>= 1.2.1)
- rake
-- jasmine-core (2.0.2)
+- jasmine-core (2.1.2)
- jasmine-jquery-rails (2.0.3)
- jquery-rails (3.1.2)
- railties (>= 3.0, < 5.0)
@@ -274,7 +312,7 @@ Index: diaspora/Gemfile.lock
- actionpack (>= 3.0.0)
- activesupport (>= 3.0.0)
- kgio (2.9.2)
-- listen (2.7.11)
+- listen (2.8.1)
- celluloid (>= 0.15.2)
- rb-fsevent (>= 0.9.3)
- rb-inotify (>= 0.9)
@@ -288,10 +326,9 @@ Index: diaspora/Gemfile.lock
- messagebus_ruby_api (1.0.3)
- method_source (0.8.2)
- mime-types (2.4.3)
-- mini_magick (3.8.1)
-- subexec (~> 0.2.1)
+- mini_magick (4.0.1)
- mini_portile (0.6.1)
-- minitest (5.4.2)
+- minitest (5.4.3)
- mobile-fu (1.3.1)
- rack-mobile-detect
- rails
@@ -299,7 +336,7 @@ Index: diaspora/Gemfile.lock
- multi_test (0.1.1)
- multi_xml (0.5.5)
- multipart-post (2.0.0)
-- mysql2 (0.3.16)
+- mysql2 (0.3.17)
- nested_form (0.3.2)
- net-scp (1.2.1)
- net-ssh (>= 2.6.5)
@@ -336,6 +373,10 @@ Index: diaspora/Gemfile.lock
- opengraph_parser (0.2.3)
- addressable
- nokogiri
+- opennebula (4.10.1)
+- json
+- nokogiri
+- rbvmomi
- orm_adapter (0.5.0)
- phantomjs (1.9.7.1)
- pry (0.10.1)
@@ -358,30 +399,43 @@ Index: diaspora/Gemfile.lock
- rack-pjax (0.8.0)
- nokogiri (~> 1.5)
- rack (~> 1.1)
-- rack-protection (1.2.0)
+- rack-protection (1.5.2)
- rack
- rack-rewrite (1.5.0)
- rack-ssl (1.4.1)
- rack
- rack-test (0.6.2)
- rack (>= 1.0)
-- rails (4.1.7)
-- actionmailer (= 4.1.7)
-- actionpack (= 4.1.7)
-- actionview (= 4.1.7)
-- activemodel (= 4.1.7)
-- activerecord (= 4.1.7)
-- activesupport (= 4.1.7)
+- rails (4.1.8)
+- actionmailer (= 4.1.8)
+- actionpack (= 4.1.8)
+- actionview (= 4.1.8)
+- activemodel (= 4.1.8)
+- activerecord (= 4.1.8)
+- activesupport (= 4.1.8)
- bundler (>= 1.3.0, < 2.0)
-- railties (= 4.1.7)
+- railties (= 4.1.8)
- sprockets-rails (~> 2.0)
+- rails-assets-diaspora_jsxc (0.0.9)
+- rails-assets-jquery (~> 1.11.1)
+- rails-assets-jquery-colorbox (~> 1.5.14)
+- rails-assets-jquery-fullscreen (~> 1.1.4)
+- rails-assets-jquery-ui (~> 1.10.4)
+- rails-assets-jquery.slimscroll (~> 1.3.3)
- rails-assets-jeresig--jquery.hotkeys (0.2.0)
- rails-assets-jquery (>= 1.4.2)
- rails-assets-jquery (1.11.1)
+- rails-assets-jquery-colorbox (1.5.14)
+- rails-assets-jquery (>= 1.3.2)
+- rails-assets-jquery-fullscreen (1.1.4)
- rails-assets-jquery-idletimer (1.0.1)
- rails-assets-jquery-placeholder (2.0.8)
- rails-assets-jquery-textchange (0.2.3)
- rails-assets-jquery
+- rails-assets-jquery-ui (1.10.4)
+- rails-assets-jquery (>= 1.6)
+- rails-assets-jquery.slimscroll (1.3.3)
+- rails-assets-jquery (>= 1.7)
- rails-assets-perfect-scrollbar (0.5.7)
- rails-assets-jquery (>= 1.10)
- rails-assets-punycode (1.3.2)
@@ -407,9 +461,9 @@ Index: diaspora/Gemfile.lock
- remotipart (~> 1.0)
- safe_yaml (~> 1.0)
- sass-rails (~> 4.0)
-- railties (4.1.7)
-- actionpack (= 4.1.7)
-- activesupport (= 4.1.7)
+- railties (4.1.8)
+- actionpack (= 4.1.8)
+- activesupport (= 4.1.8)
- rake (>= 0.8.7)
- thor (>= 0.18.1, < 2.0)
- raindrops (0.13.0)
@@ -417,6 +471,10 @@ Index: diaspora/Gemfile.lock
- rb-fsevent (0.9.4)
- rb-inotify (0.9.5)
- ffi (>= 0.5.0)
+- rbvmomi (1.8.2)
+- builder
+- nokogiri (>= 1.4.1)
+- trollop
- redcarpet (3.2.0)
- redis (3.1.0)
- redis-namespace (1.5.1)
@@ -465,8 +523,8 @@ Index: diaspora/Gemfile.lock
- multi_json (~> 1.0)
- rubyzip (~> 1.0)
- websocket (~> 1.0)
-- sidekiq (3.2.5)
-- celluloid (= 0.15.2)
+- sidekiq (3.3.0)
+- celluloid (>= 0.16.0)
- connection_pool (>= 2.0.0)
- json
- redis (>= 3.0.6)
@@ -477,11 +535,11 @@ Index: diaspora/Gemfile.lock
- sidekiq (>= 3.0.0)
- simple_captcha2 (0.3.2)
- rails (>= 4.1)
-- simple_oauth (0.3.0)
-- sinatra (1.3.3)
-- rack (~> 1.3, >= 1.3.6)
-- rack-protection (~> 1.2)
-- tilt (~> 1.3, >= 1.3.3)
+- simple_oauth (0.2.0)
+- sinatra (1.4.5)
+- rack (~> 1.4)
+- rack-protection (~> 1.4)
+- tilt (~> 1.3, >= 1.3.4)
- sinon-rails (1.10.3)
- railties (>= 3.1)
- slop (3.6.0)
@@ -491,11 +549,10 @@ Index: diaspora/Gemfile.lock
- multi_json (~> 1.0)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
-- sprockets-rails (2.2.0)
+- sprockets-rails (2.2.1)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- sprockets (>= 2.8, < 4.0)
-- subexec (0.2.3)
- systemu (2.6.4)
- test_after_commit (0.4.0)
- activerecord (>= 3.2)
@@ -503,7 +560,9 @@ Index: diaspora/Gemfile.lock
- thread_safe (0.3.4)
- tilt (1.4.1)
- timecop (0.7.1)
-- timers (1.1.0)
+- timers (4.0.1)
+- hitimes
+- trollop (2.0)
- twitter (4.8.1)
- faraday (~> 0.8, < 0.10)
- multi_json (~> 1.0)
@@ -558,26 +617,28 @@ Index: diaspora/Gemfile.lock
- cucumber-rails (= 1.4.2)
- database_cleaner (= 1.3.0)
- devise (= 3.4.1)
+- devise-token_authenticatable (~> 0.3.0)
- devise_lastseenable (= 0.0.4)
+- diaspora-vines (~> 0.1.25)
- entypo-rails (= 2.2.2)
- factory_girl_rails (= 4.5.0)
- faraday (= 0.9.0)
- faraday_middleware (= 0.9.1)
- fixture_builder (= 0.3.6)
-- fog (= 1.24.0)
+- fog (= 1.25.0)
- foreigner (= 1.6.1)
- foreman (= 0.62)
- fuubar (= 2.0.0)
- gon (= 5.2.3)
-- guard (= 2.7.3)
+- guard (= 2.8.2)
- guard-cucumber (= 1.5.1)
- guard-rspec (= 4.3.1)
-- guard-spork (= 1.5.1)
+- guard-spork (= 2.0.1)
- haml (= 4.0.5)
- handlebars_assets (= 0.18.0)
- http_accept_language (= 2.0.2)
- i18n-inflector-rails (= 1.0.7)
-- jasmine (= 2.0.3)
+- jasmine (= 2.1.0)
- jasmine-jquery-rails (= 2.0.3)
- jquery-rails (= 3.1.2)
- js-routes (= 0.9.9)
@@ -585,9 +646,10 @@ Index: diaspora/Gemfile.lock
- json (= 1.8.1)
- markerb (= 1.0.2)
- messagebus_ruby_api (= 1.0.3)
-- mini_magick (= 3.8.1)
+- mini_magick (= 4.0.1)
+- minitest
- mobile-fu (= 1.3.1)
-- mysql2 (= 0.3.16)
+- mysql2 (= 0.3.17)
- nokogiri (= 1.6.4.1)
- omniauth (= 1.2.2)
- omniauth-facebook (= 1.6.0)
@@ -601,10 +663,11 @@ Index: diaspora/Gemfile.lock
- rack-cors (= 0.2.9)
- rack-google-analytics (= 1.2.0)
- rack-piwik (= 0.3.0)
-- rack-protection (= 1.2)
+- rack-protection (= 1.5.2)
- rack-rewrite (= 1.5.0)
- rack-ssl (= 1.4.1)
-- rails (= 4.1.7)
+- rails (= 4.1.8)
+- rails-assets-diaspora_jsxc (~> 0.0.9)
- rails-assets-jeresig--jquery.hotkeys (= 0.2.0)
- rails-assets-jquery (= 1.11.1)
- rails-assets-jquery-idletimer (= 1.0.1)
@@ -625,10 +688,10 @@ Index: diaspora/Gemfile.lock
- ruby-oembed (= 0.8.11)
- sass-rails (= 4.0.4)
- selenium-webdriver (= 2.44.0)
-- sidekiq (= 3.2.5)
+- sidekiq (= 3.3.0)
- sidetiq (= 0.6.3)
- simple_captcha2 (= 0.3.2)
-- sinatra (= 1.3.3)
+- sinatra (= 1.4.5)
- sinon-rails (= 1.10.3)
- spork (= 1.0.0rc4)
- test_after_commit (= 0.4.0)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git
More information about the Pkg-ruby-extras-commits
mailing list