This is an automated email from the git hooks/post-receive script. fabian pushed a commit to branch master in repository eureka.
commit 903dda79d62f2377f6c22c398f4c0b3431451968 Author: Fabian Greffrath <[email protected]> Date: Wed Mar 8 21:38:55 2017 +0100 refresh patches, remove 0001, applied upstream --- ...ry-do-not-create-truncated-blockmaps-whic.patch | 31 ---------------------- debian/patches/reproducible-build.patch | 2 +- debian/patches/series | 1 - debian/patches/xdg-install.patch | 4 +-- 4 files changed, 3 insertions(+), 35 deletions(-) diff --git a/debian/patches/0001-glBSP-library-do-not-create-truncated-blockmaps-whic.patch b/debian/patches/0001-glBSP-library-do-not-create-truncated-blockmaps-whic.patch deleted file mode 100644 index a3c9958..0000000 --- a/debian/patches/0001-glBSP-library-do-not-create-truncated-blockmaps-whic.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2aa9ee5669b942927727cd2b7c21ccf31e103c7c Mon Sep 17 00:00:00 2001 -From: Andrew Apted <[email protected]> -Date: Thu, 4 Feb 2016 21:12:10 +1100 -Subject: [PATCH 1/2] glBSP library : do not create "truncated" blockmaps, - which rarely allows the map to be playable. Instead, leave the BLOCKMAP lump - as empty, to allow source ports with internal blockmap generators to generate - one. - ---- - glbsp_src/blockmap.cc | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/glbsp_src/blockmap.cc b/glbsp_src/blockmap.cc -index f0ea7e1..d9c880b 100644 ---- a/glbsp_src/blockmap.cc -+++ b/glbsp_src/blockmap.cc -@@ -592,7 +592,10 @@ void PutBlockmap(void) - // of shorts for the actual line lists. - - if (block_count > cur_info->block_limit) -- TruncateBlockmap(); -+ { -+ MarkSoftFailure(LIMIT_BLOCKMAP); -+ block_overflowed = TRUE; -+ } - - // initial phase: create internal blockmap containing the index of - // all lines in each block. --- -2.7.0.rc3 - diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch index 353fa2d..0729f7f 100644 --- a/debian/patches/reproducible-build.patch +++ b/debian/patches/reproducible-build.patch @@ -6,7 +6,7 @@ Author: Fabian Greffrath <[email protected]> --- a/src/main.cc +++ b/src/main.cc -@@ -821,7 +821,7 @@ static void ShowHelp() +@@ -845,7 +845,7 @@ static void ShowHelp() static void ShowVersion() { diff --git a/debian/patches/series b/debian/patches/series index d0980a6..265de1c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ xdg-install.patch reproducible-build.patch -0001-glBSP-library-do-not-create-truncated-blockmaps-whic.patch diff --git a/debian/patches/xdg-install.patch b/debian/patches/xdg-install.patch index e8ebf83..94275a9 100644 --- a/debian/patches/xdg-install.patch +++ b/debian/patches/xdg-install.patch @@ -3,10 +3,10 @@ Author: Fabian Greffrath <[email protected]> --- a/Makefile +++ b/Makefile -@@ -169,8 +169,8 @@ install: stripped +@@ -147,8 +147,8 @@ install: stripped + install -o root -m 644 games/*.* $(INSTALL_DIR)/games install -o root -m 644 common/*.* $(INSTALL_DIR)/common install -o root -m 644 ports/*.* $(INSTALL_DIR)/ports - # install -o root -m 644 mods/*.* $(INSTALL_DIR)/mods - xdg-desktop-menu install --novendor misc/eureka.desktop - xdg-icon-resource install --novendor --size 32 misc/eureka.xpm +# xdg-desktop-menu install --novendor misc/eureka.desktop -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/eureka.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
