This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository dhewm3.
commit ce9d256b9fd151bb91f875cfd9c87e76728cbd82 Author: Tobias Frost <[email protected]> Date: Thu Mar 12 11:20:35 2015 +0100 Fix get-orig-source and remove empty line from d/copyright --- debian/copyright | 1 - debian/rules | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/copyright b/debian/copyright index c6de1a1..6b6d3d2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,6 @@ Source: https://github.com/dhewm/dhewm3 Comment: The removed files contained prebuilt binaries and we do not need those. The jpeg_memory_src.* have been removed due the missing README -- which defines the license for those two files. - Files-Excluded: neo/tools/common/PropTree/* neo/sys/win32/* neo/sys/linux/setup/*/bin neo/sys/linux/setup/lokisetup neo/sys/linux/setup/image-* neo/sys/linux/setup/makeself/* diff --git a/debian/rules b/debian/rules index b5796a0..39fa087 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ override_dh_auto_configure: UURL = https://github.com/dhewm/dhewm3.git PKD = $(abspath $(dir $(MAKEFILE_LIST))) PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source)) -VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | sed -e s/^.*git// -e s/+repack// | cut -d- -f1 ) +VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | sed -e s/^.*git// -e s/+dfsg// | cut -d- -f1 ) DTYPE = +dfsg UPSVER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d+ -f1) @@ -34,7 +34,7 @@ UDATE = $(shell date --rfc-3339=seconds --date='TZ="UTC" \ $(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz: @echo DEBUG: VER=$(VER) UDATE=$(UDATE) UPSVER=$(UPSVER) @echo "$(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz" - @echo $(VER) | grep '^[0-9]*$$' || ( echo Cannot find timestamp in package version. Please specify VER, see README.source. Aborting.. ; exit 1 ) + @echo $(VER) | grep -q '^[0-9]*$$' || ( echo Cannot find timestamp in package version. Please specify VER, see README.source. Aborting.. ; exit 1 ) #$(info I: UDATE=$(UDATE)) $(if $(wildcard $(PKG)-$(UPSVER)+git$(VER)),$(error $(PKG)-$(UPSVER)+git$(VER) exist, aborting..)) @echo "# Downloading..." @@ -48,7 +48,7 @@ $(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz: && echo "# Setting times..." \ && for F in $$(git ls-tree -r --name-only HEAD); do touch --no-dereference -d "$$(git log -1 --format="%ai" -- $$F)" "$$F"; done \ && echo "# Cleaning-up..." \ - && $(RM) -r -v $$(awk 'BEGIN{RS=ORS="\n\n";FS=OFS="\n"}/Files-Excluded:/' $(PKD)/copyright | sed s/Files-Excluded://) \ + && $(RM) -r -v $$(awk 'BEGIN{RS=ORS="\n\n";FS=OFS="\n"}/Files-Excluded:/' $(PKD)/copyright | sed -n -e '/^Files-Excluded:/,$${p}' | sed s/Files-Excluded://) \ && $(RM) -r .git .git* @echo "# Packing..." find -L "$(PKG)-$(UPSVER)+git$(VER)" -xdev -type f -print | sort \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
