Author: vincentc-guest Date: 2013-09-07 01:24:05 +0000 (Sat, 07 Sep 2013) New Revision: 14544
Removed: packages/trunk/0ad/debian/patches/boost-libnames.patch packages/trunk/0ad/debian/patches/fix-bindir.patch Modified: packages/trunk/0ad/debian/changelog packages/trunk/0ad/debian/patches/enable-hardening-relro.patch packages/trunk/0ad/debian/patches/series Log: 0ad: Update to release 0.0.14-1 Modified: packages/trunk/0ad/debian/changelog =================================================================== --- packages/trunk/0ad/debian/changelog 2013-09-04 19:27:25 UTC (rev 14543) +++ packages/trunk/0ad/debian/changelog 2013-09-07 01:24:05 UTC (rev 14544) @@ -1,3 +1,11 @@ +0ad (0.0.14-1) unstable; urgency=low + + * New upstream release. + - Remove fix-bindir.patch, boost-libnames.patch; applied/fixed upstream. + - Refresh remaining patches. + + -- Vincent Cheng <[email protected]> Thu, 05 Sep 2013 20:02:20 -0700 + 0ad (0.0.13-2) unstable; urgency=low * Add boost-libnames.patch to fix FTBFS with boost 1.53. (Closes: #709570) Deleted: packages/trunk/0ad/debian/patches/boost-libnames.patch =================================================================== --- packages/trunk/0ad/debian/patches/boost-libnames.patch 2013-09-04 19:27:25 UTC (rev 14543) +++ packages/trunk/0ad/debian/patches/boost-libnames.patch 2013-09-07 01:24:05 UTC (rev 14544) @@ -1,25 +0,0 @@ -Description: Don't look for -mt libs anymore with boost >= 1.53 -Author: Adam Conrad <[email protected]> -Forwarded: http://trac.wildfiregames.com/ticket/1938 -Last-Update: 2013-03-24 - ---- a/build/premake/extern_libs4.lua -+++ b/build/premake/extern_libs4.lua -@@ -242,7 +242,7 @@ - -- The following are not strictly link dependencies on all systems, but - -- are included for compatibility with different versions of Boost - android_names = { "boost_filesystem-gcc-mt", "boost_system-gcc-mt" }, -- unix_names = { "boost_filesystem-mt", "boost_system-mt" }, -+ unix_names = { "boost_filesystem", "boost_system" }, - bsd_names = { "boost_filesystem", "boost_system" }, - }) - end, -@@ -251,7 +251,7 @@ - link_settings = function() - add_default_links({ - android_names = { "boost_signals-gcc-mt" }, -- unix_names = { "boost_signals-mt" }, -+ unix_names = { "boost_signals" }, - bsd_names = { "boost_signals" }, - }) - end, Modified: packages/trunk/0ad/debian/patches/enable-hardening-relro.patch =================================================================== --- packages/trunk/0ad/debian/patches/enable-hardening-relro.patch 2013-09-04 19:27:25 UTC (rev 14543) +++ packages/trunk/0ad/debian/patches/enable-hardening-relro.patch 2013-09-07 01:24:05 UTC (rev 14544) @@ -3,11 +3,11 @@ "hardening-no-relro". Forwarded: http://trac.wildfiregames.com/ticket/1416 Author: Vincent Cheng <[email protected]> -Last-Update: 2013-04-02 +Last-Update: 2013-09-05 --- a/build/premake/premake4.lua +++ b/build/premake/premake4.lua -@@ -245,7 +245,7 @@ +@@ -254,7 +254,7 @@ end if os.is("linux") or os.is("bsd") then Deleted: packages/trunk/0ad/debian/patches/fix-bindir.patch =================================================================== --- packages/trunk/0ad/debian/patches/fix-bindir.patch 2013-09-04 19:27:25 UTC (rev 14543) +++ packages/trunk/0ad/debian/patches/fix-bindir.patch 2013-09-07 01:24:05 UTC (rev 14544) @@ -1,35 +0,0 @@ -Description: Fix path to 0 A.D. binaries - Modify launcher script to look for pyrogenesis binary in PATH instead of - hardcoding the path, and modify the .desktop file to use a relative Exec= - value. -Forwarded: http://trac.wildfiregames.com/ticket/492#comment:16 -Author: Vincent Cheng <[email protected]> -Last-Update: 2012-09-08 - ---- a/build/resources/0ad.sh -+++ b/build/resources/0ad.sh -@@ -1,3 +1,12 @@ - #!/bin/sh - --/usr/bin/pyrogenesis "$@" -+path_to_pyrogenesis=$(which pyrogenesis) -+if [ -x "$path_to_pyrogenesis" ] ; then -+ "$path_to_pyrogenesis" "$@" -+elif [ -x /usr/games/pyrogenesis ] ; then -+ # Fallback in case /usr/games is not in $PATH; see #679033 -+ /usr/games/pyrogenesis "$@" -+else -+ echo "Error: pyrogenesis cannot be found in $PATH" -+ exit 1 -+fi ---- a/build/resources/0ad.desktop -+++ b/build/resources/0ad.desktop -@@ -3,7 +3,7 @@ - Name=0 A.D. - Comment=A real-time strategy game of ancient warfare - Comment[it]=Videogioco strategico in tempo reale di guerre antiche --Exec=/usr/bin/0ad -+Exec=0ad - Icon=0ad - Terminal=false - Type=Application Modified: packages/trunk/0ad/debian/patches/series =================================================================== --- packages/trunk/0ad/debian/patches/series 2013-09-04 19:27:25 UTC (rev 14543) +++ packages/trunk/0ad/debian/patches/series 2013-09-07 01:24:05 UTC (rev 14544) @@ -1,3 +1 @@ -fix-bindir.patch enable-hardening-relro.patch -boost-libnames.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
