[DRE-commits] [SCM] ruby-net-scp.git branch, master, updated. upstream/1.0.4-4-g6041b33

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 6041b333645e137ac66e36ff737b0f8ee0e5aed3
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed Jun 27 21:35:54 2012 +0200

    Bumped the gem2deb build-dep and standards-version; set priority transitional packages to 'extra'

diff --git a/debian/changelog b/debian/changelog
index 4fd185f..cca7c05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 ruby-net-scp (1.0.4-2) unstable; urgency=low
 
   * Team upload.
-  * Bump build dependency on gem2deb to >= 0.3.0~.
+  * 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:29:36 +0200
 
diff --git a/debian/control b/debian/control
index 0a70061..0c3207d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
 Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-mocha, ruby-net-ssh
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-net-scp.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-net-scp.git;a=summary
 Homepage: http://net-ssh.github.com/scp/v1/api/
@@ -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-scp-ruby (<< 1.0.4-1~), libnet-scp-ruby1.8 (<< 1.0.4-1~), libnet-scp-ruby1.9.1 (<< 1.0.4-1~)
-Conflicts: libnet-scp-ruby (<< 1.0.4-1~), libnet-scp-ruby1.8 (<< 1.0.4-1~), libnet-scp-ruby1.9.1 (<< 1.0.4-1~)
+Breaks: libnet-scp-ruby (<< 1.0.4-1~), libnet-scp-ruby1.8 (<< 1.0.4-1~), libnet-scp-ruby1.9.1 (<< 1.0.4-1~)
 Provides: libnet-scp-ruby, libnet-scp-ruby1.8, libnet-scp-ruby1.9.1
 Description: pure ruby implementation of the SCP protocol
  Net::SCP is a pure-Ruby implementation of the SCP protocol.
@@ -25,6 +25,7 @@ Description: pure ruby implementation of the SCP protocol
 
 Package: libnet-scp-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-net-scp
 Description: Transitional package for ruby-net-scp
@@ -33,6 +34,7 @@ Description: Transitional package for ruby-net-scp
 
 Package: libnet-scp-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-net-scp
 Description: Transitional package for ruby-net-scp
@@ -41,6 +43,7 @@ Description: Transitional package for ruby-net-scp
 
 Package: libnet-scp-ruby1.9.1
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-net-scp
 Description: Transitional package for ruby-net-scp

-- 
ruby-net-scp.git