[SCM] Packaging for quakespasm branch, master, updated. debian/0.85.4-1-10-g61061ea

[Simon McVittie]

The following commit has been merged in the master branch:
commit 7dcfd8e4b0c306b1ece64c5feef30f5efda5fadb
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jan 27 11:02:09 2012 +0000

    Add the license and copyright holder of OpenBSD strlcpy/strlcat to the copyright file

diff --git a/debian/changelog b/debian/changelog
index adf986d..9856991 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ quakespasm (0.85.6-1) UNRELEASED; urgency=low
     least be attempted on Hurd and kFreeBSD
   * Remove explicit compression=gzip from gbp.conf so it can cope with
     bzip2 too
+  * Add the license and copyright holder of OpenBSD strlcpy/strlcat to the
+    copyright file
 
  -- Stephen Kitt <steve at sk2.org>  Mon, 23 Jan 2012 06:44:41 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 31b7451..0518d1a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -85,3 +85,18 @@ License: GPL-2+ and BSD-3-clause
    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
    EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: Quake/strlcpy.c Quake/strlcat.c
+Copyright: 1998 Todd C. Miller
+License: ISC
+   Permission to use, copy, modify, and distribute this software for any
+   purpose with or without fee is hereby granted, provided that the above
+   copyright notice and this permission notice appear in all copies.
+   .
+   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+   WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+   MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+   ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-- 
Packaging for quakespasm