[iortcw] 03/06: New upstream release

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository iortcw.

commit bbe7fe544ba0316a565eec3b3b1a199e4573ef9f
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Mar 2 08:54:00 2016 +0000

    New upstream release
    
    - Please note that this upstream release changes the location of game
      files from ~/.iortcw to ~/.wolf.
    - debian/copyright: update
    - debian/rules: update get-orig-source
---
 debian/changelog |  7 ++++++-
 debian/copyright | 21 +++++++++++++++++----
 debian/rules     | 21 +++++++++++++++++----
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 26e6d4d..2faf2b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
-iortcw (1.42b+20151119+dfsg1-2) UNRELEASED; urgency=medium
+iortcw (1.42d+dfsg1-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - Please note that this upstream release changes the location of game
+      files from ~/.iortcw to ~/.wolf.
+    - debian/copyright: update
+    - debian/rules: update get-orig-source
   * Switch Vcs-Git to https (see #810378)
 
  -- Simon McVittie <smcv at debian.org>  Fri, 22 Jan 2016 11:06:29 +0000
diff --git a/debian/copyright b/debian/copyright
index 7b4d118..606f87c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,7 +13,17 @@ Files-Excluded:
  */code/opus-*
  */code/opusfile-*
  */code/tools/lcc
- */code/zlib
+ */code/zlib-*/adler32.?
+ */code/zlib-*/crc32.?
+ */code/zlib-*/crypt.?
+ */code/zlib-*/gzguts.?
+ */code/zlib-*/inffast.?
+ */code/zlib-*/inffixed.?
+ */code/zlib-*/inflate.?
+ */code/zlib-*/inftrees.?
+ */code/zlib-*/zconf.?
+ */code/zlib-*/zlib.?
+ */code/zlib-*/zutil.?
  */media
 Source: https://github.com/iortcw/iortcw/
   The "original" tarball is based on a git export, edited to leave out
@@ -130,15 +140,18 @@ Copyright:
 License: snd_adpcm-permissive
 
 Files:
-  */code/qcommon/unzip.?
-  */code/qcommon/ioapi.?
+  */code/zlib-*/unzip.?
+  */code/zlib-*/ioapi.?
   */code/qcommon/puff.?
   */code/client/libmumblelink.?
 Copyright:
   © 1990-2000 Info-ZIP
   © 1995-2005 Mark Adler
   © 1995-2005 Jean-loup Gailly
-  © 1998-2005 Gilles Vollant
+  © 1998-2010 Gilles Vollant
+  © 1998-2010 Even Rouault
+  © 1998-2010 Mathias Svensson
+  © 2003 Terry Thorsen
   © 2006 Joerg Dietrich
   © 2008 Ludwig Nussel
 License: zlib
diff --git a/debian/rules b/debian/rules
index e35ee58..507c22c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,11 +99,11 @@ maintainer-update-icons: \
 	inkscape -C -w 48 -h 48 --export-png=debian/48/wolfmp.png debian/wolfmp.svg
 
 ORIG_REPO ?= https://github.com/iortcw/iortcw
-ORIG_REL = 1.42b
+ORIG_REL = 1.42d
 # Empty if packaging a release
-ORIG_REV = 2fc6bf23cc2401597d06d5e3c00e8f7e2162ec96
+ORIG_REV =
 # Empty if ORIG_REV is
-ORIG_DATE = 20151119
+ORIG_DATE =
 ORIG_SUFFIX = +dfsg1
 
 ifeq (${ORIG_REV},)
@@ -140,7 +140,20 @@ get-orig-source:
 	rm -rf iortcw-${ORIG_VER}.orig/*/code/opus-*
 	rm -rf iortcw-${ORIG_VER}.orig/*/code/opusfile-*
 	rm -rf iortcw-${ORIG_VER}.orig/*/code/tools/lcc
-	rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib
+	# Preserve ioapi.? and unzip.? (minizip) because they've been modified
+	# to use the idTech3 memory-pool implementation, to avoid leaks when
+	# loading a level is aborted. Delete the rest of zlib
+	rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/adler32.?
+	rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/crc32.?
+	rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/crypt.?
+	rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/gzguts.?
+	rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/inffast.?
+	rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/inffixed.?
+	rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/inflate.?
+	rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/inftrees.?
+	rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/zconf.?
+	rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/zlib.?
+	rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/zutil.?
 	rm -rf iortcw-${ORIG_VER}.orig/*/media
 	tar --xz -cvf iortcw_${ORIG_VER}.orig.tar.xz iortcw-${ORIG_VER}.orig
 	rm -rf iortcw-${ORIG_VER}.orig

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