[Pkg-javascript-commits] [node-expat] 325/371: Fix use SPDX shortname for X11 license. Thanks to Paul Richards Tagliamonte.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository node-expat.

commit c8c2807c3354556d2092f2bfc5ca4c91c3297ded
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue May 19 21:57:35 2015 +0200

    Fix use SPDX shortname for X11 license. Thanks to Paul Richards Tagliamonte.
---
 debian/copyright | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 2c00e44..bba59f5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -52,11 +52,7 @@ License: GAP~configure
 
 Files: install-sh
 Copyright: 1994, X Consortium
-License: Expat~X with X exception
- Except as contained in this notice, the name of the X Consortium shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization
- from the X Consortium.
+License: X11
 
 Files: deps/libexpat/lib/Makefile.MPW
 Copyright: 2002, Daryle Walker
@@ -119,7 +115,7 @@ Comment:
  You should have received a copy of the 'GNU General Public License'
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-License: Expat~X
+License: X11
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
@@ -138,6 +134,11 @@ License: Expat~X
  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of the X Consortium shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from the X Consortium.
 
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-expat.git