[quakespasm] 03/11: New upstream release.

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository quakespasm.

commit 0c13b568d3301590a9d923d2e2863e84ffbc40e6
Author: Stephen Kitt <steve at sk2.org>
Date:   Sun Mar 22 21:52:08 2015 +0100

    New upstream release.
---
 debian/changelog                               |  6 ++++++
 debian/copyright                               | 25 ++++++++++++++++++++++++-
 debian/patches/remove-redundant-linking.patch  |  4 +---
 debian/patches/series                          |  3 +--
 debian/patches/use-inherited-build-flags.patch |  4 +---
 debian/quakespasm.doc-base                     |  6 +++---
 debian/quakespasm.docs                         |  4 ++--
 debian/rules                                   |  3 ++-
 8 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa67c81..ebe7caa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+quakespasm (0.90.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Stephen Kitt <skitt at debian.org>  Sun, 22 Mar 2015 21:40:57 +0100
+
 quakespasm (0.85.9-1) unstable; urgency=low
 
   [ David Banks ]
diff --git a/debian/copyright b/debian/copyright
index e5a6f00..ff5cbe5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,10 +6,11 @@ Copyright: 1996-2005 Id Software, Inc
            2002-2009 John Fitzgibbons
            2005 Stuart Dalton
            2007-2011 Kristian Duske
-           2007-2013 Ozkan Sezer
+           2005-2013 Ozkan Sezer
            2010-2011 Steven Atkinson
            (unspecified date) Baker
            (unspecified date) Forest Hale (LordHavoc)
+	   2010-2014 QuakeSpasm developers
 License: GPL-2+
 Comment:
  The source tarball has been repacked to remove the Windows and Mac build
@@ -89,6 +90,28 @@ License: GPL-2+ and BSD-3-clause
 Files: Quake/strlcpy.c Quake/strlcat.c
 Copyright: 1998 Todd C. Miller
 License: ISC
+
+Files: Misc/qs_pak/mkpak.sh
+Copyright: 2014 Sander van Dijk
+License: ISC
+
+Files: Quake/q_ctype.h
+Copyright: 1998 Red Hat Software, Inc.
+License: GPL-2+
+
+Files: Quake/snd_flac.c
+Copyright: 2005 Bill Currie
+	   2013 O. Sezer
+License: GPL-2+
+
+Files: Quake/snd_mikmod.c
+       Quake/snd_modplug.c
+       Quake/snd_opus.c
+       Quake/snd_umx.c
+Copyright: 2013 O. Sezer
+License: GPL-2+
+
+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.
diff --git a/debian/patches/remove-redundant-linking.patch b/debian/patches/remove-redundant-linking.patch
index 3b7a1e3..071c7a5 100644
--- a/debian/patches/remove-redundant-linking.patch
+++ b/debian/patches/remove-redundant-linking.patch
@@ -11,11 +11,9 @@ Origin: vendor, Debian
  Quake/Makefile |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/Quake/Makefile b/Quake/Makefile
-index 65abbb6..76fbe99 100644
 --- a/Quake/Makefile
 +++ b/Quake/Makefile
-@@ -124,11 +124,11 @@ lib_mp3dec=-lmpg123
+@@ -133,11 +133,11 @@
  endif
  ifeq ($(VORBISLIB),vorbis)
  cpp_vorbisdec=
diff --git a/debian/patches/series b/debian/patches/series
index 4d45e6c..3e8a439 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 remove-redundant-linking.patch
-support-user-directories.patch
-mp3-copyright.patch
+#mp3-copyright.patch
 use-inherited-build-flags.patch
diff --git a/debian/patches/use-inherited-build-flags.patch b/debian/patches/use-inherited-build-flags.patch
index d136496..711cf5f 100644
--- a/debian/patches/use-inherited-build-flags.patch
+++ b/debian/patches/use-inherited-build-flags.patch
@@ -11,11 +11,9 @@ Origin: vendor, Debian
  Quake/Makefile |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/Quake/Makefile b/Quake/Makefile
-index 76fbe99..bf55f0c 100644
 --- a/Quake/Makefile
 +++ b/Quake/Makefile
-@@ -45,7 +45,6 @@ STRIP ?= strip
+@@ -52,7 +52,6 @@
  #CPUFLAGS= -mtune=k8
  #CPUFLAGS= -march=atom
  CPUFLAGS=
diff --git a/debian/quakespasm.doc-base b/debian/quakespasm.doc-base
index cf2c9a5..89af5e4 100644
--- a/debian/quakespasm.doc-base
+++ b/debian/quakespasm.doc-base
@@ -4,8 +4,8 @@ Abstract: Documentation for Quakespasm, including changelog and TODO
 Section: Games/Action
 
 Format: HTML
-Index: /usr/share/doc/quakespasm/README.html
-Files: /usr/share/doc/quakespasm/README.html
+Index: /usr/share/doc/quakespasm/Quakespasm.html
+Files: /usr/share/doc/quakespasm/Quakespasm.html
 
 Format: Text
-Files: /usr/share/doc/quakespasm/README.txt.gz
+Files: /usr/share/doc/quakespasm/Quakespasm.txt.gz
diff --git a/debian/quakespasm.docs b/debian/quakespasm.docs
index 00f0068..06046f7 100644
--- a/debian/quakespasm.docs
+++ b/debian/quakespasm.docs
@@ -1,2 +1,2 @@
-README.txt
-README.html
+Quakespasm.txt
+Quakespasm.html
diff --git a/debian/rules b/debian/rules
index 44f122c..4b11378 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,8 @@ override_dh_auto_clean:
 override_dh_auto_build:
 	make -C Quake \
 		$(maybe_debug) \
-		STRIP=": do not strip:"
+		STRIP=": do not strip:" \
+		DO_USERDIRS=1
 
 override_dh_auto_install:
 	install -d $(DESTDIR)/usr/games

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