[iortcw] 03/08: New upstream release 1.5a

[Simon McVittie]

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

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

commit 487de8257eb941180655ff7eb5b31cffabc91fde
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Nov 20 18:18:52 2016 +0000

    New upstream release 1.5a
---
 debian/changelog | 11 +++++++++++
 debian/copyright |  7 +++++--
 debian/rules     | 15 +++++++--------
 debian/watch     |  4 ++--
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 536451a..d4aab5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+iortcw (1.50a+dfsg1-1) UNRELEASED; urgency=medium
+
+  [ Do not release this version until
+    https://github.com/iortcw/iortcw/issues/21 is resolved ]
+
+  * New upstream release 1.5a, represented as 1.50a here to make it
+    sort in the intended order
+    - debian/copyright: update
+
+ -- Simon McVittie <smcv at debian.org>  Sun, 20 Nov 2016 18:15:45 +0000
+
 iortcw (1.42d+dfsg1-5) unstable; urgency=medium
 
   * Fix date(1) syntax when using SOURCE_DATE_EPOCH
diff --git a/debian/copyright b/debian/copyright
index 94d0f51..b9305ef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,7 @@ License: GPL-3+-with-idsoft-extra-terms
 Files-Excluded:
  */code/AL
  */code/SDL2
+ */code/curl-*
  */code/freetype-*
  */code/jpeg-*
  */code/libcurl-*
@@ -76,11 +77,12 @@ Files:
  */code/null/null_glimp.c
  */code/null/null_net.c
  */code/qcommon/net_ip.c
+ */code/qcommon/json.h
  */code/qcommon/q_platform.h
  */code/qcommon/vm*.?
- */code/rend*/qgl.h
  */code/rend*/iqm.h
  */code/rend*/tr_bloom.c
+ */code/rend*/tr_dsa.?
  */code/rend*/tr_image_*.c
  */code/rend*/tr_subs.c
  */code/rend2/tr_extensions.c
@@ -90,6 +92,7 @@ Files:
  */code/rend2/tr_fbo.?
  */code/rend2/tr_fbo.?
  */code/rend2/tr_glsl.c
+ */code/rend2/tr_image_dds.c
  */code/rend2/tr_model_iqm.c
  */code/rend2/tr_postprocess.?
  */code/rend2/tr_vbo.c
@@ -107,7 +110,7 @@ Copyright:
  © 2006 Kirk Barnes
  © 2006 Tony J. White
  © 2008 Przemyslaw Iskra
- © 2009-2011 James Canete
+ © 2009-2016 James Canete
  © 2009-2011 Andrei Drexler
  © 2009-2011 Richard Allen
  © 2009 David S. Miller
diff --git a/debian/rules b/debian/rules
index 760589e..232b98b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,19 +125,17 @@ maintainer-update-icons: \
 
 ORIG_SOURCE = iortcw
 ORIG_REPO ?= https://github.com/iortcw/iortcw
-ORIG_REL = 1.42d
-# Empty if packaging a release
-ORIG_REV =
-# Empty if ORIG_REV is
+ORIG_REL = 1.50a
+ORIG_REV = 1.5a
 ORIG_DATE =
 ORIG_SUFFIX = +dfsg1
 
-ifeq (${ORIG_REV},)
+ORIG_EXPORT := ${ORIG_REV}
+
+ifeq (${ORIG_DATE},)
 	ORIG_VER := ${ORIG_REL}${ORIG_SUFFIX}
-	ORIG_EXPORT := ${ORIG_REL}
 else
 	ORIG_VER := ${ORIG_REL}+${ORIG_DATE}${ORIG_SUFFIX}
-	ORIG_EXPORT := ${ORIG_REV}
 endif
 
 get-orig-source:
@@ -158,6 +156,7 @@ get-orig-source:
 	fi
 	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/AL
 	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/SDL2
+	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/curl-*
 	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/freetype-*
 	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/jpeg-*
 	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/libcurl-*
@@ -192,4 +191,4 @@ maintainer-get-orig-source:
 	$(MAKE) -f debian/rules get-orig-source ORIG_REPO=$$(pwd)/.git
 	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/${ORIG_SOURCE}_${ORIG_VER}.orig.tar.xz"
+	@echo "gbp import-orig ../build-area/${ORIG_SOURCE}_${ORIG_VER}.orig.tar.xz"
diff --git a/debian/watch b/debian/watch
index a509bd1..0ab25fa 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=2
-opts=filenamemangle=s/.+\/(\d\S*)\.tar\.gz/iortcw-$1\.tar\.gz/,dversionmangle=s/\+[0-9]{8}\+dfsg[0-9]+$// \
+version=4
+opts="filenamemangle=s/.+\/(\d\S*)\.tar\.gz/iortcw-$1\.tar\.gz/,uversionmangle=s/^(\d+\.\d)([a-z])$/${1}0${2}/,dversionmangle=s/\+[0-9]{8}\+dfsg[0-9]+$//" \
   https://github.com/iortcw/iortcw/tags .*/(\d\S*)\.tar\.gz

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