[SCM] simplyhtml packaging branch, master, updated. upstream/0.16.05-11-gd16e60b

Thu Feb 21 13:20:05 UTC 2013

The following commit has been merged in the master branch:
commit d16e60b0f26bc0bf40ef047f3a03ec0e2de8a22b
Author: Felix Natter <fnatter at gmx.net>
Date:   Thu Feb 21 14:16:03 2013 +0100

    update debian/copyright to copyright-format/1.0

diff --git a/debian/copyright b/debian/copyright
index 6d430e4..fe0a837 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,31 @@
-This package was debianized by Eric Lavarde <deb at zorglub.s.bawue.de>
-	on Sun, 12 Nov 2006 14:28:56 +0100.
-and Felix Natter <fnatter at gmx.net> 2013
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: simplyhtml
+Source: http://simplyhtml.sf.net/
 
-It was downloaded from http://sourceforge.net/projects/simplyhtml
-	(Sources repacked as per README.source)
-
-Copyright Holder: Ulrich Hilger <info at lightdev.com>
-	and Dimitri Polivaev <dpolivaev at users.sourceforge.net>
-
-License:
-
-    This package 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 package 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 General Public
-    License along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, 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'.
-
-The files ElementTreePanel.java and ExampleFileFilter.java are
-Copyright (c) 2004 Sun Microsystems, Inc., with the following license:
+Files: *
+Copyright: 2006-2013 Dimitri Polivaev <dpolivaev at users.sourceforge.net>
+           2002,2003 Ulrich Hilger <info at lightdev.com>
+License: GPL-2+
+ This package 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 package 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, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
+Files: ./src/com/sun/demo/ElementTreePanel.java
+       ./src/com/sun/demo/ExampleFileFilter.java
+Copyright: 2004 Sun Microsystems, Inc.
+License: Sun custom license
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * 
@@ -60,7 +56,48 @@ Copyright (c) 2004 Sun Microsystems, Inc., with the following license:
  * for use in the design, construction, operation or maintenance of any
  * nuclear facility.
 
-The packaging itself is Copyright 2008 Eric Lavarde <deb at zorglub.s.bawue.de>
-and placed under dual license BSD or GPLv2+, at your preference. The complete
-texts of both licenses can be found under /usr/share/common-licenses/BSD
-resp. /usr/share/common-licenses/GPL-2.
+
+Files: debian/*
+Copyright: 2013 Felix Natter <fnatter at gmx.net>
+           2008-2012 Eric Lavarde <deb at zorglub.s.bawue.de>           
+License: GPL-2+ or BSD-2-clause
+ This package 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 package 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, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ .
+ .  
+ For the "BSD-2-clause" option, here is the license text:
+ .
+ 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.
+ .
+ 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 HOLDER 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.

-- 
simplyhtml packaging

