[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn1802-1-5-g9cb5eef

[Simon McVittie]

The following commit has been merged in the master branch:
commit 62cadea7c198a003eb4660d1d71f7bb77b082587
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jan 16 23:16:04 2011 +0000

    Update copyright

diff --git a/debian/changelog b/debian/changelog
index dbb9c8e..e23a5e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ioquake3 (1.36+svn1802-2) UNRELEASED; urgency=low
 
   * Correct patch 0014 so the variables are correctly formatted as strings
+  * Update copyright file to DEP-5 (candidate) format
 
  -- Simon McVittie <smcv at debian.org>  Sun, 16 Jan 2011 23:02:09 +0000
 
diff --git a/debian/copyright b/debian/copyright
index 47d7b21..9bee463 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Format: http://dep.debian.net/deps/dep5/
 Name: ioquake3
 Maintainer:
   http://ioquake3.org/
@@ -54,10 +54,10 @@ License: not-applicable
   written by Colin Plumb in 1993, no copyright is claimed.
 
 Files:
-  code/qcommon/unzip.[ch],
-  code/qcommon/ioapi.[ch],
-  code/qcommon/puff.[ch],
-  code/client/libmumblelink.[ch],
+  code/qcommon/unzip.?
+  code/qcommon/ioapi.?
+  code/qcommon/puff.?
+  code/client/libmumblelink.?
   code/zlib/*
 Copyright:
   © 1990-2000 Info-ZIP
@@ -65,7 +65,7 @@ Copyright:
   © 1995-2005 Jean-loup Gailly
   © 1998-2005 Gilles Vollant
   © 2008 Ludwig Nussel
-License: ZLIB
+License: Zlib
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
   arising from the use of this software.
@@ -84,7 +84,7 @@ License: ZLIB
 
 Files: code/game/bg_lib.c
 Copyright: © 1992, 1993 The Regents of the University of California
-License: BSD
+License: BSD-3-clause
   All rights reserved.
   .
   Redistribution and use in source and binary forms, with or without

-- 
Quake 3 engine