[SCM] Render HTML and CSS content with tk branch, master, updated. 9671f2c2ed0f16998d9aa9c7d3e9274f4af6e693

[Ole Streicher]

The following commit has been merged in the master branch:
commit 7f693817535f14c5eeba3c2e7c17c41cea58d6c5
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Mar 26 12:15:52 2012 +0200

    Fix copyright

diff --git a/debian/copyright b/debian/copyright
index 803e90d..73b7037 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,15 @@ Upstream-Author: Dan Kennedy <danielk1977 at gmail.com>
 Source: http://tkhtml.tcl.tk/index.html
 
 Files: *
-Copyright: Copyright (c) 2005 Dan Kennedy
+Copyright: Copyright (c) 2005-2007 Dan Kennedy
+ Copyright (c) 2005 Eolas Technologies Inc.
+ Copyright (c) 1991-1994 The Regents of the University of California.
+ Copyright (c) 1994-1997 Sun Microsystems, Inc.
+ Copyright (c) 1998-2003, Bryan Oakley
+ Copyright (c) 1998-1999 by Scriptics Corporation.
+ Copyright (c) 1999-2000 Ajuba Solutions.
+ Copyright (c) 2002-2005 ActiveState Corporation.
+ Copyright (C) 2001 Joe English <jenglish at sourceforge.net>.
 License: BSD
  All rights reserved.
  .
@@ -35,7 +43,7 @@ License: BSD
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-Files: hv/snit.tcl hv/snit2.tcl
+Files: hv/snit.tcl hv/snit2.tcl tools/expand
 Copyright: William H. Duquette
 License: MIT alike
  The authors hereby grant permission to use, copy, modify, distribute,
@@ -71,13 +79,59 @@ License: MIT alike
  252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
  authors grant the U.S. Government and others acting in its behalf
  permission to use and distribute the software in accordance with the
- terms specified in this license. 
+ terms specified in this license.
+ .
+ Note by Ole Streicher <debian at liska.ath.cx>: These files are not used
+ to build the package.
 
-Files: tools/*.c
+Files: tools/lempar.c
 Copyright: Not applicable
 License: Public domain
  The author of this program disclaims copyright.
 
+Files: tools/mktclapp.c doc/spec.html
+Copyright: Copyright (c) 1998, 1999 D. Richard Hipp
+License: GPLv2+
+ 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.
+ .
+ On Debian systems, the complete text of the GNU General 
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ .
+ Author contact information:
+   drh at acm.org
+   http://www.hwaci.com/drh/
+ .
+ Note by Ole Streicher <debian at liska.ath.cx>: These files are not used
+ to build the package.
+
+Files: src/htmlexts.c
+Copyright: Copyright (C) 1997-2000 Peter MacDonald and BrowseX Systems Inc.
+License: LGPLv2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 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
+ Library General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU Library General 
+ Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+ .
+ Author contact information:
+   peter at browsex.com
+   http://browsex.com
+
 Files: debian/*
 Copyright: not applicable
 License: public-domain

-- 
Render HTML and CSS content with tk