[DRE-commits] [SCM] ruby-net-ssh.git branch, master, updated. upstream/2.1.4-9-g0360f59

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 27408bd86c9821e112a3e5c5ac551ea5723b95cc
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sun Sep 25 14:20:55 2011 +0200

    New upstream release.
    
    * New upstream release.
    * Switch to my @debian.org email-address.
    * Switch from Conflicts to Breaks.

diff --git a/debian/changelog b/debian/changelog
index 489f7fc..43ff07b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-net-ssh (1:2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switch to my @debian.org email-address.
+  * Switch from Conflicts to Breaks.
+
+ -- Lucas Nussbaum <lucas at debian.org>  Sun, 25 Sep 2011 14:16:48 +0200
+
 ruby-net-ssh (1:2.1.4-2) unstable; urgency=low
 
   * Add an epoch. This is needed so that this package's  libnet-ssh-ruby1.8
diff --git a/debian/control b/debian/control
index b93a40d..a3997ca 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ruby-net-ssh
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>
+Uploaders: Lucas Nussbaum <lucas at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1), ruby-mocha
 Standards-Version: 3.9.2
@@ -16,7 +16,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 Replaces: libnet-ssh-ruby1.8 (<< 2.1.4-1~), libnet-ssh2-ruby (<< 2.1.4-1~), libnet-ssh2-ruby1.8 (<< 2.1.4-1~), libnet-ssh2-ruby1.9.1 (<< 2.1.4-1~)
-Conflicts: libnet-ssh-ruby1.8 (<< 2.1.4-1~), libnet-ssh2-ruby (<< 2.1.4-1~), libnet-ssh2-ruby1.8 (<< 2.1.4-1~), libnet-ssh2-ruby1.9.1 (<< 2.1.4-1~)
+Breaks: libnet-ssh-ruby1.8 (<< 2.1.4-1~), libnet-ssh2-ruby (<< 2.1.4-1~), libnet-ssh2-ruby1.8 (<< 2.1.4-1~), libnet-ssh2-ruby1.9.1 (<< 2.1.4-1~)
 Provides: libnet-ssh-ruby1.8, libnet-ssh2-ruby, libnet-ssh2-ruby1.8, libnet-ssh2-ruby1.9.1
 Description: Ruby implementation of the SSH protocol
  Net::SSH is a pure-Ruby implementation of the SSH protocol. It allows

-- 
ruby-net-ssh.git