r13774 - in packages/trunk/0ad/debian: . patches
Vincent Cheng
vincentc-guest at alioth.debian.org
Thu Sep 13 20:25:56 UTC 2012
Author: vincentc-guest
Date: 2012-09-13 20:25:54 +0000 (Thu, 13 Sep 2012)
New Revision: 13774
Modified:
packages/trunk/0ad/debian/changelog
packages/trunk/0ad/debian/control
packages/trunk/0ad/debian/patches/enable-hardening-relro.patch
packages/trunk/0ad/debian/patches/fix-bindir.patch
packages/trunk/0ad/debian/patches/fix-kfreebsd-ftbfs.patch
packages/trunk/0ad/debian/rules
packages/trunk/0ad/debian/watch
Log:
0ad: Upload to version 0.0.11-1 (alpha 11)
Modified: packages/trunk/0ad/debian/changelog
===================================================================
--- packages/trunk/0ad/debian/changelog 2012-09-12 12:14:34 UTC (rev 13773)
+++ packages/trunk/0ad/debian/changelog 2012-09-13 20:25:54 UTC (rev 13774)
@@ -1,3 +1,18 @@
+0ad (0.0.11-1) unstable; urgency=low
+
+ * New upstream release. (Alpha 11 Kronos)
+ - Upstream disabled FAM support as of svn r12550, so remove build-depends
+ on libgamin-dev, and remove depends on gamin | fam. (Closes: #679087)
+ - Refresh existing patches.
+ * Add fallback to launcher script when /usr/games is not in $PATH.
+ (Closes: #679033)
+ * Restrict list of architectures to i386, amd64, and kfreebsd-{i386,amd64}.
+ (Closes: #683282)
+ * Update debian/watch file.
+ * Add DMUA field in debian/control with agreement of sponsor.
+
+ -- Vincent Cheng <Vincentc1208 at gmail.com> Sat, 08 Sep 2012 02:43:25 -0700
+
0ad (0~r11863-2) unstable; urgency=low
* Add stricter dependency on 0ad-data. (Closes: #673526)
Modified: packages/trunk/0ad/debian/control
===================================================================
--- packages/trunk/0ad/debian/control 2012-09-12 12:14:34 UTC (rev 13773)
+++ packages/trunk/0ad/debian/control 2012-09-13 20:25:54 UTC (rev 13774)
@@ -12,7 +12,6 @@
libboost-signals-dev,
libcurl4-gnutls-dev | libcurl4-dev,
libenet-dev (>= 1.3),
- libgamin-dev,
libjpeg-dev,
libmozjs185-dev,
libnvtt-dev,
@@ -27,17 +26,17 @@
pkg-config,
zlib1g-dev
Standards-Version: 3.9.3
+DM-Upload-Allowed: yes
Homepage: http://www.wildfiregames.com/0ad/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/0ad/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/0ad/
Package: 0ad
-Architecture: any
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
Pre-Depends: dpkg (>= 1.15.6~)
Depends:
0ad-data (>= ${source:Upstream-Version}),
0ad-data (<= ${source:Version}),
- gamin | fam,
${misc:Depends},
${shlibs:Depends}
Description: Real-time strategy game of ancient warfare
@@ -52,7 +51,7 @@
Package: 0ad-dbg
Section: debug
Priority: extra
-Architecture: any
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
Pre-Depends: dpkg (>= 1.15.6~)
Depends: 0ad (= ${binary:Version}), ${misc:Depends}
Description: Real-time strategy game of ancient warfare (debug)
Modified: packages/trunk/0ad/debian/patches/enable-hardening-relro.patch
===================================================================
--- packages/trunk/0ad/debian/patches/enable-hardening-relro.patch 2012-09-12 12:14:34 UTC (rev 13773)
+++ packages/trunk/0ad/debian/patches/enable-hardening-relro.patch 2012-09-13 20:25:54 UTC (rev 13774)
@@ -3,16 +3,16 @@
"hardening-no-relro".
Forwarded: http://trac.wildfiregames.com/ticket/1416
Author: Vincent Cheng <Vincentc1208 at gmail.com>
-Last-Update: 05-16-2012
+Last-Update: 2012-09-08
--- a/build/premake/premake4.lua
+++ b/build/premake/premake4.lua
-@@ -246,7 +246,7 @@
- end
+@@ -248,7 +248,7 @@
+ end
- if os.is("linux") or os.is("bsd") then
-- linkoptions { "-Wl,--no-undefined", "-Wl,--as-needed" }
-+ linkoptions { "-Wl,--no-undefined", "-Wl,--as-needed", "-Wl,-z,relro" }
- end
+ if os.is("linux") or os.is("bsd") then
+- linkoptions { "-Wl,--no-undefined", "-Wl,--as-needed" }
++ linkoptions { "-Wl,--no-undefined", "-Wl,--as-needed", "-Wl,-z,relro" }
+ end
- if _OPTIONS["coverage"] then
+ if arch == "x86" then
Modified: packages/trunk/0ad/debian/patches/fix-bindir.patch
===================================================================
--- packages/trunk/0ad/debian/patches/fix-bindir.patch 2012-09-12 12:14:34 UTC (rev 13773)
+++ packages/trunk/0ad/debian/patches/fix-bindir.patch 2012-09-13 20:25:54 UTC (rev 13774)
@@ -4,17 +4,20 @@
value.
Forwarded: http://trac.wildfiregames.com/ticket/492#comment:16
Author: Vincent Cheng <Vincentc1208 at gmail.com>
-Last-Update: 2012-05-16
+Last-Update: 2012-09-08
--- a/build/resources/0ad.sh
+++ b/build/resources/0ad.sh
-@@ -1,3 +1,9 @@
+@@ -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
Modified: packages/trunk/0ad/debian/patches/fix-kfreebsd-ftbfs.patch
===================================================================
--- packages/trunk/0ad/debian/patches/fix-kfreebsd-ftbfs.patch 2012-09-12 12:14:34 UTC (rev 13773)
+++ packages/trunk/0ad/debian/patches/fix-kfreebsd-ftbfs.patch 2012-09-13 20:25:54 UTC (rev 13774)
@@ -2,36 +2,18 @@
Link with -ldl instead of -lexecinfo on kfreebsd to fix FTBFS.
Forwarded: http://trac.wildfiregames.com/ticket/1322
Author: Vincent Cheng <Vincentc1208 at gmail.com>
-Last-Update: 2012-05-17
+Last-Update: 2012-09-08
--- a/build/premake/premake4.lua
+++ b/build/premake/premake4.lua
-@@ -782,7 +782,7 @@
- elseif os.is("bsd") then
- links {
- -- Needed for backtrace* on FreeBSD
-- "execinfo",
-+ -- "execinfo",
- }
+@@ -1040,6 +1040,10 @@
+ links { "c", }
end
-@@ -1016,6 +1016,10 @@
- elseif os.is("bsd") then
- -- define BSD-something?
-
-+ links {
-+ "dl",
-+ }
++ if os.getversion().description == "GNU/kFreeBSD" then
++ links { "dl", }
++ end
+
buildoptions { "-fno-strict-aliasing" }
buildoptions { "-rdynamic" }
-@@ -1197,7 +1201,7 @@
- elseif os.is("bsd") then
- links {
- -- Needed for backtrace* on FreeBSD
-- "execinfo",
-+ -- "execinfo",
- }
- end
-
Modified: packages/trunk/0ad/debian/rules
===================================================================
--- packages/trunk/0ad/debian/rules 2012-09-12 12:14:34 UTC (rev 13773)
+++ packages/trunk/0ad/debian/rules 2012-09-13 20:25:54 UTC (rev 13774)
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+export NUMJOBS=$(shell getconf _NPROCESSORS_ONLN)
+
%:
dh $@ --parallel
@@ -20,10 +22,11 @@
--datadir=/usr/share/games/0ad \
--with-system-enet \
--with-system-nvtt \
- --with-system-mozjs185
+ --with-system-mozjs185 \
+ --without-fam
+
+ $(MAKE) config=release -j$(NUMJOBS) -C build/workspaces/gcc
- $(MAKE) config=release -C build/workspaces/gcc
-
override_dh_auto_test:
# Note: Avoid running tests from root dir of build, otherwise certain
# tests (i.e. in testsuite MeshManager) may not work as intended and
Modified: packages/trunk/0ad/debian/watch
===================================================================
--- packages/trunk/0ad/debian/watch 2012-09-12 12:14:34 UTC (rev 13773)
+++ packages/trunk/0ad/debian/watch 2012-09-13 20:25:54 UTC (rev 13774)
@@ -1,3 +1,2 @@
version=3
-opts="dversionmangle=s/0\~r([\d]+).*/$1/" \
-http://releases.wildfiregames.com/0ad-r([\d]+)-.*-unix-build\.tar\.xz
+http://releases.wildfiregames.com/0ad-([\d\.]+)-.*-unix-build\.tar\.xz
More information about the Pkg-games-commits
mailing list