This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository iortcw.
commit 79bc79c0701905f34da5a5d837e63992ba63743a Author: Simon McVittie <s...@debian.org> Date: Wed Sep 21 10:53:21 2016 +0100 debian/rules: improve get-orig-source target --- debian/changelog | 1 + debian/rules | 74 +++++++++++++++++++++++++++++--------------------------- 2 files changed, 40 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index bb79f73..3228f8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ iortcw (1.42d+dfsg1-4) UNRELEASED; urgency=medium * Normalize packaging via wrap-and-sort -abst * debian/gbp.conf: use DEP-14 branch names debian/master, upstream/latest * Remove rtcw-dbg binary package and rely on automatic dbgsym packages + * debian/rules: improve get-orig-source target -- Simon McVittie <s...@debian.org> Sun, 17 Jul 2016 20:50:57 +0100 diff --git a/debian/rules b/debian/rules index c536924..af58a3b 100755 --- a/debian/rules +++ b/debian/rules @@ -109,6 +109,7 @@ maintainer-update-icons: \ inkscape -C -w 32 -h 32 --export-png=debian/32/wolfmp.png debian/wolfmp.svg inkscape -C -w 48 -h 48 --export-png=debian/48/wolfmp.png debian/wolfmp.svg +ORIG_SOURCE = iortcw ORIG_REPO ?= https://github.com/iortcw/iortcw ORIG_REL = 1.42d # Empty if packaging a release @@ -126,52 +127,55 @@ else endif get-orig-source: - git clone --bare --branch master ${ORIG_REPO} iortcw-${ORIG_VER}.git - GIT_DIR=iortcw-${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=iortcw-${ORIG_VER}.orig/ \ - ${ORIG_EXPORT} | tar -xvf- - test -e iortcw-${ORIG_VER}.orig/MP/COPYING.txt || wget -O iortcw-${ORIG_VER}.orig/MP/COPYING.txt https://raw.githubusercontent.com/id-Software/RTCW-MP/master/COPYING.txt - test -e iortcw-${ORIG_VER}.orig/SP/COPYING.txt || wget -O iortcw-${ORIG_VER}.orig/SP/COPYING.txt https://raw.githubusercontent.com/id-Software/RTCW-SP/master/COPYING.txt + --prefix=${ORIG_SOURCE}-${ORIG_VER}.orig/ \ + ${ORIG_EXPORT} | tar -xf- + test -e ${ORIG_SOURCE}-${ORIG_VER}.orig/MP/COPYING.txt || wget -O ${ORIG_SOURCE}-${ORIG_VER}.orig/MP/COPYING.txt https://raw.githubusercontent.com/id-Software/RTCW-MP/master/COPYING.txt + test -e ${ORIG_SOURCE}-${ORIG_VER}.orig/SP/COPYING.txt || wget -O ${ORIG_SOURCE}-${ORIG_VER}.orig/SP/COPYING.txt https://raw.githubusercontent.com/id-Software/RTCW-SP/master/COPYING.txt : # if in the Debian checkout, check that they haven't changed if [ -e debian/rtcw.install ]; then \ e=0; \ - diff -u MP/COPYING.txt iortcw-${ORIG_VER}.orig/MP/COPYING.txt || e=$$?; \ - diff -u SP/COPYING.txt iortcw-${ORIG_VER}.orig/SP/COPYING.txt || e=$$?; \ + diff -u MP/COPYING.txt ${ORIG_SOURCE}-${ORIG_VER}.orig/MP/COPYING.txt || e=$$?; \ + diff -u SP/COPYING.txt ${ORIG_SOURCE}-${ORIG_VER}.orig/SP/COPYING.txt || e=$$?; \ exit $$e; \ fi - rm -rf iortcw-${ORIG_VER}.orig/*/code/AL - rm -rf iortcw-${ORIG_VER}.orig/*/code/SDL2 - rm -rf iortcw-${ORIG_VER}.orig/*/code/freetype-* - rm -rf iortcw-${ORIG_VER}.orig/*/code/jpeg-* - rm -rf iortcw-${ORIG_VER}.orig/*/code/libcurl-* - rm -rf iortcw-${ORIG_VER}.orig/*/code/libogg-* - rm -rf iortcw-${ORIG_VER}.orig/*/code/libs - rm -rf iortcw-${ORIG_VER}.orig/*/code/libvorbis-* - rm -rf iortcw-${ORIG_VER}.orig/*/code/opus-* - rm -rf iortcw-${ORIG_VER}.orig/*/code/opusfile-* - rm -rf iortcw-${ORIG_VER}.orig/*/code/tools/lcc + 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/freetype-* + rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/jpeg-* + 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/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/tools/lcc # Preserve ioapi.? and unzip.? (minizip) because they've been modified # to use the idTech3 memory-pool implementation, to avoid leaks when # loading a level is aborted. Delete the rest of zlib - rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/adler32.? - rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/crc32.? - rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/crypt.? - rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/gzguts.? - rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/inffast.? - rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/inffixed.? - rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/inflate.? - rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/inftrees.? - rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/zconf.? - rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/zlib.? - rm -rf iortcw-${ORIG_VER}.orig/*/code/zlib-*/zutil.? - rm -rf iortcw-${ORIG_VER}.orig/*/media - tar --xz -cvf iortcw_${ORIG_VER}.orig.tar.xz iortcw-${ORIG_VER}.orig - rm -rf iortcw-${ORIG_VER}.orig - rm -rf iortcw-${ORIG_VER}.git + rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/zlib-*/adler32.? + rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/zlib-*/crc32.? + rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/zlib-*/crypt.? + rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/zlib-*/gzguts.? + rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/zlib-*/inffast.? + rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/zlib-*/inffixed.? + rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/zlib-*/inflate.? + rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/zlib-*/inftrees.? + rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/zlib-*/zconf.? + rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/zlib-*/zlib.? + rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/zlib-*/zutil.? + rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/media + 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 iortcw_${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/${ORIG_SOURCE}_${ORIG_VER}.orig.tar.xz" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits