[stapler] 06/07: Fixed the short name of the licenses in debian/copyright

[Emmanuel Bourg]

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

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

commit e60639b6c1319ba3ee9e30e9c9241e7b17d0cf3f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Sep 7 22:49:58 2014 +0200

    Fixed the short name of the licenses in debian/copyright
---
 debian/changelog |  1 +
 debian/copyright | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7443cb7..340cea4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ stapler (1.224-1) UNRELEASED; urgency=medium
   * Replaced the patches disabling the jruby and jrebel modules
     with ignore rules in debian/libstapler-java.poms
   * Switch to debhelper level 9
+  * debian/copyright: Fixed the short name of the licenses
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 03 Sep 2014 22:13:35 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 3740b21..73ed730 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,7 @@ Copyright: 2004-2010, Kohsuke Kawaguchi <kk at kohsuke.org>,
            Jim Meyer,
            David Brownell,
            jglick
-License: BSD
+License: BSD-2-clause
 
 Files: ./core/src/main/java/org/kohsuke/stapler/export/TypeUtil.java
 Copyright: 1997-2007 Sun Microsystems, Inc. All rights reserved.
@@ -18,13 +18,13 @@ License: GPL-2 or CDDL
 
 Files: ./core/src/main/java/org/kohsuke/stapler/export/XmlChars.java
 Copyright: 2000 The Apache Software Foundation.  All rights reserved.
-License: Apache 1.1
+License: Apache-1.1
 
 Files: debian/*
 Copyright: 2011, Canonical Ltd (http://www.canonical.com/)
-License: BSD
+License: BSD-2-clause
 
-License: BSD
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -367,7 +367,7 @@ License: CDDL
  Open Source Initiative OSI - Common Development and Distribution License 
  (CDDL-1.0)
  
-License: Apache 1.1
+License: Apache-1.1
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *

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