This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository nekohtml.
commit eec6d937222a9d8cfd60d7860ea65d16178c6009 Author: Torsten Werner <[email protected]> Date: Mon Sep 26 20:07:58 2011 +0000 Update debian/copyright. --- debian/changelog | 3 ++- debian/copyright | 58 ++++---------------------------------------------------- 2 files changed, 6 insertions(+), 55 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08b2eea..31f5462 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ nekohtml (1.9.15-1) unstable; urgency=low * New upstream release * Switch to debhelper level 7. * Update Standards-Version: 3.9.2. + * Update debian/copyright. - -- Torsten Werner <[email protected]> Mon, 26 Sep 2011 21:37:23 +0200 + -- Torsten Werner <[email protected]> Mon, 26 Sep 2011 21:59:20 +0200 nekohtml (1.9.14-1) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index a214bbf..87866d3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,64 +1,14 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ -Name: NekoHTML -Maintainer: CyberNeko +Format: http://dep.debian.net/deps/dep5/ +Upstream-Name: Neko HTML Source: http://nekohtml.sourceforge.net/ Files: * -Copyright: 2002-2008, Andy Clark -License: other - The CyberNeko Software License, Version 1.0 (BSD-like) - . - (C) Copyright 2002-2005, Andy Clark. 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. The end-user documentation included with the redistribution, - if any, must include the following acknowledgment: - "This product includes software developed by Andy Clark." - Alternately, this acknowledgment may appear in the software itself, - if and wherever such third-party acknowledgments normally appear. - . - 4. The names "CyberNeko" and "NekoHTML" must not be used to endorse - or promote products derived from this software without prior - written permission. For written permission, please contact - [email protected]. - . - 5. Products derived from this software may not be called "CyberNeko", - nor may "CyberNeko" appear in their name, without prior written - permission of the author. - . - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHOR OR OTHER 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. - -Files: src/org/cyberneko/html/ObjectFactory.java -Copyright: 2001-2004 The Apache Software Foundation -License: Apache-2.0 - -Files: src/org/cyberneko/html/SecuritySupport.java, src/org/cyberneko/html/SecuritySupport12.java -Copyright: 2002-2004 The Apache Software Foundation +Copyright: 2002-2009 Andy Clark, Marc Guillemot License: Apache-2.0 Files: debian/* Copyright: 2006, Marcus Better <[email protected]> + 2011, Torsten Werner <[email protected]> License: Apache-2.0 License: Apache-2.0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/nekohtml.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
