[iortcw] 03/06: New upstream snapshot, now coming from git rather than svn

[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 404987242132ca7e5172b8f90b39a24843510a9e
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Mar 17 23:16:19 2015 +0000

    New upstream snapshot, now coming from git rather than svn
    
    Exclude ioapi.?, unzip.? - these are exactly libminizip.
---
 debian/changelog |  4 ++--
 debian/copyright |  7 ++-----
 debian/rules     | 23 ++++++++++++++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e732a9..00c9faa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-iortcw (1.42b+20150301+dfsg1-1) UNRELEASED; urgency=low
+iortcw (1.42b+20150316+dfsg1-1) UNRELEASED; urgency=low
 
   * New package for Return to Castle Wolfenstein (Closes: #773742)
   * Packaging based on ioquake3
 
- -- Simon McVittie <smcv at debian.org>  Thu, 12 Mar 2015 22:01:55 +0000
+ -- Simon McVittie <smcv at debian.org>  Tue, 17 Mar 2015 23:01:37 +0000
diff --git a/debian/copyright b/debian/copyright
index ae36941..7b07ad9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,8 @@ Files-Excluded:
  */code/libvorbis-*
  */code/opus-*
  */code/opusfile-*
+ */code/qcommon/ioapi.?
+ */code/qcommon/unzip.?
  */code/tools/lcc
  */code/zlib
  */media
@@ -104,15 +106,10 @@ Copyright:
 License: snd_adpcm-permissive
 
 Files:
-  */code/qcommon/unzip.?
-  */code/qcommon/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
   © 2006 Joerg Dietrich
   © 2008 Ludwig Nussel
 License: zlib
diff --git a/debian/rules b/debian/rules
index 1c93c3a..558c1c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,6 @@ else
 TARGET = debug
 endif
 
-# FIXME: investigate BUILD_FRENCH for SP
 options := \
 	V=1 \
 	USE_CODEC_OPUS=1 \
@@ -105,25 +104,28 @@ maintainer-update-icons: \
 	inkscape -C -w 32 -h 32 --export-png=debian/32/wolfmp.png debian/wolfmp.svg
 	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
 # Empty if packaging a release
-ORIG_REV = 791
-# Use the date of the ORIG_REV, or 20130426.1 if you snapshot twice in a day,
-# or empty if ORIG_REV is
-ORIG_DATE = 20150301
-# Non-empty for re-repacks (+dfsg2 or something)
+ORIG_REV = ec3318172a827f75c60940ed1a798273db5db72b
+# Empty if ORIG_REV is
+ORIG_DATE = 20150316
 ORIG_SUFFIX = +dfsg1
 
 ifeq (${ORIG_REV},)
 	ORIG_VER := ${ORIG_REL}${ORIG_SUFFIX}
-	ORIG_EXPORT := http://iortcw.googlecode.com/svn/tags/${ORIG_VER}
+	ORIG_EXPORT := ${ORIG_REL}
 else
 	ORIG_VER := ${ORIG_REL}+${ORIG_DATE}${ORIG_SUFFIX}
-	ORIG_EXPORT := -r ${ORIG_REV} http://iortcw.googlecode.com/svn/trunk
+	ORIG_EXPORT := ${ORIG_REV}
 endif
 
 get-orig-source:
-	svn export ${ORIG_EXPORT} iortcw-${ORIG_VER}.orig
+	git clone --bare --branch master ${ORIG_REPO} iortcw-${ORIG_VER}.git
+	GIT_DIR=iortcw-${ORIG_VER}.git git archive \
+		--format=tar \
+		--prefix=iortcw-${ORIG_VER}.orig/ \
+		${ORIG_EXPORT} | tar -xvf-
 	test -e iortcw-${ORIG_VER}.orig/MP/COPYING.txt || wget -O iortcw-${ORIG_VER}.orig/MP/COPYING.txt https://raw.githubusercontent.com/id-Software/RTCW-MP/master/COPYING.txt
 	test -e iortcw-${ORIG_VER}.orig/SP/COPYING.txt || wget -O iortcw-${ORIG_VER}.orig/SP/COPYING.txt https://raw.githubusercontent.com/id-Software/RTCW-SP/master/COPYING.txt
 	: # check that they haven't changed
@@ -140,6 +142,9 @@ get-orig-source:
 	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
+	rm -rf iortcw-${ORIG_VER}.orig/*/code/qcommon/ioapi.[ch]
+	rm -rf iortcw-${ORIG_VER}.orig/*/code/qcommon/unzip.[ch]
 	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
+	rm -rf iortcw-${ORIG_VER}.git

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