r13438 - in packages/trunk: 0ad/debian 0ad-data/debian

Vincent Cheng vincentc-guest at alioth.debian.org
Thu Mar 29 23:28:56 UTC 2012 

Author: vincentc-guest
Date: 2012-03-29 23:28:54 +0000 (Thu, 29 Mar 2012)
New Revision: 13438

Modified:
   packages/trunk/0ad-data/debian/changelog
   packages/trunk/0ad-data/debian/control
   packages/trunk/0ad-data/debian/install
   packages/trunk/0ad/debian/changelog
   packages/trunk/0ad/debian/control
   packages/trunk/0ad/debian/copyright
   packages/trunk/0ad/debian/install
   packages/trunk/0ad/debian/rules
Log:
0ad, 0ad-data: Add libnvtt-dev as b-d, and other minor updates


Modified: packages/trunk/0ad/debian/changelog
===================================================================
--- packages/trunk/0ad/debian/changelog	2012-03-29 20:09:13 UTC (rev 13437)
+++ packages/trunk/0ad/debian/changelog	2012-03-29 23:28:54 UTC (rev 13438)
@@ -2,4 +2,4 @@
 
   * Initial release (Closes: #594800)
 
- -- Vincent Cheng <Vincentc1208 at gmail.com>  Sat, 17 Mar 2012 00:47:59 -0700
+ -- Vincent Cheng <Vincentc1208 at gmail.com>  Thu, 29 Mar 2012 16:13:33 -0700

Modified: packages/trunk/0ad/debian/control
===================================================================
--- packages/trunk/0ad/debian/control	2012-03-29 20:09:13 UTC (rev 13437)
+++ packages/trunk/0ad/debian/control	2012-03-29 23:28:54 UTC (rev 13438)
@@ -3,13 +3,9 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Vincent Cheng <Vincentc1208 at gmail.com>
-Build-Depends: debhelper (>= 9),
- pkg-config,
- autoconf,
+Build-Depends: autoconf,
  cmake,
- python,
- nasm,
- zip,
+ debhelper (>= 9),
  libalut-dev,
  libboost-dev,
  libboost-filesystem-dev,
@@ -21,14 +17,19 @@
  libglew1.5-dev,
  libjpeg-dev,
  libmozjs185-dev,
+ libnvtt-dev,
+ libogg-dev,
  libopenal-dev,
  libopenexr-dev,
- libogg-dev,
  libpng12-dev,
+ libsdl1.2-dev,
  libvorbis-dev,
- libsdl1.2-dev,
  libwxgtk2.8-dev,
  libxml2-dev,
+ nasm,
+ pkg-config,
+ python,
+ zip,
  zlib1g-dev
 Standards-Version: 3.9.3
 Homepage: http://www.wildfiregames.com/0ad/
@@ -38,10 +39,10 @@
 Package: 0ad
 Architecture: any
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends},
+Depends: 0ad-data (>= ${source:Upstream-Version}),
+ gamin,
  ${misc:Depends},
- gamin,
- 0ad-data (>= ${source:Upstream-Version})
+ ${shlibs:Depends}
 Description: Real-time strategy game of ancient warfare
  0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform
  real-time strategy (RTS) game of ancient warfare. In short, it is a
@@ -56,8 +57,8 @@
 Priority: extra
 Architecture: any
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends},
- 0ad (= ${binary:Version})
+Depends: 0ad (= ${binary:Version}),
+ ${misc:Depends}
 Description: Real-time strategy game of ancient warfare (debug)
  0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform
  real-time strategy (RTS) game of ancient warfare. In short, it is a

Modified: packages/trunk/0ad/debian/copyright
===================================================================
--- packages/trunk/0ad/debian/copyright	2012-03-29 20:09:13 UTC (rev 13437)
+++ packages/trunk/0ad/debian/copyright	2012-03-29 23:28:54 UTC (rev 13438)
@@ -920,7 +920,7 @@
     The Covered Code is a "commercial item," as that term is defined in
     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
     software" and "commercial computer software documentation," as such
-    terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 
+    terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June
     1995), all U.S. Government End Users acquire Covered Code with only
     those rights set forth herein.
@@ -998,4 +998,3 @@
     the notices in the Source Code files of the Original Code. You should
     use the text of this Exhibit A rather than the text found in the
     Original Code Source Code for Your Modifications.
-

Modified: packages/trunk/0ad/debian/install
===================================================================
--- packages/trunk/0ad/debian/install	2012-03-29 20:09:13 UTC (rev 13437)
+++ packages/trunk/0ad/debian/install	2012-03-29 23:28:54 UTC (rev 13438)
@@ -1,10 +1,6 @@
-usr/games/0ad
-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/
-build/resources/0ad.png                         usr/share/pixmaps/
+binaries/system/pyrogenesis                     usr/games/
 build/resources/0ad.desktop                     usr/share/applications/
+build/resources/0ad.png                         usr/share/pixmaps/
+usr/games/0ad

Modified: packages/trunk/0ad/debian/rules
===================================================================
--- packages/trunk/0ad/debian/rules	2012-03-29 20:09:13 UTC (rev 13437)
+++ packages/trunk/0ad/debian/rules	2012-03-29 23:28:54 UTC (rev 13438)
@@ -8,8 +8,9 @@
 		--bindir=/usr/games \
 		--libdir=/usr/lib/games/0ad \
 		--datadir=/usr/share/games/0ad \
-		--with-system-mozjs185 \
-		--with-system-enet
+		--with-system-enet \
+		--with-system-nvtt \
+		--with-system-mozjs185
 
 	$(MAKE) config=release -C build/workspaces/gcc
 

Modified: packages/trunk/0ad-data/debian/changelog
===================================================================
--- packages/trunk/0ad-data/debian/changelog	2012-03-29 20:09:13 UTC (rev 13437)
+++ packages/trunk/0ad-data/debian/changelog	2012-03-29 23:28:54 UTC (rev 13438)
@@ -2,4 +2,4 @@
 
   * Initial release (Closes: #594802)
 
- -- Vincent Cheng <Vincentc1208 at gmail.com>  Fri, 16 Mar 2012 23:03:53 -0700
+ -- Vincent Cheng <Vincentc1208 at gmail.com>  Thu, 29 Mar 2012 16:23:58 -0700

Modified: packages/trunk/0ad-data/debian/control
===================================================================
--- packages/trunk/0ad-data/debian/control	2012-03-29 20:09:13 UTC (rev 13437)
+++ packages/trunk/0ad-data/debian/control	2012-03-29 23:28:54 UTC (rev 13438)
@@ -12,11 +12,11 @@
 Package: 0ad-data
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends},
+Depends: tex-gyre,
  ttf-dejavu-core,
- tex-gyre
+ ${misc:Depends}
 Suggests: 0ad
-Description: Real-time strategy game of ancient warfare (data files)
+Description: Real-time strategy game of ancient warfare (data)
  0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform
  real-time strategy (RTS) game of ancient warfare. In short, it is a
  historically-based war/economy game that allows players to relive or rewrite

Modified: packages/trunk/0ad-data/debian/install
===================================================================
--- packages/trunk/0ad-data/debian/install	2012-03-29 20:09:13 UTC (rev 13437)
+++ packages/trunk/0ad-data/debian/install	2012-03-29 23:28:54 UTC (rev 13438)
@@ -1 +1,3 @@
-binaries/           usr/share/games/0ad/
+binaries/data/config    usr/share/games/0ad/
+binaries/data/mods      usr/share/games/0ad/
+binaries/data/tools     usr/share/games/0ad/

More information about the Pkg-games-commits mailing list