Commit 3c81fe72 authored by Manuel Moos's avatar Manuel Moos
Browse files

Merge from beta_0.2.8.3

parents e86b4bd2 7f4358d7
Pipeline #400067628 passed with stages
in 30 minutes and 53 seconds
......@@ -24,6 +24,11 @@ test -z ${SERIES} && SERIES=unstable
DEBIAN_VERSION=${DEBIAN_VERSION_BASE}~${SERIES} || exit $?
SERIES_PATCH=debian/patches/ubuntu-${SERIES}.patch
if test -r ${SERIES_PATCH}; then
patch -p1 < ${SERIES_PATCH} || exit $?
fi
mv debian/changelog changelog_orig || exit $?
cat > debian/changelog <<EOF
armagetronad (${DEBIAN_VERSION}) ${SERIES}; urgency=medium
......
......@@ -11,4 +11,4 @@ contact us.
We started to integrate builds for [macOS](http://wiki.armagetronad.org/index.php?title=MacOS).
Consider them alpha for now, testing and patches very welcome. The current macOS specific issues
can be viewed [on our tracker](https://gitlab.com/armagetronad/armagetronad/-/issues?label_name%5B%5D=macOS).
\ No newline at end of file
can be viewed [on our tracker](https://gitlab.com/armagetronad/armagetronad/-/issues?label_name%5B%5D=macOS).
......@@ -199,7 +199,9 @@ elif test "${SF_DIR}" == "stable"; then
DOWNLOAD_URI_BASE=https://launchpad.net/${LP_PROJECT}/${LP_SERIES}/${LP_VERSION}/+download/
else
# the rest reference to sourceforge
DOWNLOAD_URI_BASE=https://sourceforge.net/projects/armagetronad/files/${SF_DIR}/@version@/
# DOWNLOAD_URI_BASE=https://sourceforge.net/projects/armagetronad/files/${SF_DIR}/@version@/
# or not. SF certificates have been broken for quite a while.
DOWNLOAD_URI_BASE=http://download.armagetronad.org/staging/${SF_DIR}/@version@/
fi
# **********************************************************************
......
......@@ -20,7 +20,7 @@ function fix_gits(){
fix_git winlibs d03e20bf8973a6cbd1e0ecb47dd8333c5614b139 || return $?
fix_git codeblocks 5ab4c626eb7cfa692a0bda7dbf26fed3721e4aa3 || return $?
fix_git ubuntu c4910e573fefd62f8241d4a484482ab8bb205b4d || return $?
fix_git ubuntu f6859ba047e2fa1d291ddd0f0f52b56950faf169 || return $?
}
if ! fix_gits; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment