diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh index d10dd03528..b93cda0bf2 100644 --- a/packaging/linux/buildpackage.sh +++ b/packaging/linux/buildpackage.sh @@ -41,15 +41,14 @@ cp -r hicolor root/usr/share/icons/ fi ) & -# ( -# echo "Building Arch-Linux package." -# pushd pkgbuild/ &> /dev/null -# sh buildpackage.sh "$VERSION" "$PACKAGEDIR" &> package.log -# if [ $? -ne 0 ]; then -# echo "Arch-Linux package build failed, refer to $PWD/package.log." -# fi -# popd &> /dev/null -# ) & +( + echo "Building Arch-Linux package." + cd pkgbuild + sh buildpackage.sh "$VERSION" "$PACKAGEDIR" &> package.log + if [ $? -ne 0 ]; then + echo "Arch-Linux package build failed, refer to $PWD/package.log." + fi +) & # # ( # echo "Building RPM package." diff --git a/packaging/linux/deb/DEBIAN/control b/packaging/linux/deb/DEBIAN/control index 02e42bf559..59c052cc0b 100644 --- a/packaging/linux/deb/DEBIAN/control +++ b/packaging/linux/deb/DEBIAN/control @@ -2,7 +2,7 @@ Package: openra Version: {VERSION} Architecture: all Maintainer: Matthew Bowra-Dean -Uploaders: Maikel van den Hout +Uploaders: Maikel van den Hout , Paul Chote Installed-Size: {SIZE} Depends: nvidia-cg-toolkit (>= 2.1), libopenal1, mono-runtime, libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, zenity, wget, unzip Section: games diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh index 450d710382..f31816b4e6 100755 --- a/packaging/linux/deb/buildpackage.sh +++ b/packaging/linux/deb/buildpackage.sh @@ -1,5 +1,5 @@ #!/bin/bash -# OpenRA packaging script for Mac OSX +# OpenRA packaging script for Debian based distributions E_BADARGS=85 if [ $# -ne "3" ] then diff --git a/packaging/linux/pkgbuild/PKGBUILD b/packaging/linux/pkgbuild/PKGBUILD index 8f6369d7a8..e13cdd53c0 100644 --- a/packaging/linux/pkgbuild/PKGBUILD +++ b/packaging/linux/pkgbuild/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: Matthew Bowra-Dean -pkgname=openra-git -pkgver=20100806.2 +pkgname=openra +pkgver={VERSION} pkgrel=1 pkgdesc="Open Source rebuild of the Red Alert game engine using Mono/OpenGL." arch=(any) diff --git a/packaging/linux/pkgbuild/buildpackage.sh b/packaging/linux/pkgbuild/buildpackage.sh index e6f905f156..e9dcc86ceb 100644 --- a/packaging/linux/pkgbuild/buildpackage.sh +++ b/packaging/linux/pkgbuild/buildpackage.sh @@ -7,11 +7,11 @@ then fi PKGVERSION=`echo $1 | sed "s/-/\\./g"` -sed -i "s/pkgver=[0-9\\.]\+/pkgver=$PKGVERSION/" PKGBUILD +sed -i "s/{VERSION}/$PKGVERSION/" PKGBUILD makepkg --holdver if [ $? -ne 0 ]; then exit 1 fi -mv openra-git-$PKGVERSION-1-any.pkg.tar.xz $2 \ No newline at end of file +mv openra-$PKGVERSION-1-any.pkg.tar.xz $2 \ No newline at end of file