src/main.cpp | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 use sdl by default since it's faster without hardware acceleration

src/CMakeLists.txt | 5 2 + 3 - 0 !
src/GameLogic.cpp | 6 3 + 3 - 0 !
src/ScriptedInputSource.cpp | 6 3 + 3 - 0 !
3 files changed, 8 insertions(+), 9 deletions(-)

 use system lua library instead of building a local copy

src/CMakeLists.txt | 1 0 + 1 - 0 !
src/FileRead.cpp | 2 1 + 1 - 0 !
src/ReplayRecorder.cpp | 2 1 + 1 - 0 !
src/TextManager.cpp | 2 1 + 1 - 0 !
src/UserConfig.cpp | 2 1 + 1 - 0 !
src/state/NetworkSearchState.cpp | 2 1 + 1 - 0 !
6 files changed, 5 insertions(+), 6 deletions(-)

 use system tinyxml library instead of building a local copy

src/CMakeLists.txt | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 append cxxflags instead of overwriting them.
 Otherwise the dpkg-buildflags are ignored.

data/CMakeLists.txt | 3 2 + 1 - 0 !
data/server.xml | 10 10 + 0 - 0 !
data/server/server.xml | 10 0 + 10 - 0 !
src/main.cpp | 29 15 + 14 - 0 !
src/server/servermain.cpp | 20 17 + 3 - 0 !
5 files changed, 44 insertions(+), 28 deletions(-)

 cherry-pick upstream commits 1528, 1530 and 1531.

data/CMakeLists.txt | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 make build reproducible.
 zip stores the atime of files by default in an extended attribute.

src/NetworkMessage.cpp | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 added inlude