[pkg-java] r14744 - trunk/xmlunit/debian

[Torsten Werner]

Author: twerner
Date: 2011-09-07 13:03:53 +0000 (Wed, 07 Sep 2011)
New Revision: 14744

Modified:
   trunk/xmlunit/debian/changelog
   trunk/xmlunit/debian/copyright
Log:
Quote the full BSD license in debian/copyright.

Modified: trunk/xmlunit/debian/changelog
===================================================================
--- trunk/xmlunit/debian/changelog	2011-09-07 11:34:20 UTC (rev 14743)
+++ trunk/xmlunit/debian/changelog	2011-09-07 13:03:53 UTC (rev 14744)
@@ -1,14 +1,14 @@
 xmlunit (1.3-2) unstable; urgency=low
 
-  UNRELEASED
   * Team upload.
   * Add Vcs-* headers.
   * Change Depends: default-jdk-doc.
   * Update Standards-Version: 3.9.1.
   * Switch to source format 3.0.
   * Add a patch to workaround bug #634563 in dblatex.
+  * Quote the full BSD license in debian/copyright.
 
- -- Torsten Werner <twerner at debian.org>  Wed, 07 Sep 2011 13:31:32 +0200
+ -- Torsten Werner <twerner at debian.org>  Wed, 07 Sep 2011 15:01:06 +0200
 
 xmlunit (1.3-1) unstable; urgency=low
 

Modified: trunk/xmlunit/debian/copyright
===================================================================
--- trunk/xmlunit/debian/copyright	2011-09-07 11:34:20 UTC (rev 14743)
+++ trunk/xmlunit/debian/copyright	2011-09-07 13:03:53 UTC (rev 14744)
@@ -4,7 +4,7 @@
 Source: http://xmlunit.sourceforge.net/
 
 Files: *
-Copyright: 2001-2007, Jeff Martin, Tim Bacon
+Copyright: 2001-2009, Jeff Martin, Tim Bacon
 License: BSD
 
 Files: debian/*
@@ -12,12 +12,34 @@
 License: GPL-3+
 
 License: BSD
-  On Debian GNU/Linux system you can find the complete text of the
-  BSD license in '/usr/share/common-licenses/BSD'.
-  Replace 'The Regents of the University of California' by 
-  'Jeff Martin, Tim Bacon' and 'the University' by
-  'xmlunit.sourceforge.net'
+  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 xmlunit.sourceforge.net 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 OWNER 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.
+
 License: GPL-3
   On Debian GNU/Linux system you can find the complete text of the
   GNU General Public License version 3 license in