[DRE-commits] [SCM] ruby-net-sftp.git branch, master, updated. upstream/2.0.5-7-gfd3983a

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit fd3983a4562fc173598e15ad24c9762727eb2e0e
Merge: b264c04aa811dc0faefbcd3c0ec7241390f20bed fc6be517dc4c34afe4c0d58a6e4df10a002b047c
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Dec 18 17:25:44 2012 +0100

    Merge branch 'bug-674324'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 8fe7395,0aa3be4..589306e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,16 +1,25 @@@
- ruby-net-sftp (1:2.0.5-3) UNRELEASED; urgency=low
++ruby-net-sftp (1:2.0.5-4) UNRELEASED; urgency=low
 +
 +  * Team upload.
 +  * debian/control:
 +    - Bump build dependency on gem2deb to >= 0.3.0~.
 +    - Bumped the standards-version to 3.9.3.
-     - Set the priority of the transitional packages to "extra".
-     - Replaced conflicts by breaks.
- 
++   
 + -- Paul van Tilburg <paulvt at debian.org>  Wed, 27 Jun 2012 21:40:46 +0200
 +
+ ruby-net-sftp (1:2.0.5-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Set urgency to medium, as this upload fixes an RC bug.
+   * Add debian/patches/disable_test_triggering_mocha_bug_690562.patch
+     to disable a test which, due to a bug in ruby-mocha, causes other tests
+     to fail, yielding a FTBFS (Closes: #674324).
+   * Ease upgrade from Squeeze libnet-sftp2-ruby* packages
+     + replace Conflicts: by Breaks:
+     + set priority of transitional packages to extra
+ 
+  -- Cédric Boutillier <boutil at debian.org>  Mon, 15 Oct 2012 22:16:06 +0200
+ 
  ruby-net-sftp (1:2.0.5-2) unstable; urgency=low
  
    * Add epoch to version in order to properly override the previous
diff --combined debian/control
index 6d6aeff,03603e9..112f67e
--- a/debian/control
+++ b/debian/control
@@@ -4,8 -4,8 +4,8 @@@ Priority: optiona
  Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
  Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>
  DM-Upload-Allowed: yes
 -Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1), ruby-mocha, ruby-net-ssh
 -Standards-Version: 3.9.2
 +Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-mocha, ruby-net-ssh
 +Standards-Version: 3.9.3
  Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-net-sftp.git
  Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-net-sftp.git;a=summary
  Homepage: http://net-ssh.github.com/sftp/v2/api/
@@@ -53,6 -53,7 +53,7 @@@ Description: Transitional package for r
  
  Package: libnet-sftp2-ruby1.9.1
  Section: oldlibs
+ Priority: extra
  Architecture: all
  Depends: ${misc:Depends}, ruby-net-sftp
  Description: Transitional package for ruby-net-sftp

-- 
ruby-net-sftp.git