r12091 - packages/trunk/0ad/debian

Wed Apr 6 08:16:18 UTC 2011

Author: vincentc-guest
Date: 2011-04-06 08:16:08 +0000 (Wed, 06 Apr 2011)
New Revision: 12091

Added:
   packages/trunk/0ad/debian/install
Removed:
   packages/trunk/0ad/debian/0ad.install
Modified:
   packages/trunk/0ad/debian/0ad.6
   packages/trunk/0ad/debian/changelog
   packages/trunk/0ad/debian/control
   packages/trunk/0ad/debian/copyright
   packages/trunk/0ad/debian/rules
Log:
[svn-inject] Applying Debian modifications (0~r09049~alpha4-1) to trunk

Modified: packages/trunk/0ad/debian/0ad.6
===================================================================

--- packages/trunk/0ad/debian/0ad.6	2011-04-05 19:03:35 UTC (rev 12090)
+++ packages/trunk/0ad/debian/0ad.6	2011-04-06 08:16:08 UTC (rev 12091)
@@ -1,4 +1,4 @@
-.TH 0AD SECTION "April 7, 2010"
+.TH 0AD "6" "April 7, 2010"
 .SH NAME
 0ad \- A real-time strategy game of ancient warfare
 .SH SYNOPSIS
@@ -39,7 +39,7 @@
 .SH SEE ALSO
 /usr/share/doc/0ad/
 .br
-http://wildfiregames.com/0ad/
+http://www.wildfiregames.com/0ad/
 .SH AUTHOR
 0ad was written by the 0 A.D. Team.
 .PP
@@ -50,4 +50,4 @@
 published by the Free Software Foundation.
 .PP
 On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL.
+can be found in /usr/share/common-licenses/GPL-2.

Deleted: packages/trunk/0ad/debian/0ad.install
===================================================================
--- packages/trunk/0ad/debian/0ad.install	2011-04-05 19:03:35 UTC (rev 12090)
+++ packages/trunk/0ad/debian/0ad.install	2011-04-06 08:16:08 UTC (rev 12091)
@@ -1,11 +0,0 @@
-usr/games/0ad
-usr/games/pyrogenesis
-usr/lib/games/0ad/libAtlasUI.so
-usr/lib/games/0ad/libCollada.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

Modified: packages/trunk/0ad/debian/changelog
===================================================================
--- packages/trunk/0ad/debian/changelog	2011-04-05 19:03:35 UTC (rev 12090)
+++ packages/trunk/0ad/debian/changelog	2011-04-06 08:16:08 UTC (rev 12091)
@@ -1,5 +1,5 @@
 0ad (0~r09049~alpha4-1) unstable; urgency=low
 
-  * Initial release (Closes: #594800, #594802)
+  * Initial release (Closes: #594800)
 
  -- Vincent Cheng <Vincentc1208 at gmail.com>  Wed, 30 Mar 2011 18:27:31 -0700

Modified: packages/trunk/0ad/debian/control
===================================================================
--- packages/trunk/0ad/debian/control	2011-04-05 19:03:35 UTC (rev 12090)
+++ packages/trunk/0ad/debian/control	2011-04-06 08:16:08 UTC (rev 12091)
@@ -1,7 +1,8 @@
 Source: 0ad
 Section: games
 Priority: optional
-Maintainer: Vincent Cheng <Vincentc1208 at gmail.com>
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders: Vincent Cheng <Vincentc1208 at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~),
  pkg-config,
  autoconf,
@@ -29,11 +30,11 @@
  zip,
  python
 Standards-Version: 3.9.1
-Homepage: http://wildfiregames.com/0ad/
+Homepage: http://www.wildfiregames.com/0ad/
 
 Package: 0ad
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, 0ad-data
+Depends: ${shlibs:Depends}, ${misc:Depends}, gamin, 0ad-data
 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
@@ -41,25 +42,12 @@
  state-of-the-art 3D graphics, detailed artwork, sound, and a flexible and
  powerful custom-built game engine.
 
-Package: 0ad-data
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: 0ad
-Description: 3D real-time strategy (RTS) game of ancient warfare (data files)
- Historically-based war/economy game that allows players to relive or
- rewrite the history of Western civilizations, focusing on the years
- between 500 B.C. and 500 A.D. The project is highly ambitious, involving
- state-of-the-art 3D graphics, detailed artwork, sound, and a flexible and
- powerful custom-built game engine.
- .
- This package contains the data files required by 0 A.D.
-
 Package: 0ad-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, 0ad (= ${binary:Version})
-Description: 3D real-time strategy (RTS) game of ancient warfare
+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
  between 500 B.C. and 500 A.D. The project is highly ambitious, involving

Modified: packages/trunk/0ad/debian/copyright
===================================================================
--- packages/trunk/0ad/debian/copyright	2011-04-05 19:03:35 UTC (rev 12090)
+++ packages/trunk/0ad/debian/copyright	2011-04-06 08:16:08 UTC (rev 12091)
@@ -6,6 +6,10 @@
 Copyright: 2011 Vincent Cheng <Vincentc1208 at gmail.com>
 License: GPL-2+
 
+Files: debian/0ad.6
+Copyright: 2010 Fabio Pedretti <fabio.ped at libero.it>
+License: GPL-2+
+
 Files: source/*
 Copyright: 2010 Wildfire Games
 License: GPL-2+

Added: packages/trunk/0ad/debian/install
===================================================================
--- packages/trunk/0ad/debian/install	                        (rev 0)
+++ packages/trunk/0ad/debian/install	2011-04-06 08:16:08 UTC (rev 12091)
@@ -0,0 +1,11 @@
+usr/games/0ad
+usr/games/pyrogenesis
+usr/lib/games/0ad/libAtlasUI.so
+usr/lib/games/0ad/libCollada.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

Modified: packages/trunk/0ad/debian/rules
===================================================================
--- packages/trunk/0ad/debian/rules	2011-04-05 19:03:35 UTC (rev 12090)
+++ packages/trunk/0ad/debian/rules	2011-04-06 08:16:08 UTC (rev 12091)
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
 %:
 	dh $@ 
 
@@ -33,9 +36,5 @@
 	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
 
-	# Add here commands to install the package into debian/0ad-data
-	mkdir -p $(CURDIR)/debian/0ad-data/usr/share/games
-	mv binaries/data $(CURDIR)/debian/0ad-data/usr/share/games/0ad
-
 override_dh_strip:
 	dh_strip -p 0ad --dbg-package=0ad-dbg


