[debian-edu-commits] debian-edu/italc.git (#125) - master (branch) updated: debian/1_2.0.0-4-7-g0c91e99

Mike Gabriel sunweaver at alioth.debian.org
Mon Aug 12 12:47:16 UTC 2013


The branch, master has been updated
       via  0c91e99f723c593edcc94722ab3dc55e0f232a83 (commit)
      from  5a2d29c9b07f22a0a3826e5f5cfa31c9eaa07304 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0c91e99f723c593edcc94722ab3dc55e0f232a83
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 12 14:19:59 2013 +0200

    /debian/copyright: Update and review.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    2 +
 debian/copyright |  395 +++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 291 insertions(+), 106 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f2ebd2c..b6fc1b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ italc (1:2.0.1-1) UNRELEASED; urgency=low
   * New upstream version.
   * /debian/italc-client.lintian-overrides:
     + Silence lintian about a false-positive spelling error report.
+  * /debian/copyright:
+    + Update and review.
 
  -- Mike Gabriel <sunweaver at debian.org>  Mon, 12 Aug 2013 12:10:34 +0200
 
diff --git a/debian/copyright b/debian/copyright
index d4c2853..9f0ffe8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -139,21 +139,127 @@ Files:
  lib/src/ItalcVncConnection.cpp
  lib/src/AboutDialog.cpp
  lib/src/VncView.cpp
-Copyright: 2010, Tobias Doerffel <tobydox at users.sf.net>
+Copyright:
+ 2004-2013, Tobias Doerffel <tobydox at users.sf.net>
 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.
+
+Files:
+ ica/win32/ultravnc-italc.cpp
+Copyright:
+ 1996,1998, Marcus Meissner
+ 1996, Jukka Iivonen
+ 1997,2000, Uwe Bonnes
+ 2000, Jon Griffiths
+License: LGPL-2.1+
+
+Files:
+ ica/x11/common/md5.c
+Copyright:
+ 1995,1996,1997,1999,2000,2001,2005, Free Software Foundation, Inc.
+License: LGPL-2.1+
+
+Files:
+ ica/x11/common/md5.h
+Copyright:
+ 1995-1997,1999,2000,2001,2004,2005, Free Software Foundation, Inc.
+License: LGPL-2.1+
+
+Files:
+ ica/x11/common/sha1.c
+ ica/x11/common/sha1.h
+Copyright:
+ 2001, The Internet Society
+License:
+ This document and translations of it may be copied and furnished to
+ others, and derivative works that comment on or otherwise explain it
+ or assist in its implementation may be prepared, copied, published
+ and distributed, in whole or in part, without restriction of any
+ kind, provided that the above copyright notice and this paragraph are
+ included on all such copies and derivative works.  However, this
+ document itself may not be modified in any way, such as by removing
+ the copyright notice or references to the Internet Society or other
+ Internet organizations, except as needed for the purpose of
+ developing Internet standards in which case the procedures for
+ copyrights defined in the Internet Standards process must be
+ followed, or as required to translate it into languages other than
+ English.
  .
- 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.
+ The limited permissions granted above are perpetual and will not be
+ revoked by the Internet Society or its successors or assigns.
  .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ This document and the information contained herein is provided on an
+ "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+ TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+ BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+ HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Files:
+ ica/x11/common/turbojpeg.c
+ ica/x11/common/turbojpeg.h
+Copyright:
+ 2009-2012,  D. R. Commander
+License: BSD-3-clause
+
+Files:
+ ica/x11/libvncclient/corre.c
+ ica/x11/libvncclient/hextile.c
+ ica/x11/libvncclient/rre.c
+ ica/x11/libvncclient/vncviewer.c
+Copyright:
+ 1999, AT&T Laboratories Cambridge
+License: GPL-2+
+
+Files:
+ ica/x11/libvncclient/listen.c
+ ica/x11/libvncclient/sockets.c
+Copyright:
+ 2011-2012, Christian Beier <dontmind at freeshell.org>
+ 1999, AT&T Laboratories Cambridge
+License: GPL-2+
+
+Files:
+ ica/x11/libvncclient/cursor.c
+ ica/x11/libvncclient/tight.c
+Copyright:
+ 2000, 2001,2002, Constantin Kaplinsky
+License: GPL-2+
+
+Files:
+ ica/x11/libvncclient/rfbproto.c
+Copyright:
+ 2000-2002, Constantin Kaplinsky
+ 2000, Tridia Corporation
+ 1999, AT&T Laboratories Cambridge
+License: GPL-2+
+
+Files:
+ ica/x11/libvncclient/ultra.c
+ ica/x11/libvncclient/zlib.c
+Copyright:
+ 2000, Tridia Corporation
+ 1999, AT&T Laboratories Cambridge
+License: GPL-2+
+
+Files:
+ ica/x11/libvncclient/tls.h
+ ica/x11/libvncclient/tls_gnutls.c
+Copyright:
+ 2009, Vic Lee
+License: GPL-2+
+
+Files:
+ ica/x11/libvncclient/tls_openssl.c
+Copyright:
+ 2012, Philip Van Hoof <philip at codeminded.be>
+ 2009, Vic Lee
+License: GPL-2+
+
+Files:
+ ica/x11/libvncclient/tls_none.c
+Copyright:
+ 2012, Christian Beier
+License: GPL-2+
 
 Files:
  ica/src/InputLockSlave.h
@@ -186,36 +292,49 @@ Files:
  lib/src/Ipc/Core.cpp
  lib/src/Ipc/Master.cpp
  lib/src/Ipc/SlaveLauncher.cpp
-Copyright: 2010, Tobias Doerffel <tobydox at users.sf.net>
-           2010, Univention GmbH
+Copyright:
+ 2004-2013, Tobias Doerffel <tobydox at users.sf.net>
+ 2010, Univention GmbH
+License: GPL-2+
+
+Files.
+ ica/x11/libvncserver/rfbserver.c
+Copyright:
+ 2011-2012 D. R. Commander
+ 2005, Rohit Kumar <rokumar at novell.com>
+ 2002, RealVNC Ltd.
+ 2001, Dan McGuirk <mcguirk at incompleteness.net>
+ 1999, AT&T Laboratories Cambridge
+License: GPL-2+
+
+Files:
+ ica/x11/libvncserver/sockets.c
+Copyright:
+ 2011-2012, Christian Beier <dontmind at freeshell.org>
+ 2005, Rohit Kumar, Johannes E. Schindelin
+ 2001, Dan McGuirk <mcguirk at incompleteness.net>
+ 1999, AT&T Laboratories Cambridge
+License: GPL-2+
+
+Files:
+ lib/include/rfb/rfbproto.h
+Copyright:
+ 2009-2010, D. R. Commander
+ 2005, Rohit Kumar, Johannes E. Schindelin
+ 2004-2008, Sun Microsystems, Inc.
+ 2000-2002, Constantin Kaplinsky
+ 2000, Tridia Corporation
+ 1999, AT&T Laboratories Cambridge
 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 program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 Files:
  ica/x11/rfb/rfb.h
  ica/x11/libvncserver/scale.c
  ica/x11/libvncserver/auth.c
- ica/x11/libvncserver/sockets.c
- ica/x11/libvncserver/rfbserver.c
  common/include/rfb/rfb.h
- common/include/rfb/rfbproto.h
 Copyright:
  2005, Rohit Kumar <rokumar at novell.com>
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  ica/x11/rfb/rfb.h
@@ -231,15 +350,11 @@ Files:
  ica/x11/libvncserver/tabletranstemplate.c
  ica/x11/libvncserver/hextile.c
  ica/x11/libvncserver/translate.c
- ica/x11/libvncserver/sockets.c
- ica/x11/libvncserver/rfbserver.c
  ica/x11/libvncserver/cutpaste.c
  common/include/rfb/rfb.h
 Copyright:
  2001, Dan McGuirk <mcguirk at incompleteness.net>
 License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
 
 Files:
  ica/x11/rfb/rfb.h
@@ -254,13 +369,25 @@ Files:
  ica/x11/libvncserver/zrleencodetemplate.c
  ica/x11/libvncserver/zrle.c
  ica/x11/libvncserver/httpd.c
- ica/x11/libvncserver/rfbserver.c
  common/include/rfb/rfb.h
 Copyright:
  2002, RealVNC Ltd.
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
+
+Files:
+ ica/x11/libvncserver/tight.c
+Copyright:
+ 2010-2012, D. R. Commander
+ 2005-2008, Sun Microsystems, Inc.
+ 2004, Landmark Graphics Corporation
+ 2000, 2001, Const Kaplinsky
+ 1999, AT&T Laboratories Cambridge
+
+Files:
+ ica/x11/libvncserver/websockets.c
+Copyright:
+ 2010, Joel Martin
+License: GPL-2+
 
 Files:
  ica/x11/rfb/rfb.h
@@ -274,7 +401,6 @@ Files:
  ica/x11/libvncserver/tableinitcmtemplate.c
  ica/x11/libvncserver/cursor.c
  ica/x11/libvncserver/stats.c
- ica/x11/libvncserver/tight.c
  ica/x11/libvncserver/tableinit24.c
  ica/x11/libvncserver/auth.c
  ica/x11/libvncserver/tabletranstemplate.c
@@ -283,38 +409,45 @@ Files:
  ica/x11/libvncserver/translate.c
  ica/x11/libvncserver/httpd.c
  ica/x11/libvncserver/vncauth.c
- ica/x11/libvncserver/sockets.c
- ica/x11/libvncserver/rfbserver.c
  ica/x11/libvncserver/cutpaste.c
  common/include/rfb/rfb.h
  common/include/rfb/rfbproto.h
  tightvnc4win_italc.diff
 Copyright:
  1999, AT&T Laboratories Cambridge
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  ica/x11/libvncserver/rfbregion.c
 Copyright:
  2001, James "Wez" Weatherall
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  ica/x11/libvncserver/rfbregion.c
  ica/x11/libvncserver/scale.c
  ica/x11/libvncserver/auth.c
- ica/x11/libvncserver/sockets.c
- ica/x11/libvncserver/rfbserver.c
  common/include/rfb/rfbproto.h
+ ica/x11/libvncclient/zrle.c
 Copyright:
- 2001, Johannes E. Schindelin
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+ 2001, 2005, Johannes E. Schindelin
+License: GPL-2+
+
+Files:
+ ica/x11/libvncserver/rfbcrypto_gnutls.c
+ ica/x11/libvncserver/rfbcrypto_included.c
+ ica/x11/libvncserver/rfbcrypto_openssl.c
+ ica/x11/libvncserver/rfbssl_gnutls.c
+ ica/x11/libvncserver/rfbssl_openssl.c
+Copyright:
+ 2011, Gernot Tenchio
+License: GPL-2+
+
+Files:
+ ica/x11/libvncserver/rfbssl_none.c
+Copyright:
+ 2011, Johannes Schindelin
+License: GPL-2+
 
 Files:
  ica/x11/libvncserver/zrlepalettehelper.c
@@ -325,9 +458,7 @@ Files:
  ica/x11/libvncserver/zrle.c
 Copyright:
  2003, Sun Microsystems, Inc.
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  ica/x11/libvncserver/d3des.c
@@ -335,27 +466,31 @@ Files:
  common/include/rfb/rfbproto.h
 Copyright:
  1988-1992, Richard Outerbridge
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  ica/x11/libvncserver/cursor.c
+Copyright:
+ 2000-2001, Constantin Kaplinsky
+ 1999, AT&T Laborataries Cambridge
+License: GPL-2+
+
+Files:
  ica/x11/libvncserver/tight.c
 Copyright:
+ 2010-2012, D. R. Commander
+ 2005-2008, Sun Microsystems, Inc.
+ 2004, Landmark Graphics Corporation
  2000-2001, Constantin Kaplinsky
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+ 1999, AT&T Laborataries Cambridge
+License: GPL-2+
 
 Files:
  ica/x11/libvncserver/zlib.c
  common/include/rfb/rfbproto.h
 Copyright:
  2000, Tridia Corporation
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  ica/x11/x11vnc/tkx11vnc.h
@@ -363,35 +498,19 @@ Files:
  ica/x11/x11vnc/help.c
 Copyright:
  2004-2006, Karl J. Runge <runge at karlrunge.com>
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
- .
- In addition, as a special exception, Karl J. Runge
- gives permission to link the code of its release of x11vnc with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables.  You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL".  If you
- modify this file, you may extend this exception to your version of the
- file, but you are not obligated to do so.  If you do not wish to do
- so, delete this exception statement from your version.
+License: GPL-2+
 
 Files:
  ica/x11/x11vnc/help.c
 Copyright:
  1989, 1991, Free Software Foundation, Inc.
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  ica/x11/x11vnc/nox11.h
 Copyright:
  1987, 1998, The Open Group
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  ica/src/lzoconf.h
@@ -399,9 +518,7 @@ Files:
  ica/src/minilzo.h
 Copyright:
  2002, Markus Franz Xaver
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  ica/src/lzoconf.h
@@ -409,18 +526,14 @@ Files:
  ica/src/minilzo.h
 Copyright:
  2002, Johannes Oberhumer
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  ima/src/kmultitabbar.h
  ima/src/kmultitabbar.cpp
 Copyright:
  2001-2003, Joseph Wenniger <jowenn at kde.org>
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  ima/src/3rdparty/qnetworkinterface.h
@@ -431,30 +544,100 @@ Files:
  ima/src/3rdparty/qnetworkinterface_unix.cpp
 Copyright:
  1992-2006, Trolltech ASA
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  common/src/dsa_key.cpp
 Copyright:
  1995, Tatu Ylonen <ylo at cs.hut.fi>
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  common/include/rfb/rfbproto.h
 Copyright:
  2001, Harakan Software
-License: GPL-2
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+License: GPL-2+
 
 Files:
  common/include/rfb/keysym.h
 Copyright:
  1987, X Consortium
+License: GPL-2+
+
+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 program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, can be found in /usr/share/common-licenses/GPL-2.
+
 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
+ version 2 as published by the Free Software Foundation.
+ .
+ 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 program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ .
  On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL-2 .
+ 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
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2.1, can be found in /usr/share/common-licenses/LGPL-2.1.
+
+License: BSD-3
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+   - Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+   - 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.
+   - Neither the name of the libjpeg-turbo Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS 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.


hooks/post-receive
-- 
italc.git (Debian package italc)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "italc.git" (Debian package italc).




More information about the debian-edu-commits mailing list