[jedit] 04/07: debian/copyright: Fixed the short license names

[Emmanuel Bourg]

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

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

commit 1c04fb940f8a5d9768bfe89ad80579ab529c4443
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 13 12:10:00 2014 +0200

    debian/copyright: Fixed the short license names
---
 debian/changelog | 1 +
 debian/copyright | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cbf55e6..ddd74c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jedit (5.1.0+dfsg-2) UNRELEASED; urgency=medium
   * Team upload.
   * Standards-Version updated to 3.9.6 (no changes)
   * Switch to debhelper level 9
+  * debian/copyright: Fixed the short license names
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 13 Oct 2014 11:39:39 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 614bd70..1807a5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,7 +46,7 @@ Files: installer/BZip2Constants.java
  installer/CBZip2OutputStream.java
  installer/CRC.java
 Copyright: 2000, The Apache Software Foundation
-License: Apache Software License version 1.1
+License: Apache-1.1
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -120,7 +120,7 @@ License: other
 
 Files: macros/Emacs/*
 Copyright: 2005-2010 Brian M. Clapper
-License: BSD
+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/jedit.git