From 6015bbeaf678d8d5e163dc550d9917bdf37c9bf6 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 30 Apr 2014 23:05:43 +1200 Subject: [PATCH 1/2] Fix changelog url in the packaging script. --- packaging/linux/deb/buildpackage.sh | 4 ++-- packaging/package-all.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh index c700c6151b..3c996297ae 100755 --- a/packaging/linux/deb/buildpackage.sh +++ b/packaging/linux/deb/buildpackage.sh @@ -39,8 +39,8 @@ gzip -9 "${DEB_BUILD_ROOT}/${DOCDIR}/AUTHORS" DATE=`date -R` echo -e "openra (${VERSION}) unstable; urgency=low\n" > "${DEB_BUILD_ROOT}/${DOCDIR}/changelog" -cat "../../../CHANGELOG.md" >> "${DEB_BUILD_ROOT}/${DOCDIR}/changelog" -echo -e "\n\n-- Paul Chote ${DATE}" >> "${DEB_BUILD_ROOT}/${DOCDIR}/changelog" +cat "../../../Changelog.md" >> "${DEB_BUILD_ROOT}/${DOCDIR}/changelog" +echo -e "\n\n-- Paul Chote ${DATE}" >> "${DEB_BUILD_ROOT}/${DOCDIR}/changelog" gzip -9 "${DEB_BUILD_ROOT}/${DOCDIR}/changelog" rm "${DEB_BUILD_ROOT}/${LIBDIR}/COPYING" diff --git a/packaging/package-all.sh b/packaging/package-all.sh index 22f9f9cf3a..ca5c820805 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -21,8 +21,8 @@ make package # Remove the mdb files that are created during `make` find . -path "*.mdb" -delete -wget https://raw.github.com/wiki/OpenRA/OpenRA/CHANGELOG.md -markdown CHANGELOG.md > CHANGELOG.html +wget https://raw.github.com/wiki/OpenRA/OpenRA/Changelog.md +markdown Changelog.md > CHANGELOG.html markdown README.md > README.html markdown CONTRIBUTING.md > CONTRIBUTING.html markdown DOCUMENTATION.md > DOCUMENTATION.html From afa194dfb2a7a4df34079a3a45cbb0d7e93ee1c8 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 1 May 2014 00:52:36 +1200 Subject: [PATCH 2/2] Fix ubuntu packages dependencies for .NET4. --- packaging/linux/deb/DEBIAN/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/linux/deb/DEBIAN/control b/packaging/linux/deb/DEBIAN/control index 769be6e9ac..1039b82cd5 100644 --- a/packaging/linux/deb/DEBIAN/control +++ b/packaging/linux/deb/DEBIAN/control @@ -3,7 +3,7 @@ Version: {VERSION} Architecture: all Maintainer: Chris Forbes Installed-Size: {SIZE} -Depends: libopenal1, mono-runtime (>= 2.10), libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, libmono-i18n2.0-cil +Depends: libopenal1, mono-runtime (>= 2.10), libmono-system-drawing4.0-cil, libmono-system-windows-forms4.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri Section: games Priority: extra Homepage: http://www.open-ra.org/