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

Lucas Nussbaum lucas at lucas-nussbaum.net
Sat Apr 16 09:43:24 UTC 2011


The following commit has been merged in the master branch:
commit ba31d38873c82cf69fdc05a542dab5b9c7da822d
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sat Apr 16 11:31:56 2011 +0200

    continue packaging

diff --git a/debian/changelog b/debian/changelog
index 38bb3d5..678891c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,20 @@
-ruby-net-sftp (2.0.5-1) UNRELEASED; urgency=low
+ruby-net-sftp (2.0.5-1) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * Switch to gem2deb-based packaging. Rename source and binary package.
 
- -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Sat, 16 Apr 2011 09:56:48 +0200
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Sat, 16 Apr 2011 11:18:42 +0200
+
+libnet-sftp2-ruby (2.0.3-1) unstable; urgency=low
+
+  * New upstream version
+  * Drop 1.9 package, add 1.9.1 package for Ruby 1.9.1 transition
+  * Add myself to uploaders
+  * Standards-version 3.8.3→3.8.4 (no changes)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 23 Mar 2010 20:53:27 -0600
+
+libnet-sftp2-ruby (2.0.2-1) unstable; urgency=low
+
+  * Initial release (Closes: #543319)
+
+ -- Christopher Lunsford <binarymutant at gmail.com>  Sun, 23 Aug 2009 17:40:00 -0400
diff --git a/debian/control b/debian/control
index fe8463d..e1a0d31 100644
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,54 @@ Priority: optional
 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)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1), ruby-mocha, ruby-net-ssh
 Standards-Version: 3.9.1
-#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.rubyforge.org/sftp
+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/
 XS-Ruby-Versions: all
 
 Package: ruby-net-sftp
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
-# net-ssh (>= 2.0.9, runtime)
-Description: A pure Ruby implementation of the SFTP client protocol
- A pure Ruby implementation of the SFTP client protocol
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter, ruby-net-ssh
+Replaces: libnet-sftp-ruby1.8 (<< 2.0.5-1~), libnet-sftp2-ruby (<< 2.0.5-1~), libnet-sftp2-ruby1.8 (<< 2.0.5-1~), libnet-sftp2-ruby1.9.1 (<< 2.0.5-1~)
+Conflicts: libnet-sftp-ruby1.8 (<< 2.0.5-1~), libnet-sftp2-ruby (<< 2.0.5-1~), libnet-sftp2-ruby1.8 (<< 2.0.5-1~), libnet-sftp2-ruby1.9.1 (<< 2.0.5-1~)
+Provides: libnet-sftp-ruby1.8, libnet-sftp2-ruby, libnet-sftp2-ruby1.8, libnet-sftp2-ruby1.9.1
+Description: Ruby implementation of the SFTP protocol
+ Net::SFTP is a pure-Ruby implementation of the SFTP protocol (specifically,
+ versions 1 through 6 of the SFTP protocol). Note that this is the "Secure File
+ Transfer Protocol", typically run over an SSH connection, and has nothing to
+ do with the FTP protocol.
+
+Package: libnet-sftp-ruby1.8
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-net-sftp
+Description: Transitional package for ruby-net-sftp
+ This is a transitional package to ease upgrades to the ruby-net-sftp
+ package. It can safely be removed.
+
+Package: libnet-sftp2-ruby
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-net-sftp
+Description: Transitional package for ruby-net-sftp
+ This is a transitional package to ease upgrades to the ruby-net-sftp
+ package. It can safely be removed.
+
+Package: libnet-sftp2-ruby1.8
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-net-sftp
+Description: Transitional package for ruby-net-sftp
+ This is a transitional package to ease upgrades to the ruby-net-sftp
+ package. It can safely be removed.
+
+Package: libnet-sftp2-ruby1.9.1
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-net-sftp
+Description: Transitional package for ruby-net-sftp
+ This is a transitional package to ease upgrades to the ruby-net-sftp
+ package. It can safely be removed.
diff --git a/debian/copyright b/debian/copyright
index ebb3f1c..112e609 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,36 @@
-FIXME. fill-in with DEP5 copyright file. http://dep.debian.net/deps/dep5/
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
-Upstream-Name: net-sftp
-Source: FIXME (URL where source can be downloaded)
-
-Files: *
-Copyright: Copyright 1998 John Doe <jdoe at example.com>
-License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
-
-Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
+This package was debianized by Christopher Lunsford <binarymutant at gmail.com> on
+Sun, 23 Aug 2009 06:02:42 -0500.
+
+It was downloaded from <http://net-ssh.rubyforge.org/>
+
+Upstream authors:
+
+    Jamis Buck <jamis at 37signals.com>
+
+Copyright:
+
+    Copyright © 2008 by Jamis Buck
+
 License:
- [LICENSE TEXT]
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+The Debian packaging is © 2009, Christopher Lunsford <binarymutant at gmail.com> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/patches/disable-gem-in-tests.patch b/debian/patches/disable-gem-in-tests.patch
new file mode 100644
index 0000000..bfef4bd
--- /dev/null
+++ b/debian/patches/disable-gem-in-tests.patch
@@ -0,0 +1,30 @@
+--- a/test/common.rb
++++ b/test/common.rb
+@@ -2,18 +2,18 @@ require 'test/unit'
+ require 'mocha'
+ require 'stringio'
+ 
+-begin
++# begin
+   require 'net/ssh'
+   require 'net/ssh/version'
+   raise LoadError, "wrong version" unless Net::SSH::Version::STRING >= '1.99.0'
+-rescue LoadError
+-  begin
+-    gem 'net-ssh', ">= 2.0.0"
+-    require 'net/ssh'
+-  rescue LoadError => e
+-    abort "could not load net/ssh v2 (#{e.inspect})"
+-  end
+-end
++#rescue LoadError
++#  begin
++#    gem 'net-ssh', ">= 2.0.0"
++#    require 'net/ssh'
++#  rescue LoadError => e
++#    abort "could not load net/ssh v2 (#{e.inspect})"
++#  end
++#end
+ 
+ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+ require 'net/sftp'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b50efae
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable-gem-in-tests.patch
diff --git a/debian/ruby-net-sftp.docs b/debian/ruby-net-sftp.docs
index 0d5eab8..e475c53 100644
--- a/debian/ruby-net-sftp.docs
+++ b/debian/ruby-net-sftp.docs
@@ -1,2 +1 @@
-# FIXME: READMEs found
-# README.rdoc
+README.rdoc
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
deleted file mode 100644
index 071a51b..0000000
--- a/debian/ruby-test-files.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
---- 
-- test/test_all.rb
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
new file mode 100644
index 0000000..3485877
--- /dev/null
+++ b/debian/ruby-tests.rb
@@ -0,0 +1,2 @@
+$: << 'test' << 'lib' << '.'
+require './test/test_all.rb'

-- 
ruby-net-sftp.git



More information about the Pkg-ruby-extras-commits mailing list