r13474 - packages/trunk/0ad/debian

[Vincent Cheng]

Author: vincentc-guest
Date: 2012-04-11 21:26:10 +0000 (Wed, 11 Apr 2012)
New Revision: 13474

Modified:
   packages/trunk/0ad/debian/changelog
   packages/trunk/0ad/debian/control
Log:
0ad: Modify a few more b-depends; add depends on fam to close #668353


Modified: packages/trunk/0ad/debian/changelog
===================================================================
--- packages/trunk/0ad/debian/changelog	2012-04-09 23:48:29 UTC (rev 13473)
+++ packages/trunk/0ad/debian/changelog	2012-04-11 21:26:10 UTC (rev 13474)
@@ -2,10 +2,12 @@
 
   * Update debian/0ad.6.
   * Change build-depends on libjpeg8-dev to libjpeg-dev.
-  * Change build-depends on libcurl4-gnutls-dev to 
-    libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl4-dev.
+  * Add alternate build-depends on libcurl4-dev.
+  * Depend on 0ad-data (= ${source:Version}) (instead of >=).
+  * Add alternate dependency on fam. (Closes: #668353)
 
-  * TODO: test re-build to see if libogg-dev can really be removed
+  * TODO: test rebuild with libpng 1.5
+    - change build-depends on libpng15-dev to libpng-dev.
 
  -- Vincent Cheng <Vincentc1208 at gmail.com>  Mon, 09 Apr 2012 16:30:56 -0700
 

Modified: packages/trunk/0ad/debian/control
===================================================================
--- packages/trunk/0ad/debian/control	2012-04-09 23:48:29 UTC (rev 13473)
+++ packages/trunk/0ad/debian/control	2012-04-11 21:26:10 UTC (rev 13474)
@@ -9,7 +9,7 @@
  libboost-dev,
  libboost-filesystem-dev,
  libboost-signals-dev,
- libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl4-dev,
+ libcurl4-gnutls-dev | libcurl4-dev,
  libenet-dev (>= 1.3),
  libgamin-dev,
  libjpeg-dev,
@@ -33,8 +33,8 @@
 Architecture: any
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends:
- 0ad-data (>= ${source:Upstream-Version}),
- gamin,
+ 0ad-data (= ${source:Version}),
+ gamin | fam,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Real-time strategy game of ancient warfare