[ioquake3] 51/59: New upstream snapshot

[Simon McVittie]

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

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit bb1c527b2f71677f81e15890923007aa1bfd72f5
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Sep 21 10:45:36 2016 +0100

    New upstream snapshot
    
      - bump SDL2 build-dependency to 2.0.4 to match upstream's embedded
        code copy
---
 debian/changelog |  5 ++++-
 debian/control   |  2 +-
 debian/rules     | 52 +++++++++++++++++++++++++++-------------------------
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0404a9b..263e9da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-ioquake3 (1.36+u20160616+dfsg1-2) UNRELEASED; urgency=medium
+ioquake3 (1.36+u20160914+dfsg1-1) UNRELEASED; urgency=medium
 
+  * New upstream snapshot
+    - bump SDL2 build-dependency to 2.0.4 to match upstream's embedded
+      code copy
   * debian/watch: mangle Debian version correctly
   * Remove a leftover comment which is now misleading
 
diff --git a/debian/control b/debian/control
index 5910850..bee30fa 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  libopenal-dev,
  libopus-dev,
  libopusfile-dev,
- libsdl2-dev (>= 2.0.0),
+ libsdl2-dev (>= 2.0.4),
  libvorbis-dev,
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/ioquake3.git
diff --git a/debian/rules b/debian/rules
index 84edd51..f8e17ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,13 +80,14 @@ override_dh_strip:
 
 # ---------------------------------------------------------------------------
 
-ORIG_REPO ?= https://github.com/ioquake/ioq3/
+ORIG_SOURCE = ioquake3
+ORIG_REPO ?= https://github.com/ioquake/ioq3
 ORIG_REL = 1.36
 # Empty if packaging a tagged release
-ORIG_REV = 9d6a95d4ad141237e21e5c57281b099bbc27a072
+ORIG_REV = 8417c184b42bd2d97f57b428b56c3c039531853b
 # 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 = 20160616
+ORIG_DATE = 20160914
 ORIG_SUFFIX = +dfsg1
 
 ifeq (${ORIG_REV},)
@@ -103,32 +104,33 @@ else
 endif
 
 get-orig-source:
-	git clone --bare --branch master ${ORIG_REPO} ioquake3-${ORIG_VER}.git
-	GIT_DIR=ioquake3-${ORIG_VER}.git git archive \
+	git clone --bare --depth=1 ${ORIG_REPO} ${ORIG_SOURCE}-${ORIG_VER}.git
+	GIT_DIR=${ORIG_SOURCE}-${ORIG_VER}.git git fetch ${ORIG_REPO} ${ORIG_EXPORT}
+	GIT_DIR=${ORIG_SOURCE}-${ORIG_VER}.git git archive \
 		--format=tar \
-		--prefix=ioquake3-${ORIG_VER}.orig/ \
-		${ORIG_EXPORT} | tar -xvf-
-	rm -rf ioquake3-${ORIG_VER}.orig/code/AL
-	rm -rf ioquake3-${ORIG_VER}.orig/code/SDL12
-	rm -rf ioquake3-${ORIG_VER}.orig/code/SDL2
-	rm -rf ioquake3-${ORIG_VER}.orig/code/tools/lcc
-	rm -rf ioquake3-${ORIG_VER}.orig/code/jpeg-8c
-	rm -rf ioquake3-${ORIG_VER}.orig/code/libcurl*
-	rm -rf ioquake3-${ORIG_VER}.orig/code/libogg-*
-	rm -rf ioquake3-${ORIG_VER}.orig/code/libs
-	rm -rf ioquake3-${ORIG_VER}.orig/code/libspeex
-	rm -rf ioquake3-${ORIG_VER}.orig/code/libvorbis-*
-	rm -rf ioquake3-${ORIG_VER}.orig/code/opus-*
-	rm -rf ioquake3-${ORIG_VER}.orig/code/opusfile-*
-	rm -rf ioquake3-${ORIG_VER}.orig/code/zlib
-	tar --xz -cvf ioquake3_${ORIG_VER}.orig.tar.xz ioquake3-${ORIG_VER}.orig
-	rm -rf ioquake3-${ORIG_VER}.orig
-	rm -rf ioquake3-${ORIG_VER}.git
+		--prefix=${ORIG_SOURCE}-${ORIG_VER}.orig/ \
+		${ORIG_EXPORT} | tar -xf-
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/AL
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/SDL12
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/SDL2
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/tools/lcc
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/jpeg-8c
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/libcurl*
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/libogg-*
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/libs
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/libspeex
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/libvorbis-*
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/opus-*
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/opusfile-*
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/code/zlib
+	tar --xz -cvf ${ORIG_SOURCE}_${ORIG_VER}.orig.tar.xz ${ORIG_SOURCE}-${ORIG_VER}.orig
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.git
 
 # to be invoked from a git checkout with upstream github as a remote;
 # tarball ends up in ../build-area
 maintainer-get-orig-source:
 	$(MAKE) -f debian/rules get-orig-source ORIG_REPO=$$(pwd)/.git
-	mv -i -v ${DEB_SOURCE}_${ORIG_VER}.orig.tar.xz ../build-area/
+	mv -i -v ${ORIG_SOURCE}_${ORIG_VER}.orig.tar.xz ../build-area/
 	@echo "try using:"
-	@echo "gbp import-orig --upstream-vcs-tag=${ORIG_REV} ../build-area/${DEB_SOURCE}_${ORIG_VER}.orig.tar.xz"
+	@echo "gbp import-orig --upstream-vcs-tag=${ORIG_REV} ../build-area/${ORIG_SOURCE}_${ORIG_VER}.orig.tar.xz"

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