[SCM] jmock2 - Java library for testing code with mock objects branch, master, updated. debian/2.5.1+dfsg-2-3-gc87cdce

Emmanuel Bourg ebourg at apache.org
Wed Jul 17 10:44:38 UTC 2013


The following commit has been merged in the master branch:
commit 41a05cf81a5015e3bb2674428cd8e036a6f4dbe3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 17 12:42:00 2013 +0200

    debian/copyright: Removed the reference to /usr/share/common-licenses/BSD and quote the license text

diff --git a/debian/copyright b/debian/copyright
index 83f481d..118c7ca 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,11 +7,35 @@ Source: http://svn.codehaus.org/jmock/
 Files: *
 Copyright: 2000-2007, jMock.org
 License: BSD
-  On Debian GNU/Linux system you can find the complete text of the
-  BSD license in '/usr/share/common-licenses/BSD'
 
 Files: debian/*
 Copyright: 2010, Gabriele Giacone <1o5g4r8o at gmail.com>
 License: BSD
-  On Debian GNU/Linux system you can find the complete text of the
-  BSD license in '/usr/share/common-licenses/BSD'
+
+
+License: BSD
+ 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 jMock 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.

-- 
jmock2 - Java library for testing code with mock objects



More information about the pkg-java-commits mailing list