diff --git a/packaging/linux/deb/DEBIAN/changelog b/packaging/linux/deb/DEBIAN/changelog index 784b16182d..f21791502c 100644 --- a/packaging/linux/deb/DEBIAN/changelog +++ b/packaging/linux/deb/DEBIAN/changelog @@ -1,5 +1,16 @@ -openra (20100907-1) unstable; urgency=low +openra (20100914) unstable; urgency=low -* Changed MiG prerequisites to AFLD+STEK * Removed KENN, build DOG directly from BARR now * Chronotank can only teleport when fully charged * Improved OpenGL error logging * Fixed targeting of FIX * Fixed crash when an engineer is trying to repair a building, but it dies/gets sold/* etc. * Added muzzle flashes to Yak and Hind chainguns * Fixed bounding boxes on some units * Fixed accuracy of Tesla weapons * Changed ownership of GUN and GTWR in CNC to both * Fixed crash on destroying things that have a building reserved * If ordered to move to an unpathable cell, move somewhere nearby that is pathable * instead * Fixed RPM linux package +* Changed MiG prerequisites to AFLD+STEK +* Removed KENN, build DOG directly from BARR now +* Chronotank can only teleport when fully charged +* Improved OpenGL error logging +* Fixed targeting of FIX +* Fixed crash when an engineer is trying to repair a building, but it dies/gets sold/etc. +* Added muzzle flashes to Yak and Hind chainguns * Fixed bounding boxes on some units +* Fixed accuracy of Tesla weapons +* Changed ownership of GUN and GTWR in CNC to both +* Fixed crash on destroying things that have a building reserved +* If ordered to move to an unpathable cell, move somewhere nearby that is pathable instead +* Fixed RPM linux package -- Maikel van den Hout Thu, 09 Sep 2010 16:34:03 +0200 diff --git a/packaging/linux/deb/DEBIAN/control b/packaging/linux/deb/DEBIAN/control index e348281c81..43096220e2 100644 --- a/packaging/linux/deb/DEBIAN/control +++ b/packaging/linux/deb/DEBIAN/control @@ -1,9 +1,9 @@ Package: openra -Version: 20100907-1 +Version: 20100914 Architecture: i386 Maintainer: Matthew Bowra-Dean Uploaders: Maikel van den Hout -Installed-Size: 31623 +Installed-Size: 8306 Depends: nvidia-cg-toolkit (>= 2.2), libopenal1, mono-runtime, libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, zenity, wget, unzip Section: games Priority: extra diff --git a/packaging/linux/deb/DEBIAN/postinst b/packaging/linux/deb/DEBIAN/postinst index fa70239569..f09fd83b9f 100644 --- a/packaging/linux/deb/DEBIAN/postinst +++ b/packaging/linux/deb/DEBIAN/postinst @@ -6,40 +6,40 @@ if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then fi # End automatically added section -start_directory=$( pwd ) -cd /tmp - -anw=`zenity --question --text "Download and install RA packages? [Y/n]"; echo $?` -if [ $anw = 0 ] ; then - cd /tmp/ - wget "http://open-ra.org/get-dependency.php?file=ra-packages" -O ra-packages.zip - mkdir -p /usr/share/openra/mods/ra/packages - unzip -f ra-packages.zip -d /usr/share/openra/mods/ra/packages - rm ra-packages.zip - cd $start_directory - else - zenity --info --text "The RA packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=ra-packages \ - to /usr/share/openra/mods/ra/packages before the RA mod will work." - break -fi - - -anw=`zenity --question --text "Download and install C&C packages? [Y/n]"; echo $?` -if [ $anw = 0 ] ; then - cd /tmp/ - wget "http://open-ra.org/get-dependency.php?file=cnc-packages" -O cnc-packages.zip - mkdir -p /usr/share/openra/mods/cnc/packages - unzip -f cnc-packages.zip -d usr/share/openra/mods/cnc/packages - rm cnc-packages.zip - cd $start_directory - else - zenity --info --text "The C&C packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=cnc-packages \ - to /usr/share/openra/mods/cnc/packages before the C&C mod will work." - break -fi - -gacutil -i /usr/share/openra/thirdparty/Tao/Tao.Cg.dll -gacutil -i /usr/share/openra/thirdparty/Tao/Tao.FreeType.dll -gacutil -i /usr/share/openra/thirdparty/Tao/Tao.OpenAl.dll -gacutil -i /usr/share/openra/thirdparty/Tao/Tao.OpenGl.dll -gacutil -i /usr/share/openra/thirdparty/Tao/Tao.Sdl.dll +start_directory=$( pwd ) +cd /tmp + +anw=`zenity --question --text "Download and install RA packages?"; echo $?` +if [ $anw = 0 ] ; then + cd /tmp/ + wget "http://open-ra.org/get-dependency.php?file=ra-packages" -O ra-packages.zip + mkdir -p /usr/share/openra/mods/ra/packages + unzip -f ra-packages.zip -d /usr/share/openra/mods/ra/packages + rm ra-packages.zip + cd $start_directory + else + zenity --info --text "The RA packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=ra-packages \ +to /usr/share/openra/mods/ra/packages before the RA mod will work." + break +fi + + +anw=`zenity --question --text "Download and install C&C packages?"; echo $?` +if [ $anw = 0 ] ; then + cd /tmp/ + wget "http://open-ra.org/get-dependency.php?file=cnc-packages" -O cnc-packages.zip + mkdir -p /usr/share/openra/mods/cnc/packages + unzip -f cnc-packages.zip -d usr/share/openra/mods/cnc/packages + rm cnc-packages.zip + cd $start_directory + else + zenity --info --text "The C&C packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=cnc-packages \ + to /usr/share/openra/mods/cnc/packages before the C&C mod will work." + break +fi + +gacutil -i /usr/share/openra/thirdparty/Tao/Tao.Cg.dll +gacutil -i /usr/share/openra/thirdparty/Tao/Tao.FreeType.dll +gacutil -i /usr/share/openra/thirdparty/Tao/Tao.OpenAl.dll +gacutil -i /usr/share/openra/thirdparty/Tao/Tao.OpenGl.dll +gacutil -i /usr/share/openra/thirdparty/Tao/Tao.Sdl.dll diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh index 8b91720bfb..3de7778b5e 100644 --- a/packaging/linux/deb/buildpackage.sh +++ b/packaging/linux/deb/buildpackage.sh @@ -1,56 +1,57 @@ -#!/bin/bash -ARGS=8 -E_BADARGS=85 - -if [ $# -ne "$ARGS" ] -then - echo "Usage: `basename $0` ftp-server ftp-path username password version src-dir temp-packaging-dir" - exit $E_BADARGS -fi - -PKGVERSION=`echo $5 | sed "s/-/\\./g"` - -# Delete lines and insert updated ones for version -sed -i '2,2 d' ./DEBIAN/control -sed -i '11,11 i\Version: $PKGVERSION' ./DEBIAN/control -sed -i '1,1 d' ./DEBIAN/changelog -sed -i '1,1 i\openra ($PKGVERSION) unstable; urgency=low' ./DEBIAN/changelog - -# Get the size needed for the Installed-Size line and change it -sed -i '5,5 d' ./DEBIAN/control -PACKAGE_SIZE= $( du --apparent-size -c ./usr | grep total | sed 's/[a-z]//g' | sed 's/\ //g') -sed -i '5,5 i\Installed-Size: $PACKAGE_SIZE' ./DEBIAN/control - -# Copy our two needed folders to a clean package directory (yes, this is needed) -cp -R ./DEBIAN $7 -cp -R $6/usr $7 - -# Build it in the package directory, but place the finished deb in our starting directory -BUILD_DIR=$( pwd ) -pushd $7 - -# Calculate md5sums and clean up the /usr/ part of them -md5sum `find . -type f | grep -v '^[.]/DEBIAN/'` >DEBIAN/md5sums -sed -i 's/\.\/usr\//usr\//g' ./DEBIAN/md5sums - -# Start building, the file should appear in directory the script was executed in -dpkg-deb -b . $BUILD_DIR/openra-$PKGVERSION.deb - -# Get back to begin directory - -popd - -# Get package file and dump it on ftp - -PACKAGEFILE=openra-$PKGVERSION.deb -size=`stat -c "%s" $PACKAGEFILE` - -echo "$5,$size,$PACKAGEFILE" > /tmp/deblatest.txt - -wput $PACKAGEFILE "ftp://$3:$4@$1/$2/" -cd /tmp -wput -u deblatest.txt "ftp://$3:$4@$1/$2/" - -# remove temp-packaging-dir - +#!/bin/bash +ARGS=7 +E_BADARGS=85 + +if [ $# -ne "$ARGS" ] +then + echo "Usage: `basename $0` ftp-server ftp-path username password version src-dir temp-packaging-dir" + exit $E_BADARGS +fi + +PKGVERSION=`echo $5 | sed "s/-/\\./g"` + +# Delete lines and insert updated ones for version +sed -i '2,2 d' DEBIAN/control +sed -i "2,2 i\Version: $PKGVERSION" DEBIAN/control +sed -i '1,1 d' DEBIAN/changelog +sed -i "1,1 i\openra ($PKGVERSION) unstable; urgency=low" DEBIAN/changelog + +# Get the size needed for the Installed-Size line and change it +sed -i '6,6 d' DEBIAN/control +PACKAGE_SIZE=`du --apparent-size -c $6/usr | grep total | sed 's/[a-z]//g' | sed 's/\ //g'` +sed -i "6,6 i\Installed-Size: $PACKAGE_SIZE" DEBIAN/control + +# Copy our two needed folders to a clean package directory (yes, this is needed) +mkdir $7 +cp -R DEBIAN $7 +cp -R $6/usr $7 + +# Build it in the package directory, but place the finished deb in our starting directory +BUILD_DIR=$( pwd ) +pushd $7 + +# Calculate md5sums and clean up the /usr/ part of them +md5sum `find . -type f | grep -v '^[.]/DEBIAN/'` >DEBIAN/md5sums +sed -i 's/\.\/usr\//usr\//g' DEBIAN/md5sums + +# Start building, the file should appear in directory the script was executed in +dpkg-deb -b . $BUILD_DIR/openra-$PKGVERSION.deb + +# Get back to begin directory + +popd + +# Get package file and dump it on ftp + +PACKAGEFILE=openra-$PKGVERSION.deb +size=`stat -c "%s" $PACKAGEFILE` + +echo "$5,$size,$PACKAGEFILE" > /tmp/deblatest.txt + +wput $PACKAGEFILE "ftp://$3:$4@$1/$2/" +cd /tmp +wput -u deblatest.txt "ftp://$3:$4@$1/$2/" + +# remove temp-packaging-dir + rm -rf $7 diff --git a/packaging/package-all.sh b/packaging/package-all.sh index 8090d4a1f3..5e9130c826 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -75,6 +75,15 @@ if [ $? -ne 0 ]; then fi popd &> /dev/null +#deb +msg "\E[34m" "Building deb package." +pushd linux/deb/ &> /dev/null +./buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSION" ~/openra-package/built ~/debpackage &> package.log +if [ $? -ne 0 ]; then + msg "\E[31m" "Package build failed, refer to log." +fi +popd &> /dev/null + #OSX msg "\E[34m" "Building OSX package." pushd osx/ &>/dev/null