[DRE-commits] [ruby-fog] 01/01: fog-google is in

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-fog.

commit 58b94c81d5457819e1e3244003218e5ac08ddddc
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jul 16 18:06:18 2015 +0530

    fog-google is in
---
 debian/changelog                              |  6 ++++
 debian/control                                |  2 ++
 debian/patches/remove-google-dependency.patch | 51 ---------------------------
 debian/patches/series                         |  1 -
 4 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 395daa9..d796a5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-fog (1.30.0-2) UNRELEASED; urgency=medium
+
+  * Enable fog-google (fog-google is in archive now)
+
+ -- Pirate Praveen <praveen at debian.org>  Thu, 16 Jul 2015 18:03:51 +0530
+
 ruby-fog (1.30.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 7e1f742..60f08fd 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 7.0.50~),
          ruby-fog-vmfusion,
  	 ruby-fog-terremark,
  	 ruby-fog-ecloud,
+ 	 ruby-fog-google,
  	 ruby-fog-local,
  	 ruby-fog-storm-on-demand,
  	 ruby-fog-atmos,
@@ -46,6 +47,7 @@ Depends: ruby | ruby-interpreter,
  	 ruby-fog-vmfusion,
  	 ruby-fog-terremark,
  	 ruby-fog-ecloud,
+ 	 ruby-fog-google,
  	 ruby-fog-local,
  	 ruby-fog-storm-on-demand,
  	 ruby-fog-atmos,
diff --git a/debian/patches/remove-google-dependency.patch b/debian/patches/remove-google-dependency.patch
deleted file mode 100644
index e25b04f..0000000
--- a/debian/patches/remove-google-dependency.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: ruby-fog/fog.gemspec
-===================================================================
---- ruby-fog.orig/fog.gemspec
-+++ ruby-fog/fog.gemspec
-@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
-   s.add_dependency("fog-aws", "~> 0.0")
-   s.add_dependency("fog-brightbox", "~> 0.4")
-   s.add_dependency("fog-ecloud")
--  s.add_dependency("fog-google", ">= 0.0.2")
-+#  s.add_dependency("fog-google", ">= 0.0.2")
-   s.add_dependency("fog-local")
-   s.add_dependency("fog-powerdns", ">= 0.1.1")
-   s.add_dependency("fog-profitbricks")
-Index: ruby-fog/lib/fog.rb
-===================================================================
---- ruby-fog.orig/lib/fog.rb
-+++ ruby-fog/lib/fog.rb
-@@ -34,7 +34,7 @@ require 'fog/dynect'
- require 'fog/ecloud'
- require 'fog/glesys'
- require 'fog/go_grid'
--require 'fog/google'
-+#require 'fog/google'
- require 'fog/hp'
- require 'fog/ibm'
- require 'fog/internet_archive'
-Index: ruby-fog/metadata.yml
-===================================================================
---- ruby-fog.orig/metadata.yml
-+++ ruby-fog/metadata.yml
-@@ -149,20 +149,6 @@ dependencies:
-       - !ruby/object:Gem::Version
-         version: '0'
- - !ruby/object:Gem::Dependency
--  name: fog-google
--  requirement: !ruby/object:Gem::Requirement
--    requirements:
--    - - ">="
--      - !ruby/object:Gem::Version
--        version: 0.0.2
--  type: :runtime
--  prerelease: false
--  version_requirements: !ruby/object:Gem::Requirement
--    requirements:
--    - - ">="
--      - !ruby/object:Gem::Version
--        version: 0.0.2
--- !ruby/object:Gem::Dependency
-   name: fog-local
-   requirement: !ruby/object:Gem::Requirement
-     requirements:
diff --git a/debian/patches/series b/debian/patches/series
index 7300069..4268929 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 #add_missing_requires.patch
-remove-google-dependency.patch
 remove-powerdns-dependency.patch
 fog_import.patch
 remove_rubygems_examples.patch

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