[DRE-commits] [SCM] ruby-net-ssh-gateway.git branch, master, updated. upstream/1.0.1-7-g377b6dd

[Lucas Nussbaum]

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

    New upstream release.
    
    * New upstream release.
    * Switch to my @d.o email address.
    * Bump standards-version to 3.9.2. No changes needed.
    * Switch from Conflicts to Breaks as recommended by lintian.

diff --git a/debian/changelog b/debian/changelog
index 0737262..7a3cd1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-net-ssh-gateway (1.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switch to my @d.o email address.
+  * Bump standards-version to 3.9.2. No changes needed.
+  * Switch from Conflicts to Breaks as recommended by lintian.
+
+ -- Lucas Nussbaum <lucas at debian.org>  Sun, 25 Sep 2011 14:55:00 +0200
+
 ruby-net-ssh-gateway (1.0.1-4) unstable; urgency=low
 
   * Add ruby-net-ssh to Build-Depends.
diff --git a/debian/control b/debian/control
index 4415504..2f176bd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: ruby-net-ssh-gateway
 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, ruby-net-ssh
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-net-ssh-gateway.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-net-ssh-gateway.git;a=summary
 Homepage: http://net-ssh.github.com/net-ssh/
@@ -16,7 +16,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter, ruby-net-ssh
 Replaces: libnet-ssh-gateway-ruby (<< 1.0.1-3~), libnet-ssh-gateway-ruby1.8 (<< 1.0.1-3~), libnet-ssh-gateway-ruby1.9.1 (<< 1.0.1-3~)
-Conflicts: libnet-ssh-gateway-ruby (<< 1.0.1-3~), libnet-ssh-gateway-ruby1.8 (<< 1.0.1-3~), libnet-ssh-gateway-ruby1.9.1 (<< 1.0.1-3~)
+Breaks: libnet-ssh-gateway-ruby (<< 1.0.1-3~), libnet-ssh-gateway-ruby1.8 (<< 1.0.1-3~), libnet-ssh-gateway-ruby1.9.1 (<< 1.0.1-3~)
 Provides: libnet-ssh-gateway-ruby, libnet-ssh-gateway-ruby1.8, libnet-ssh-gateway-ruby1.9.1
 Description: Ruby library for tunneling connections to servers with ssh
  Net::SSH::Gateway is a library for programmatically tunneling connections to

-- 
ruby-net-ssh-gateway.git