[libasm4-java] 05/07: debian/copyright: Fixed the shortname of the BSD license

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libasm4-java.

commit c598e81e9bd234e913a7e8744194547e9b469cdb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 27 00:16:26 2015 +0200

    debian/copyright: Fixed the shortname of the BSD license
---
 debian/changelog |  1 +
 debian/copyright | 31 +++++--------------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6da1f79..91194e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libasm4-java (5.0.4-1) UNRELEASED; urgency=medium
   * Refreshed the patches
   * Updated the version in debian/libasm4-java.poms
   * Standards-Version updated to 3.9.6 (no changes)
+  * debian/copyright: Fixed the shortname of the BSD license
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 26 May 2015 23:27:59 +0200
 
diff --git a/debian/copyright b/debian/copyright
index a4e7ca7..fe1acfb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,34 +4,13 @@ Source: http://download.forge.objectweb.org/asm/
 
 Files: *
 Copyright: 2000-2013 INRIA, France Telecom
-License: BSD
-  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. Neither the name of the copyright holders 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: BSD-3-clause
 
 Files: debian/*
-Copyright: 2004-2013 Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-License: BSD
+Copyright: 2004-2015 Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+License: BSD-3-clause
+
+License: BSD-3-clause
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
   are met:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libasm4-java.git