[ioquake3] 07/11: New upstream snapshot

[Simon McVittie]

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

smcv pushed a commit to branch debian-experimental
in repository ioquake3.

commit b2eb11f5e5cea0d7d73a7f81e19c54209ea0b4f1
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jan 22 22:02:43 2015 +0000

    New upstream snapshot
---
 debian/changelog |  2 +-
 debian/rules     | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20be8c0..ab58d54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ioquake3 (1.36+u20141229+gdd82b9d+dfsg1-1) UNRELEASED; urgency=medium
+ioquake3 (1.36+u20150114+dfsg1-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
   * Remove debian/source/local-options, dpkg-source behaves sensibly
diff --git a/debian/rules b/debian/rules
index aa1f829..0a46409 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,12 +57,11 @@ override_dh_strip:
 
 ORIG_REPO ?= https://github.com/ioquake/ioq3/
 ORIG_REL = 1.36
-# Empty if upstream ever get round to tagging a release
-ORIG_REV = dd82b9d
+# Empty if packaging a tagged release
+ORIG_REV = 10e2caa
 # 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 = 20141229
-# Non-empty for re-repacks (+dfsg2 or something)
+ORIG_DATE = 20150114
 ORIG_SUFFIX = +dfsg1
 
 ifeq (${ORIG_REV},)
@@ -74,10 +73,7 @@ else
 	# I'd use "+gitsomething", but that sorts earlier than
 	# "+svn1788", and "++gitsomething" is really ugly. +u sorts later,
 	# and can be justified as short for "upstream".
-	# "+g" because "+u20130426.gfffffff" sorts later than
-	# "+u20130426.1.gfffffff", whereas "+u20130426+gfffffff"
-	# sorts earlier than "+u20130426.1+gfffffff" as desired.
-	ORIG_VER := ${ORIG_REL}+u${ORIG_DATE}+g${ORIG_REV}${ORIG_SUFFIX}
+	ORIG_VER := ${ORIG_REL}+u${ORIG_DATE}${ORIG_SUFFIX}
 	ORIG_EXPORT := ${ORIG_REV}
 endif
 

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