Author: gilbert-guest
Date: 2010-05-08 15:18:05 +0000 (Sat, 08 May 2010)
New Revision: 10972
Modified:
packages/trunk/alien-arena-data/debian/changelog
packages/trunk/alien-arena-data/debian/control
packages/trunk/alien-arena/debian/alien-arena-get-orig-source
packages/trunk/alien-arena/debian/alien-arena-server.docs
packages/trunk/alien-arena/debian/changelog
packages/trunk/alien-arena/debian/patches/series
Log:
alien-arena 7.40-1
Modified: packages/trunk/alien-arena/debian/alien-arena-get-orig-source
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena-get-orig-source
2010-05-08 15:17:21 UTC (rev 10971)
+++ packages/trunk/alien-arena/debian/alien-arena-get-orig-source
2010-05-08 15:18:05 UTC (rev 10972)
@@ -3,130 +3,107 @@
# This script is used to generate the alien-arena orig tarball that can be
# distributed through Debian.
-ALIEN_ARENA_TARBALL="alienarena2008-linux20080227.zip"
-ALIEN_ARENA_VERSION="7.0"
-CORRECT_CHECKSUM="5fcb17a65e220b1aad5ec25f97b35932"
+ALIEN_ARENA_TARBALL="alienarena-linux20100504.zip"
+ALIEN_ARENA_VERSIONA="7_40"
+ALIEN_ARENA_VERSION=`echo $ALIEN_ARENA_VERSIONA | sed s/_/./g`
-USAGE="\
-alien-arena orig tarball download script\n\
-This script will generate an orig tarball that's distrubeted through Debian.\n\
-Usage: alien-arena-get-orig-source [OPTION]\n\
-\n\
- -h, --help Display this text\n\
---keep-upstream Don't delete the upstream source tarball\n\
---keep-orig-dir Don't delete the orig directory\n"
+USAGE="""alien-arena orig tarball download script
+This script will generate an orig tarball that's distrubeted through Debian.
+Usage: alien-arena-get-orig-source [OPTION]
+ -h, --help Display this text
+--keep-temp-dir Don't delete the temporary working directory"""
+
while [ "$#" -gt "0" ]
do
case "$1" in
-h|--help)
- echo -e "${USAGE}"
+ echo "$USAGE"
exit 1
;;
- --keep-upstream-tarball)
- KEEP_UPSTREAM_TARBALL=1
- shift
+ --keep-temp-dir)
+ KEEP_TEMP_DIR=1
;;
- --keep-orig-dir)
- KEEP_ORIG_DIR=1
- shift
- ;;
esac
+ shift
done
+# Download upstream zip file
if [ ! -f $ALIEN_ARENA_TARBALL ] ; then
- # Download upstream zip file
wget -c http://icculus.org/alienarena/Files/$ALIEN_ARENA_TARBALL
echo "Downloaded upstream zip file."
fi
-# Verify the checksum
-echo -n "Verifying MD5 checksum..."
-COMPUTED_CHECKSUM=`md5sum $ALIEN_ARENA_TARBALL | cut -d ' ' -f 1`
-echo "done."
+CURR_DIR="$(pwd)"
+TEMP_DIR="$(mktemp -d)"
+cd $TEMP_DIR
+echo "Working in $TEMP_DIR (use '--keep-temp-dir' to keep it)."
-if [ $CORRECT_CHECKSUM != $COMPUTED_CHECKSUM ] ; then
- echo "Checksum verification failed. Checksum was $COMPUTED_CHECKSUM
-Expected checksum $CORRECT_CHECKSUM"
- exit 1
-else
- echo "Checksum verified. Checksum is $COMPUTED_CHECKSUM."
-fi
-
# Prepare the alien-arena orig tarball
-if [ ! -d alienarena2008 ]; then
+if [ ! -d alienarena$ALIEN_ARENA_VERSIONA ]; then
echo -n "Extracting $ALIEN_ARENA_TARBALL..."
- unzip -qq $ALIEN_ARENA_TARBALL
+ unzip -qq $CURR_DIR/$ALIEN_ARENA_TARBALL
echo "done."
else
- echo "Already found extracted alienarena2008 directory. Please remove
-or move alienarena2008 and alien-arena-$ALIEN_ARENA_VERSION directories and
also alien-arena_$ALIEN_ARENA_VERSION.orig.tar.gz."
+ echo "Already found extracted alienarena directory. Please remove or
move alienarena$ALIEN_ARENA_VERSIONA."
exit 1
fi
-if [ ! -d alien-arena-$ALIEN_ARENA_VERSION ]; then
- echo "Renaming extracted alienarena2008 directory to
alien-arena-$ALIEN_ARENA_VERSION"
- mv alienarena2008 alien-arena-$ALIEN_ARENA_VERSION
-else
- echo "Already found alien-arena-$ALIEN_ARENA_VERSION directory. Please
remove
-or move alienarena2008 and alien-arena-$ALIEN_ARENA_VERSION directories and
also alien-arena_$ALIEN_ARENA_VERSION.orig.tar.gz."
- exit 1
-fi
-# Remove all precompiled binaries
echo "Removing all precompiled binaries"
-rm alien-arena-$ALIEN_ARENA_VERSION/crded
-rm alien-arena-$ALIEN_ARENA_VERSION/crx
-for REMOVE_DLL in `find alien-arena-$ALIEN_ARENA_VERSION -name *.dll`; do
+rm alienarena$ALIEN_ARENA_VERSIONA/crded
+rm alienarena$ALIEN_ARENA_VERSIONA/crx
+for REMOVE_DLL in `find alienarena$ALIEN_ARENA_VERSIONA -name *.dll`; do
rm -r "$REMOVE_DLL"
done
-for REMOVE_SO in `find alien-arena-$ALIEN_ARENA_VERSION -name *.so`; do
+for REMOVE_SO in `find alienarena$ALIEN_ARENA_VERSIONA -name *.so`; do
rm -r "$REMOVE_SO"
done
-for REMOVE_EXE in `find alien-arena-$ALIEN_ARENA_VERSION -name *.exe`; do
+for REMOVE_EXE in `find alienarena$ALIEN_ARENA_VERSIONA -name *.exe`; do
rm -r "$REMOVE_EXE"
done
-for REMOVE_LIB in `find alien-arena-$ALIEN_ARENA_VERSION -name *.lib`; do
+for REMOVE_LIB in `find alienarena$ALIEN_ARENA_VERSIONA -name *.lib`; do
rm -r "$REMOVE_LIB"
done
-# Removing other non-distributable components
echo "Removing non-distributable components"
-for REMOVE_ICO in `find alien-arena-$ALIEN_ARENA_VERSION -name *.ico`; do
+for REMOVE_ICO in `find alienarena$ALIEN_ARENA_VERSIONA -name *.ico`; do
rm -r "$REMOVE_ICO"
done
-for REMOVE_BAT in `find alien-arena-$ALIEN_ARENA_VERSION -name *.bat`; do
+for REMOVE_BAT in `find alienarena$ALIEN_ARENA_VERSIONA -name *.bat`; do
rm -r "$REMOVE_BAT"
done
-for REMOVE_DSP in `find alien-arena-$ALIEN_ARENA_VERSION -name *.dsp`; do
+for REMOVE_DSP in `find alienarena$ALIEN_ARENA_VERSIONA -name *.dsp`; do
rm -r "$REMOVE_DSP"
done
-for REMOVE_DSW in `find alien-arena-$ALIEN_ARENA_VERSION -name *.dsw`; do
+for REMOVE_DSW in `find alienarena$ALIEN_ARENA_VERSIONA -name *.dsw`; do
rm -r "$REMOVE_DSW"
done
-# Remove components distributed through alien-arena package
-echo -n "Removing components distributed through alien-arena-data package..."
-rm -r alien-arena-$ALIEN_ARENA_VERSION/arena
-rm -r alien-arena-$ALIEN_ARENA_VERSION/botinfo
-rm -r alien-arena-$ALIEN_ARENA_VERSION/data1
-echo "done."
+echo "Removing executable bit from files that shouldn't have it set"
+find alienarena$ALIEN_ARENA_VERSIONA/arena ! -type d -exec chmod -x {} \;
+find alienarena$ALIEN_ARENA_VERSIONA/botinfo ! -type d -exec chmod -x {} \;
+find alienarena$ALIEN_ARENA_VERSIONA/data1 ! -type d -exec chmod -x {} \;
+find alienarena$ALIEN_ARENA_VERSIONA/docs ! -type d -exec chmod -x {} \;
+find alienarena$ALIEN_ARENA_VERSIONA/source ! -type d -exec chmod -x {} \;
-# Create the tarball
-if [ ! -f alien-arena_$ALIEN_ARENA_VERSION.orig.tar.gz ]; then
- echo "Creating orig tarball."
- tar -czf alien-arena_$ALIEN_ARENA_VERSION.orig.tar.gz
alien-arena-$ALIEN_ARENA_VERSION/
- if [ ! -n "$KEEP_ORIG_DIR" ]; then
- echo -n "Removing orig directory..."
- rm -rf alien-arena-$ALIEN_ARENA_VERSION/
- echo "done."
- fi
- if [ ! -n "$KEEP_UPSTREAM_TARBALL" ]; then
- echo -n "Removing upstream tarball..."
- rm $ALIEN_ARENA_TARBALL
- echo "done."
- fi
-else
- echo "Already found orig tarball. Please remove or move
-alien-arena_$ALIEN_ARENA_VERSION.orig.tar.gz."
- exit 1
+echo "Moving free alien arena data to alien-arena-$ALIEN_ARENA_VERSION"
+mv alienarena$ALIEN_ARENA_VERSIONA alien-arena-$ALIEN_ARENA_VERSION
+
+echo "Moving non-free alien arena data to
alien-arena-data-$ALIEN_ARENA_VERSION"
+mkdir alien-arena-data-$ALIEN_ARENA_VERSION
+mv alien-arena-$ALIEN_ARENA_VERSION/arena alien-arena-data-$ALIEN_ARENA_VERSION
+mv alien-arena-$ALIEN_ARENA_VERSION/botinfo
alien-arena-data-$ALIEN_ARENA_VERSION
+mv alien-arena-$ALIEN_ARENA_VERSION/data1 alien-arena-data-$ALIEN_ARENA_VERSION
+cp -r alien-arena-$ALIEN_ARENA_VERSION/docs
alien-arena-data-$ALIEN_ARENA_VERSION
+
+echo "Creating alien-arena_$ALIEN_ARENA_VERSION.orig.tar.gz"
+tar -czf $CURR_DIR/alien-arena_$ALIEN_ARENA_VERSION.orig.tar.gz
alien-arena-$ALIEN_ARENA_VERSION/
+
+echo "Creating alien-arena-data_$ALIEN_ARENA_VERSION.orig.tar.gz"
+tar -czf $CURR_DIR/alien-arena-data_$ALIEN_ARENA_VERSION.orig.tar.gz
alien-arena-data-$ALIEN_ARENA_VERSION/
+
+if [ ! -n "$KEEP_TEMP_DIR" ]; then
+ echo -n "Removing $TEMP_DIR..."
+ rm -rf $TEMP_DIR
+ echo "done."
fi
Modified: packages/trunk/alien-arena/debian/alien-arena-server.docs
===================================================================
--- packages/trunk/alien-arena/debian/alien-arena-server.docs 2010-05-08
15:17:21 UTC (rev 10971)
+++ packages/trunk/alien-arena/debian/alien-arena-server.docs 2010-05-08
15:18:05 UTC (rev 10972)
@@ -1,2 +1,2 @@
-Tools/LinuxScripts/README
+Tools/LinuxScripts/readme
docs
Modified: packages/trunk/alien-arena/debian/changelog
===================================================================
--- packages/trunk/alien-arena/debian/changelog 2010-05-08 15:17:21 UTC (rev
10971)
+++ packages/trunk/alien-arena/debian/changelog 2010-05-08 15:18:05 UTC (rev
10972)
@@ -1,3 +1,19 @@
+alien-arena (7.40-1) unstable; urgency=low
+
+ * New upstream release
+ - Five new maps!
+ - Two new weapon models.
+ - Improvements to the renderer.
+ - A variety of gameplay changes and tweaks.
+ - Antilag bugfixes.
+ - Revamped menu.
+ * Drop security patches (all of them have been applied upstream now).
+ * The watch file is currently broken and unfixable due to upstream's file
+ naming scheme for this version (they have indicated that they will fix
+ this in future releases).
+
+ -- Michael Gilbert <[email protected]> Fri, 07 May 2010 22:09:24
-0400
+
alien-arena (7.33-6) unstable; urgency=high
* Fix a client buffer overflow vulnerability.
Modified: packages/trunk/alien-arena/debian/patches/series
===================================================================
--- packages/trunk/alien-arena/debian/patches/series 2010-05-08 15:17:21 UTC
(rev 10971)
+++ packages/trunk/alien-arena/debian/patches/series 2010-05-08 15:18:05 UTC
(rev 10972)
@@ -2,7 +2,4 @@
kill-runaway-crded_tool_debianization.patch
rcon_tool_debianization.patch
home_as_game_dir.patch
-fix-CVE-2007-4754-CVE-2007-4755.patch
-fix-server-dos.patch
-fix-client-buffer-overflow.patch
makefile_modifications.patch
Modified: packages/trunk/alien-arena-data/debian/changelog
===================================================================
--- packages/trunk/alien-arena-data/debian/changelog 2010-05-08 15:17:21 UTC
(rev 10971)
+++ packages/trunk/alien-arena-data/debian/changelog 2010-05-08 15:18:05 UTC
(rev 10972)
@@ -1,3 +1,18 @@
+alien-arena-data (7.40-1) unstable; urgency=low
+
+ * New upstream release
+ - Five new maps!
+ - Two new weapon models.
+ - Improvements to the renderer.
+ - Security and memory bugfixes.
+ - A variety of gameplay changes and tweaks.
+ - Antilag bugfixes.
+ - Revamped menu.
+ * Update standards version to 3.8.4 (no changes required).
+ * Use source format version 3.0 (native).
+
+ -- Michael Gilbert <[email protected]> Fri, 07 May 2010 17:50:58
-0400
+
alien-arena-data (7.33-1) unstable; urgency=low
* New upstream release.
Modified: packages/trunk/alien-arena-data/debian/control
===================================================================
--- packages/trunk/alien-arena-data/debian/control 2010-05-08 15:17:21 UTC
(rev 10971)
+++ packages/trunk/alien-arena-data/debian/control 2010-05-08 15:18:05 UTC
(rev 10972)
@@ -4,7 +4,7 @@
Maintainer: Debian Games Team <[email protected]>
Uploaders: Michael Gilbert <[email protected]>, Barry deFreese
<[email protected]>
Build-Depends: debhelper (>= 5)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://red.planetarena.org
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/alien-arena-data/
Vcs-Browser:
http://svn.debian.org/wsvn/pkg-games/packages/trunk/alien-arena-data/?op=log
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
