[mapserver] 01/03: Use single stand-alone license paragraph for DejaVu font.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository mapserver.

commit 0fdffd5e99fed50912881014d7ebd54fe5c69ef0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jul 8 01:31:14 2015 +0200

    Use single stand-alone license paragraph for DejaVu font.
---
 debian/copyright | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index a25a8b1..a621157 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,10 +26,7 @@ License: MIT
 Files: dejavu-sans-condensed.h
 Copyright: 2003, Bitstream, Inc.
            2006, Tavmjong Bah.
-Comment: Fonts are (c) Bitstream
- DejaVu changes are in public domain.
- Glyphs imported from Arev fonts are (c) Tavmjong Bah
-License: Bitstream and Arev and public-domain
+License: DejaVu
 
 Files: mapbits.c
 Copyright: 1996-2005, Regents of the University of Minnesota
@@ -591,7 +588,16 @@ License: SGI-B-1.1-with-NVIDIA
  not been independently verified as being compliant with the OpenGL(R)
  version 1.2.1 Specification.
 
-License: Bitstream
+License: DejaVu
+ Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+ Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
+ .
+ Bitstream Vera Fonts Copyright
+ ------------------------------
+ .
+ Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+ a trademark of Bitstream, Inc.
+ .
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of the fonts accompanying this license ("Fonts") and associated
  documentation files (the "Font Software"), to reproduce and distribute the
@@ -632,8 +638,12 @@ License: Bitstream
  without prior written authorization from the Gnome Foundation or Bitstream
  Inc., respectively. For further information, contact: fonts at gnome dot
  org.
-
-License: Arev
+ .
+ Arev Fonts Copyright
+ --------------------
+ .
+ Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+ .
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of the fonts accompanying this license ("Fonts") and
  associated documentation files (the "Font Software"), to reproduce

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