Author: marcusb-guest Date: 2008-09-26 15:41:40 +0000 (Fri, 26 Sep 2008) New Revision: 7049
Modified: trunk/libjdom1-java/debian/changelog trunk/libjdom1-java/debian/copyright Log: Updated and machine-interpretable copyright file. Modified: trunk/libjdom1-java/debian/changelog =================================================================== --- trunk/libjdom1-java/debian/changelog 2008-09-26 15:21:48 UTC (rev 7048) +++ trunk/libjdom1-java/debian/changelog 2008-09-26 15:41:40 UTC (rev 7049) @@ -1,8 +1,9 @@ libjdom1-java (1.1-1) unstable; urgency=low * New upstream version. + * Updated and machine-interpretable copyright file. - -- Marcus Better <[EMAIL PROTECTED]> Fri, 26 Sep 2008 15:23:20 +0200 + -- Marcus Better <[EMAIL PROTECTED]> Fri, 26 Sep 2008 17:42:09 +0200 libjdom1-java (1.0-4) unstable; urgency=low Modified: trunk/libjdom1-java/debian/copyright =================================================================== --- trunk/libjdom1-java/debian/copyright 2008-09-26 15:21:48 UTC (rev 7048) +++ trunk/libjdom1-java/debian/copyright 2008-09-26 15:41:40 UTC (rev 7049) @@ -1,41 +1,46 @@ -This package was debianized by Takashi Okamoto [EMAIL PROTECTED] on -Sat, 28 Jul 2001 21:40:28 +0900. +Format-Specification: + http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196 +Upstream-Name: JDOM +Upstream-Source: http://jdom.org -It was downloaded from http://www.jdom.org/. +Files: * +Copyright: Copyright 2000-2004 Brett McLaughlin +Copyright: Copyright 2000-2004 Jason Hunter +License: BSD-4 -Copyright: +Files: debian/* +Copyright: Copyright 2008 Marcus Better +License: BSD-4 - Copyright (C) 2001 Brett McLaughlin & Jason Hunter. - All rights reserved. - +License: BSD-4 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. - + 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 disclaimer that follows - these conditions in the documentation and/or other materials - provided with the distribution. + notice, this list of conditions, and the disclaimer that follows + these conditions in the documentation and/or other materials + provided with the distribution. 3. The name "JDOM" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact [EMAIL PROTECTED] - + derived from this software without prior written permission. For + written permission, please contact <request_AT_jdom_DOT_org>. + 4. Products derived from this software may not be called "JDOM", nor - may "JDOM" appear in their name, without prior written permission - from the JDOM Project Management ([EMAIL PROTECTED]). - + may "JDOM" appear in their name, without prior written permission + from the JDOM Project Management <request_AT_jdom_DOT_org>. + . In addition, we request (but do not require) that you include in the end-user documentation provided with the redistribution and/or in the software itself an acknowledgement equivalent to the following: - "This product includes software developed by the - JDOM Project (http://www.jdom.org/)." + "This product includes software developed by the + JDOM Project (http://www.jdom.org/)." Alternatively, the acknowledgment may be graphical using the logos available at http://www.jdom.org/images/logos. - + . 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 @@ -48,10 +53,9 @@ 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. - + . This software consists of voluntary contributions made by many individuals on behalf of the JDOM Project and was originally - created by Brett McLaughlin <[EMAIL PROTECTED]> and - Jason Hunter <[EMAIL PROTECTED]>. For more information on the - JDOM Project, please see <http://www.jdom.org/>. - + created by Jason Hunter <jhunter_AT_jdom_DOT_org> and + Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information + on the JDOM Project, please see <http://www.jdom.org/>. _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
