[DRE-commits] [ruby-fog] 04/08: Don't apply add_missing_requires.patch; add remove_rubygems_examples.patch
Cédric Boutillier
boutil at moszumanska.debian.org
Thu Jan 16 16:01:48 UTC 2014
This is an automated email from the git hooks/post-receive script.
boutil pushed a commit to branch master
in repository ruby-fog.
commit df7f9d6e2128bf04b1dc0104e13f249af5cc1ed7
Author: Cédric Boutillier <boutil at debian.org>
Date: Thu Jan 16 16:08:58 2014 +0100
Don't apply add_missing_requires.patch; add remove_rubygems_examples.patch
---
debian/changelog | 2 +
debian/patches/remove_rubygems_examples.patch | 308 ++++++++++++++++++++++++++
debian/patches/series | 3 +-
3 files changed, 312 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 3a48047..ad1c3a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ ruby-fog (1.19.0-1) UNRELEASED; urgency=low
[ Cédric Boutillier ]
* Refresh fog_import.patch
+ * Do not apply add_missing_requires.patch (not required anymore)
+ * Add remove_rubygems_examples.patch (to remove rubygems from examples)
-- Laurent Bigonville <bigon at debian.org> Sun, 07 Jul 2013 00:36:10 +0200
diff --git a/debian/patches/remove_rubygems_examples.patch b/debian/patches/remove_rubygems_examples.patch
new file mode 100644
index 0000000..e207f6d
--- /dev/null
+++ b/debian/patches/remove_rubygems_examples.patch
@@ -0,0 +1,308 @@
+--- a/lib/fog/rackspace/examples/block_storage/create_snapshot.rb
++++ b/lib/fog/rackspace/examples/block_storage/create_snapshot.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates creating a snapshot from a Cloud Block Storage volume with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/block_storage/create_volume.rb
++++ b/lib/fog/rackspace/examples/block_storage/create_volume.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates creating Cloud Block Storage volume with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/block_storage/delete_volume.rb
++++ b/lib/fog/rackspace/examples/block_storage/delete_volume.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates deleting Cloud Block Storage volume with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/compute_v2/bootstrap_server.rb
++++ b/lib/fog/rackspace/examples/compute_v2/bootstrap_server.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates creating a server with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+ require 'base64' #required to encode files for personality functionality
+ require 'sshkey' #required to generate ssh keys. 'gem install sshkey'
+--- a/lib/fog/rackspace/examples/compute_v2/create_image.rb
++++ b/lib/fog/rackspace/examples/compute_v2/create_image.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates creating a server image with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/compute_v2/create_network.rb
++++ b/lib/fog/rackspace/examples/compute_v2/create_network.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates creating a private network and attaching it to a new server with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ # UUID for INTERNET
+--- a/lib/fog/rackspace/examples/compute_v2/create_server.rb
++++ b/lib/fog/rackspace/examples/compute_v2/create_server.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates creating a server with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+ require "base64" #required to encode files for personality functionality
+
+--- a/lib/fog/rackspace/examples/compute_v2/delete_image.rb
++++ b/lib/fog/rackspace/examples/compute_v2/delete_image.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates deleting a server image with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/compute_v2/delete_network.rb
++++ b/lib/fog/rackspace/examples/compute_v2/delete_network.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates deletes a private network and attaching it to a new server with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def wait_for_server_deletion(server)
+@@ -75,4 +74,4 @@
+ network = service.networks.find {|n| n.label == 'my_private_net'}
+ delete_network(network)
+
+-puts "The network '#{network.label}' has been successfully deleted"
+\ No newline at end of file
++puts "The network '#{network.label}' has been successfully deleted"
+--- a/lib/fog/rackspace/examples/compute_v2/delete_server.rb
++++ b/lib/fog/rackspace/examples/compute_v2/delete_server.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates how to delete servers with Fog and the Rackspace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/compute_v2/detach_volume.rb
++++ b/lib/fog/rackspace/examples/compute_v2/detach_volume.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates working with server and volumes on the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/compute_v2/resize_server.rb
++++ b/lib/fog/rackspace/examples/compute_v2/resize_server.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates how to resize servers with Fog and the Rackspace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/compute_v2/server_attachments.rb
++++ b/lib/fog/rackspace/examples/compute_v2/server_attachments.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates working with server and volumes on the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/compute_v2/server_metadata.rb
++++ b/lib/fog/rackspace/examples/compute_v2/server_metadata.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates working with server metadata on the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require './lib/fog'
+
+ # Use username defined in ~/.fog file, if absent prompt for username.
+--- a/lib/fog/rackspace/examples/queues/claim_messages.rb
++++ b/lib/fog/rackspace/examples/queues/claim_messages.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates claiming messages with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/queues/create_queue.rb
++++ b/lib/fog/rackspace/examples/queues/create_queue.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates creating a queue with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/queues/delete_message.rb
++++ b/lib/fog/rackspace/examples/queues/delete_message.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates deleting a message with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/queues/delete_queue.rb
++++ b/lib/fog/rackspace/examples/queues/delete_queue.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates deleting a queue with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/queues/list_messages.rb
++++ b/lib/fog/rackspace/examples/queues/list_messages.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates listing messages in a queue with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+@@ -61,4 +60,4 @@
+
+ queue.messages.each do |message|
+ puts message.inspect
+-end
+\ No newline at end of file
++end
+--- a/lib/fog/rackspace/examples/queues/post_message.rb
++++ b/lib/fog/rackspace/examples/queues/post_message.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates posting a message to a queue with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/storage/create_cdn_directory.rb
++++ b/lib/fog/rackspace/examples/storage/create_cdn_directory.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates creating a container with CDN on the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/storage/create_private_directory.rb
++++ b/lib/fog/rackspace/examples/storage/create_private_directory.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates creating a container with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+@@ -43,4 +42,4 @@
+ puts "\n Directory #{directory.key} was created."
+ puts "To delete the container please execute the delete_directory.rb script\n\n"
+
+-
+\ No newline at end of file
++
+--- a/lib/fog/rackspace/examples/storage/delete_directory.rb
++++ b/lib/fog/rackspace/examples/storage/delete_directory.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates deleting a container with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/storage/delete_file.rb
++++ b/lib/fog/rackspace/examples/storage/delete_file.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates deleting a file from a container with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/storage/download_file.rb
++++ b/lib/fog/rackspace/examples/storage/download_file.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates downloading a file with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/storage/storage_metadata.rb
++++ b/lib/fog/rackspace/examples/storage/storage_metadata.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates creating a file on the CDN network with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ # Use username defined in ~/.fog file, if absent prompt for username.
+--- a/lib/fog/rackspace/examples/storage/upload_file.rb
++++ b/lib/fog/rackspace/examples/storage/upload_file.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates creating a file on the CDN network with the Rackpace Open Cloud
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ def get_user_input(prompt)
+--- a/lib/fog/rackspace/examples/storage/upload_large_files.rb
++++ b/lib/fog/rackspace/examples/storage/upload_large_files.rb
+@@ -2,7 +2,6 @@
+
+ # This example demonstrates uploading large files in segments
+
+-require 'rubygems' #required for Ruby 1.8.x
+ require 'fog'
+
+ # Size of segment. The Rackspace cloud currently requires files larger than 5GB to be segmented so we will choose 5GB -1 for a size
+@@ -100,4 +99,4 @@
+ end
+ end
+
+-NOTE
+\ No newline at end of file
++NOTE
diff --git a/debian/patches/series b/debian/patches/series
index 779be31..b004ffb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-add_missing_requires.patch
+#add_missing_requires.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
More information about the Pkg-ruby-extras-commits
mailing list