[Pkg-cli-apps-commits] [SCM] bareftp branch, master, updated. debian/0.2.3-1-23-g1e32558

Wed Jan 6 10:55:28 UTC 2010

The following commit has been merged in the master branch:
commit 1e32558461fbe9d05aa864d698d81098f878047c
Author: Stefan Ebner <sebner at ubuntu.com>
Date:   Wed Jan 6 11:55:07 2010 +0100

    debian/copyright now fully DEP5 compatible

diff --git a/debian/copyright b/debian/copyright
index 3d4f3ba..b2d710a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,12 +5,10 @@ Source: http://bareftp.org/download.php
 Files: *
 Copyright: Copyright (c) 2007-2010 Christian Eide <christian at bareftp.org>
 License: GPL-2+
- On Debian GNU/Linux systems, the text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL-2'.
 
 Files: src/bareFTP.Gui/KeyBinder.cs
        lib/bareFTP.SftpPty/PseudoTerminal.cs
-Copyright: Copyright (C) 2007 Novell, Inc.
+Copyright: Copyright (c) 2007 Novell, Inc.
 	   Copyright (c) Christian Eide <christian at bareftp.org>
 License: MIT/X11
 
@@ -18,44 +16,32 @@ Files: src/bareFTP.Protocol.Ftp/ftp/ListParser*.cs
 Copyright: Copyright (c) 2004 Enterprise Distributed Technologies Ltd,
 	   Copyright (c) 2008-2009 Christian Eide <christian at bareftp.org>
 License: GPL-2+
- On Debian GNU/Linux systems, the text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL-2'.
 
 Files: src/bareFTP.Protocol/HostNameResolver.cs
 Copyright: Copyright (c) 2004 Enterprise Distributed Technologies Ltd,
            Copyright (c) Christian Eide <christian at bareftp.org>
 License: LGPL-2.1+
- On Debian GNU/Linux systems, the text of the GNU Lesser General Public
- License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 Files: src/bareFTP.Protocol.Sftp/sftp/Buffer.cs
        src/bareFTP.Protocol.Sftp/sftp/SftpATTRS.cs
        src/bareFTP.Protocol.Sftp/sftp/Util.cs
 Copyright: Copyright (c) 2002,2003,2004 ymnk, JCraft,Inc.
 License: BSD
- On Debian GNU/Linux systems, the text of the BSD License
- can be found in `/usr/share/common-licenses/BSD'.
 
 Files: src/bareFTP.Protocol.Sftp/sftp/SftpClient.cs
 Copyright: Copyright (c) 2002,2003,2004 ymnk, JCraft,Inc.
 	   Copyright (c) 2008-2009 Christian Eide <christian at bareftp.org>
 License: GPL-2+
- On Debian GNU/Linux systems, the text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL-2'.
 
 Files: lib/sftppty/pty.*
 Copyright: Copyright (c) 2001,2002 Red Hat, Inc.
 	   Copyright (c) Christian Eide <christian at bareftp.org>
 	   Copyright (c) 1998-2007 Brian Masney <masneyb at gftp.org>
 License: GPL-2+
- On Debian GNU/Linux systems, the text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL-2'.
 
 Files: debian/*
 Copyright: Copyright (c) 2009 Mirco Bauer <meebey at debian.org>
 License: GPL-2+
- On Debian GNU/Linux systems, the text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL-2'.
 
 License: MIT/X11
  Permission is hereby granted, free of charge, to any person obtaining
@@ -92,6 +78,9 @@ License: GPL-2
  with this program; if not, write to the Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+ On Debian GNU/Linux systems, the text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL-2'.
+
 License: LGPL-2.1
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -107,31 +96,36 @@ License: LGPL-2.1
  License along with this library; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+ On Debian GNU/Linux systems, the text of the GNU Lesser General Public
+ License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
 License: BSD
-Copyright (c) The Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+ Copyright (c) The Regents of the University of California.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
 
+ On Debian GNU/Linux systems, the text of the BSD License
+ can be found in `/usr/share/common-licenses/BSD'.

-- 
bareftp

