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

Mirco Bauer meebey at meebey.net
Thu Dec 31 12:03:50 UTC 2009 

The following commit has been merged in the master branch:
commit 1f1c6f39a72f81c603aff01a04e6166f7681049c
Merge: 5ed8e852074f4816a6129853a35a686302b5d884 4fbf0f892bc7bbf744543f8afbcc2829fa8db6c5
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu Dec 31 13:02:17 2009 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-cli-apps/packages/bareftp
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/copyright

diff --combined debian/changelog
index f0ae8aa,5a33e75..de3181a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,14 +1,14 @@@
+ bareftp (0.3.0-1) UNRELEASED; urgency=low
+ 
+   * New upstream release
+   * debian/control:
+     + Bump Standards-Version to 3.8.3
+     + Change Architecture: all to Architecture: any
+   * debian/copyright: Updated
+ 
+  -- Stefan Ebner <sebner at ubuntu.com>  Thu, 31 Dec 2009 12:35:38 +0100
+ 
 -bareftp (0.2.3-1~pre1) unstable; urgency=low
 +bareftp (0.2.3-1) unstable; urgency=low
  
    * Initial release. (Closes: #520876)
  
diff --combined debian/control
index 3aab58a,1e01558..4c484c9
--- a/debian/control
+++ b/debian/control
@@@ -4,21 -4,16 +4,21 @@@ Priority: optiona
  Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
  Uploaders: Mirco Bauer <meebey at debian.org>
  Build-Depends: debhelper (>= 7.0.50),
-  cli-common-dev (>= 0.6.2),
+  cli-common-dev (>= 0.7),
   quilt,
 - mono-devel (>= 2.4.2.3)
 + mono-devel (>= 2.4.2.3),
 + libgtk2.0-cil (>= 2.12),
 + libgnome2.24-cil (>= 2.12),
 + libgnome-vfs2.0-cil (>= 2.12),
 + libgconf2.0-cil (>= 2.12),
 + intltool (>= 0.35)
  Standards-Version: 3.8.3
  Homepage: http://www.bareftp.org/
  Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/bareftp.git
  Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/bareftp.git
  
  Package: bareftp
- Architecture: all
+ Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
  Description: FTP client for GNOME
   bareFTP is a simple ftp client for the GNOME desktop. It supports the FTP,
diff --combined debian/copyright
index 6108b95,50b76c9..c3db798
--- a/debian/copyright
+++ b/debian/copyright
@@@ -21,19 -21,9 +21,19 @@@ Copyright: Copyright (c) 2004 Enterpris
             Copyright (c) Christian Eide <christian at bareftp.org>
  License: LGPL-2.1+
  
 +Files: src/bareFTP.Protocol.Sftp/sftp/jce/*
 +       src/bareFTP.Protocol.Sftp/sftp/ssh/*
 +Copyright: Copyright (c) 2002-2006 ymnk, JCraft,Inc.
 +License: BSD
 +
 +Files: src/bareFTP.Protocol.Sftp/sftp/Streams/PipedInputStream.cs
 +       src/bareFTP.Protocol.Sftp/sftp/Streams/PipedOutputStream.cs
 +Copyright: 1998-2001, 2003, 2005 Free Software Foundation, Inc
 +License: GPL-2+
 +
  Files: debian/*
  Copyright: Copyright (c) 2009 Mirco Bauer <meebey at debian.org>
 -License: GPL
 +License: GPL-2+
  
  License: MIT/X11
   Permission is hereby granted, free of charge, to any person obtaining
@@@ -55,9 -45,9 +55,9 @@@
   OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  
 -License: GPL
 - On Debian GNU/Linux systems, the text of the GNU General Public License
 - can be found in `/usr/share/common-licenses/GPL-2'.
 +License: BSD
 + On Debian GNU/Linux systems, the text of the BSD License
 + can be found in `/usr/share/common-licenses/BSD'.
  
  License: GPL-2+
   On Debian GNU/Linux systems, the text of the GNU General Public License
@@@ -66,4 -56,123 +66,3 @@@
  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'.
--
 -TODO
 -----
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/Random.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/HMACSHA1.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/HMACMD596.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/SHA1.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/DH.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/KeyPairGenRSA.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/KeyPairGenDSA.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/BlowfishCBC.cs: *No copyright* UNKNOWN
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/HMACMD5.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/TripleDESCBC.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/AES128CBC.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/SignatureDSA.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/MD5.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/HMACSHA196.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/jce/SignatureRSA.cs: UNKNOWN
 -  [Copyright: 2002,2003,2004 ymnk, JCraft,Inc. All rights reserved]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/Streams/PipedInputStream.cs: GPL (with incorrect FSF address) 
 -  [Copyright: 1998, 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc / follows / holders of this library give you]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/Streams/OutputStream.cs: *No copyright* UNKNOWN
 -
 -./src/bareFTP.Protocol.Sftp/sftp/Streams/PipedOutputStream.cs: GPL (with incorrect FSF address) 
 -  [Copyright: 1998, 2000, 2001, 2003 Free Software Foundation, Inc / follows / holders of this library give you]
 -
 -./src/bareFTP.Protocol.Sftp/sftp/Streams/InputStream.cs: *No copyright* UNKNOWN
 -
 -./src/bareFTP.Protocol.Sftp/sftp/SftpConnection.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2008-2009 Christian Eide]
 -
 -./src/bareFTP.Common.Utils/PermissionParser.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2008-2009 Christian Eide]
 -
 -./src/bareFTP.Common.Utils/LocalChmod.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2009 Christian Eide]
 -
 -./src/bareFTP.Connection/Connection.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2008 Christian Eide]
 -
 -./src/bareFTP.Connection/ProtocolActionQueue.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2008 Christian Eide]
 -
 -./src/bareFTP.Connection/IProtocolAction.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2008 Christian Eide]
 -
 -./src/bareFTP.Connection/ProtocolActions.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2008 Christian Eide]
 -
 -./src/bareFTP.Preferences/Preferences.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2008-2009 Christian Eide]
 -
 -./src/bareFTP.Preferences/Bookmarks/BookmarkEntry.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2009 Christian Eide]
 -
 -./src/bareFTP.Preferences/Bookmarks/Bookmarks.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2009 Christian Eide]
 -
 -./src/bareFTP.Preferences/Bookmarks/BookmarkItem.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2009 Christian Eide]
 -
 -./src/bareFTP.Preferences/Bookmarks/BookmarkFolder.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2009 Christian Eide]
 -
 -./src/bareFTP.Gui/ActivityProgressBar.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2009 Christian Eide]
 -
 -./src/bareFTP.Gui/BareNodeView.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2008-2009 Christian Eide]
 -
 -./src/bareFTP.Gui/CellRenderer.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2008-2009 Christian Eide]
 -
 -./src/bareFTP.Gui/KeyBinder.cs: MIT/X11 (BSD like) 
 -  [Copyright: HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER / follows: / 2007 Novell, Inc]
 -
 -./src/bareFTP.Gui/IconFinder.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2008-2009 Christian Eide]
 -
 -./src/bareFTP.Gui/FileActionNode.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2008-2009 Christian Eide]
 -
 -./src/bareFTP.Gui/Common.cs: GPL (v2 or later) (with incorrect FSF address) 
 -  [Copyright: 2009 Christian Eide]
 -
 -./ltmain.sh: GPL (v2 or later) 
 -  [Copyright: 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc]
 -
 -./config.h: *No copyright* UNKNOWN
 -

-- 
bareftp

More information about the Pkg-cli-apps-commits mailing list