This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository iortcw.
commit e0a46eac6024b1f84ae175b0cac5048a5b2f9b2e Author: Simon McVittie <[email protected]> Date: Sat Oct 1 17:54:14 2016 +0100 Always do a "release" build Override OPTIMIZE to empty instead of using upstream's "debug" build for noopt. --- debian/changelog | 2 ++ debian/rules | 19 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5fb003a..0b6df61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ iortcw (1.42d+dfsg1-5) UNRELEASED; urgency=medium * Fix date(1) syntax when using SOURCE_DATE_EPOCH * Mark patches as applied upstream or Debian-specific, as appropriate + * Always do a "release" build. Override OPTIMIZE to empty instead of + using upstream's "debug" build for noopt. -- Simon McVittie <[email protected]> Thu, 22 Sep 2016 09:16:38 +0100 diff --git a/debian/rules b/debian/rules index 1416757..22a90d0 100755 --- a/debian/rules +++ b/debian/rules @@ -12,12 +12,6 @@ include /usr/share/dpkg/default.mk %: dh $@ -ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) -TARGET = release -else -TARGET = debug -endif - options := \ V=1 \ USE_CODEC_OPUS=1 \ @@ -32,6 +26,7 @@ options := \ $(shell debian/q3arch make ${DEB_HOST_GNU_CPU} ${DEB_HOST_GNU_SYSTEM}) \ BUILD_GAME_QVM=0 \ COPYDIR=/usr/lib/rtcw \ + OPTIMIZE='' \ VERSION=$(DEB_VERSION)/$(DEB_VENDOR) \ CFLAGS='$(filter-out -fPIE -pie,$(CFLAGS)) $(CPPFLAGS)' \ NOTSHLIBCFLAGS='$(filter -fPIE -pie,$(CFLAGS))' \ @@ -41,12 +36,10 @@ options := \ sp_options := \ BR=$(CURDIR)/debian/build/sp \ - BD=$(CURDIR)/debian/build/sp \ $(NULL) mp_options := \ BR=$(CURDIR)/debian/build/mp \ - BD=$(CURDIR)/debian/build/mp \ $(NULL) ifeq ($(DEB_HOST_ARCH),armhf) @@ -57,9 +50,15 @@ endif override_dh_auto_build: install -d debian/build/mp debian/build/sp - make -C SP -- $(options) $(sp_options) $(TARGET) + make -C SP -- \ + $(options) \ + $(sp_options) \ + release + make -C MP -- \ + $(options) \ + $(mp_options) \ + release cd debian/build/sp && ln -s iowolfsp.* iowolfsp - make -C MP -- $(options) $(mp_options) $(TARGET) cd debian/build/mp && ln -s iowolfmp.* iowolfmp cd debian/build/mp && ln -s iowolfded.* iowolfded sed \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
