[hedgewars] 01/01: With this licenses should be all fixed, uploading on unstable

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository hedgewars.

commit 7766dc7ef8643077bebc0ff4eab5abe2bf9c5761
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Oct 1 13:06:31 2014 +0200

    With this licenses should be all fixed, uploading on unstable
---
 debian/changelog |  3 ++-
 debian/copyright | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 592bc9d..88bb339 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-hedgewars (0.9.20.5-11) UNRELEASED; urgency=medium
+hedgewars (0.9.20.5-11) unstable; urgency=medium
 
   * Bump std-version to 3.9.6, no changes required.
+  * Fix some copyright entries (s/BSD/BSD-3-clause).
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 30 Sep 2014 14:48:03 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 67c2201..1c34957 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,13 +28,13 @@ License: zlib
 Files: cmake_modules/TargetArch.cmake
 Copyright:
 	2012 Petroules Corporation
-License: BSD-2-Clause
+License: BSD-2-clause
 
 Files: cmake_modules/FindOggVorbis.cmake
 Copyright:
 	2006 Richard Laerkaeng <richard at goteborg.utfors.se>
 	2013 Vittorio Giovara <vittorio.giovara at gmail.com>
-License: BSD
+License: BSD-3-clause
 
 Files: cmake_modules/FindSparkle.cmake
        cmake_modules/FindSDL2.cmake
@@ -42,11 +42,11 @@ Files: cmake_modules/FindSparkle.cmake
 Copyright:
 	2009-2013 Vittorio Giovara <vittorio.giovara at gmail.com>
 	2003-2009 Kitware, Inc.
-License: BSD
+License: BSD-3-clause
 
 Files: cmake_modules/FindGHC.cmake
 Copyright: 2013 Vittorio Giovara <vittorio.giovara at gmail.com>
-License: BSD
+License: BSD-3-clause
 
 Files: cmake_modules/FindFFMPEG.cmake
 Copyright:
@@ -54,12 +54,12 @@ Copyright:
 	Modified for other libraries by Lasse Kärkkäinen <tronic>
 	Modified for Hedgewars by Stepik777
 	2013 Vittorio Giovara <vittorio.giovara at gmail.com>
-License: BSD
+License: BSD-3-clause
 
 Files: gameServer/Data/TConfig.hs
 Copyright:
 	2009 Anthony Simpson
-License: BSD
+License: BSD-3-clause
 
 Files: misc/winutils/include/SDL_opengl.h
 Copyright:
@@ -103,7 +103,7 @@ License: LGPL-2.1+
 Files: misc/winutils/include/GL/glut.h
 Copyright:
 	1994-1998 Mark J. Kilgard
-License:
+License: custom
  This program is freely distributable without licensing fees  and is
  provided without guarantee or warrantee expressed or  implied. This
  program is -not- in the public domain.
@@ -241,7 +241,7 @@ License: GFDL-1.3
 Files: tools/w32DownloadUnzip.vbs
 Copyright:
 	2012     Vittorio Giovara <vittorio.giovara at gmail.com> (w32DownloadUnzip.vbs)
-License: BSD
+License: BSD-3-clause
 
 Files: misc/libphysfs/archiver_wad.c
 Copyright:
@@ -254,7 +254,7 @@ License: Apache-2.0
 
 Files: share/hedgewars/Data/Fonts/DejaVuSans-Bold.ttf
 Copyright: 2003 by Bitstream
-License:
+License: custom
  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 Font Software,
@@ -434,7 +434,7 @@ License: MIT
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-License: BSD-2-Clause
+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:
@@ -457,7 +457,7 @@ License: BSD-2-Clause
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-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/collab-maint/hedgewars.git