r12597 - in packages/trunk/0ad/debian: . patches
Vincent Cheng
vincentc-guest at alioth.debian.org
Sun Aug 14 06:51:51 UTC 2011
Author: vincentc-guest
Date: 2011-08-14 06:51:51 +0000 (Sun, 14 Aug 2011)
New Revision: 12597
Added:
packages/trunk/0ad/debian/patches/
packages/trunk/0ad/debian/patches/fix-bindir.patch
packages/trunk/0ad/debian/patches/series
Removed:
packages/trunk/0ad/debian/menu
Modified:
packages/trunk/0ad/debian/0ad.install
packages/trunk/0ad/debian/changelog
packages/trunk/0ad/debian/control
packages/trunk/0ad/debian/rules
packages/trunk/0ad/debian/watch
Log:
0ad: Update to alpha 6
Modified: packages/trunk/0ad/debian/0ad.install
===================================================================
--- packages/trunk/0ad/debian/0ad.install 2011-08-13 19:49:03 UTC (rev 12596)
+++ packages/trunk/0ad/debian/0ad.install 2011-08-14 06:51:51 UTC (rev 12597)
@@ -1,12 +1,11 @@
usr/games/0ad
-usr/games/pyrogenesis
-usr/lib/games/0ad/libAtlasUI.so
-usr/lib/games/0ad/libCollada.so
-usr/lib/games/0ad/libenet.so
-usr/lib/games/0ad/libnvtt.so
-usr/lib/games/0ad/libnvcore.so
-usr/lib/games/0ad/libnvmath.so
-usr/lib/games/0ad/libnvimage.so
-usr/lib/games/0ad/libmozjs-ps-release.so
-usr/share/pixmaps/0ad.png
-usr/share/applications/0ad.desktop
+binaries/system/pyrogenesis usr/games/
+binaries/system/libAtlasUI.so usr/lib/games/0ad/
+binaries/system/libCollada.so usr/lib/games/0ad/
+binaries/system/libnvtt.so usr/lib/games/0ad/
+binaries/system/libnvcore.so usr/lib/games/0ad/
+binaries/system/libnvmath.so usr/lib/games/0ad/
+binaries/system/libnvimage.so usr/lib/games/0ad/
+binaries/system/libmozjs-ps-release.so usr/lib/games/0ad/
+build/resources/0ad.png usr/share/pixmaps/
+build/resources/0ad.desktop usr/share/applications/
Modified: packages/trunk/0ad/debian/changelog
===================================================================
--- packages/trunk/0ad/debian/changelog 2011-08-13 19:49:03 UTC (rev 12596)
+++ packages/trunk/0ad/debian/changelog 2011-08-14 06:51:51 UTC (rev 12597)
@@ -1,5 +1,5 @@
-0ad (0~r09786~alpha6-1) UNRELEASED; urgency=low
+0ad (0+r09786-1) unstable; urgency=low
* Initial release (Closes: #594800)
- -- Vincent Cheng <Vincentc1208 at gmail.com> Sun, 10 Jul 2011 19:20:46 -0700
+ -- Vincent Cheng <Vincentc1208 at gmail.com> Sat, 13 Aug 2011 20:13:31 -0700
Modified: packages/trunk/0ad/debian/control
===================================================================
--- packages/trunk/0ad/debian/control 2011-08-13 19:49:03 UTC (rev 12596)
+++ packages/trunk/0ad/debian/control 2011-08-14 06:51:51 UTC (rev 12597)
@@ -7,6 +7,7 @@
pkg-config,
autoconf,
cmake,
+ python,
nasm,
libalut-dev,
libboost-dev,
@@ -14,10 +15,10 @@
libboost-signals-dev,
libcurl3-dev,
libdevil-dev,
- libenet-dev,
+ libenet-dev (>= 1.3),
libgamin-dev,
libglew1.5-dev,
- libjpeg62-dev,
+ libjpeg-dev,
libopenal-dev,
libopenexr-dev,
libogg-dev,
@@ -27,17 +28,14 @@
libwxgtk2.8-dev,
libxml2-dev,
zlib1g-dev,
- zip,
- python
+ zip
Standards-Version: 3.9.2
-Homepage: http://wildfiregames.com/0ad/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/0ad/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/0ad/
+Homepage: http://www.wildfiregames.com/0ad/
Package: 0ad
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gamin,
- 0ad-data (= ${binary:Version})
+ 0ad-data (= ${source:Version})
Description: 3D real-time strategy (RTS) game of ancient warfare
Historically-based war/economy game that allows players to relive or
rewrite the history of Western civilizations, focusing on the years
@@ -49,7 +47,7 @@
Section: debug
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, 0ad (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, 0ad (= ${source:Version})
Description: 3D real-time strategy (RTS) game of ancient warfare (debug)
Historically-based war/economy game that allows players to relive or
rewrite the history of Western civilizations, focusing on the years
Deleted: packages/trunk/0ad/debian/menu
===================================================================
--- packages/trunk/0ad/debian/menu 2011-08-13 19:49:03 UTC (rev 12596)
+++ packages/trunk/0ad/debian/menu 2011-08-14 06:51:51 UTC (rev 12597)
@@ -1,6 +0,0 @@
-?package(0ad):needs="X11" \
- section="Games/Strategy" \
- title="0 A.D." \
- longtitle="3D real-time strategy (RTS) game of ancient warfare" \
- icon="usr/share/pixmaps/0ad.png" \
- command="/usr/games/0ad"
Added: packages/trunk/0ad/debian/patches/fix-bindir.patch
===================================================================
--- packages/trunk/0ad/debian/patches/fix-bindir.patch (rev 0)
+++ packages/trunk/0ad/debian/patches/fix-bindir.patch 2011-08-14 06:51:51 UTC (rev 12597)
@@ -0,0 +1,25 @@
+Description: Fix path to 0 A.D. binaries
+ On Debian systems, game binaries should be installed into /usr/games/ rather
+ than /usr/bin/; this patch fixes this.
+Forwarded: not-needed
+Author: Vincent Cheng <Vincentc1208 at gmail.com>
+Last-Update: 2011-08-13
+
+--- a/build/resources/0ad.sh
++++ b/build/resources/0ad.sh
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-/usr/bin/pyrogenesis "$@"
++/usr/games/pyrogenesis "$@"
+--- 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=/usr/games/0ad
+ Icon=0ad
+ Terminal=false
+ Type=Application
Added: packages/trunk/0ad/debian/patches/series
===================================================================
--- packages/trunk/0ad/debian/patches/series (rev 0)
+++ packages/trunk/0ad/debian/patches/series 2011-08-14 06:51:51 UTC (rev 12597)
@@ -0,0 +1 @@
+fix-bindir.patch
Modified: packages/trunk/0ad/debian/rules
===================================================================
--- packages/trunk/0ad/debian/rules 2011-08-13 19:49:03 UTC (rev 12596)
+++ packages/trunk/0ad/debian/rules 2011-08-14 06:51:51 UTC (rev 12597)
@@ -1,36 +1,27 @@
#!/usr/bin/make -f
+export LDFLAGS=-Wl,--as-needed
+
%:
- dh $@
+ dh $@ --parallel
override_dh_auto_build:
build/workspaces/update-workspaces.sh \
--verbose \
+ --with-system-enet \
--bindir /usr/games \
--libdir /usr/lib/games/0ad \
--datadir /usr/share/games/0ad
- $(MAKE) CONFIG=Release -j2 -C build/workspaces/gcc
+ $(MAKE) CONFIG=Release -C build/workspaces/gcc
override_dh_auto_test:
- LD_LIBRARY_PATH=binaries/system binaries/system/test -libdir binaries/system
+ LD_LIBRARY_PATH=binaries/system binaries/system/test \
+ -libdir binaries/system
override_dh_auto_install:
- install -Dm 0755 binaries/system/pyrogenesis $(CURDIR)/debian/tmp/usr/games/pyrogenesis
- install -Dm 0644 binaries/system/libCollada.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libCollada.so
- install -Dm 0644 binaries/system/libAtlasUI.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libAtlasUI.so
- install -Dm 0644 binaries/system/libnvtt.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libnvtt.so
- install -Dm 0644 binaries/system/libnvcore.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libnvcore.so
- install -Dm 0644 binaries/system/libnvmath.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libnvmath.so
- install -Dm 0644 binaries/system/libnvimage.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libnvimage.so
- install -Dm 0644 binaries/system/libmozjs-ps-release.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libmozjs-ps-release.so
-
- sed -i 's/\/usr\/bin/\/usr\/games/' build/resources/0ad.sh
- sed -i 's/\/usr\/bin/\/usr\/games/' build/resources/0ad.desktop
-
install -Dm 0755 build/resources/0ad.sh $(CURDIR)/debian/tmp/usr/games/0ad
- install -Dm 0644 build/resources/0ad.png $(CURDIR)/debian/tmp/usr/share/pixmaps/0ad.png
- install -Dm 0644 build/resources/0ad.desktop $(CURDIR)/debian/tmp/usr/share/applications/0ad.desktop
+ dh_auto_install
override_dh_strip:
dh_strip -p 0ad --dbg-package=0ad-dbg
Modified: packages/trunk/0ad/debian/watch
===================================================================
--- packages/trunk/0ad/debian/watch 2011-08-13 19:49:03 UTC (rev 12596)
+++ packages/trunk/0ad/debian/watch 2011-08-14 06:51:51 UTC (rev 12597)
@@ -1,3 +1,3 @@
version=3
-opts="dversionmangle=s/0\.0\.0\+r([\d]+).*/$1/" \
-http://releases.wildfiregames.com/0ad-r([\d]+)-.*-unix-build\.tar\.gz
+opts="dversionmangle=s/0\+r([\d]+).*/$1/" \
+http://releases.wildfiregames.com/0ad-r([\d]+)-.*-unix-build\.tar\.xz
More information about the Pkg-games-commits
mailing list