[DRE-commits] [SCM] Packaging for ruby-amazonec2 branch, master, updated. debian/0.9.17-1-7-gec34964

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit ec3496401704b147ac06dc94f66f080f08ee5ea9
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sat Apr 23 13:50:29 2011 +0200

    Conflicts

diff --git a/debian/control b/debian/control
index 826c69a..8938b2e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ XS-Ruby-Versions: all
 Package: ruby-amazon-ec2
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Replaces: libamazonec2-ruby1.8 (<< 0.9.17-2~), libamazonec2-ruby (<< 0.9.17-2~), libamazonec2-ruby-doc (<< 0.9.17-2~)
-Conflicts: libamazonec2-ruby1.8 (<< 0.9.17-2~), libamazonec2-ruby (<< 0.9.17-2~), libamazonec2-ruby-doc (<< 0.9.17-2~)
+Replaces: libamazonec2-ruby1.8 (<< 0.9.17-2), libamazonec2-ruby (<< 0.9.17-2), libamazonec2-ruby-doc (<< 0.9.17-2)
+Conflicts: libamazonec2-ruby1.8 (<< 0.9.17-2), libamazonec2-ruby (<< 0.9.17-2), libamazonec2-ruby-doc (<< 0.9.17-2)
 Provides: libamazonec2-ruby1.8, libamazonec2-ruby, libamazonec2-ruby-doc
 Depends: ${misc:Depends}, ruby1.8 | ruby-interpreter, libxml-simple-ruby
 Description: Ruby library for accessing Amazon EC2
@@ -26,7 +26,7 @@ Description: Ruby library for accessing Amazon EC2
     multiple Amazon EC2 instances
   * Relational Database Service (RDS): set up, operate, and scale MySQL instance
   * CloudWatch: provides monitoring for AWS like Amazon EC2.
-  
+
 Package: libamazonec2-ruby1.8
 Section: oldlibs
 Architecture: all
@@ -50,3 +50,4 @@ Depends: ${misc:Depends}, ruby-amazon-ec2
 Description: Transitional package for ruby-amazon-ec2
  This is a transitional package to ease upgrades to the ruby-amazon-ec2
  package. It can safely be removed.
+  

-- 
Packaging for ruby-amazonec2