r15102 - packages/trunk/0ad/debian

[Vincent Cheng]

Author: vcheng
Date: 2014-05-18 00:11:44 +0000 (Sun, 18 May 2014)
New Revision: 15102

Modified:
   packages/trunk/0ad/debian/changelog
   packages/trunk/0ad/debian/control
Log:
Revert changes made to debian/control in 0ad/0.0.15+dfsg-3


Modified: packages/trunk/0ad/debian/changelog
===================================================================
--- packages/trunk/0ad/debian/changelog	2014-05-18 00:05:33 UTC (rev 15101)
+++ packages/trunk/0ad/debian/changelog	2014-05-18 00:11:44 UTC (rev 15102)
@@ -6,6 +6,10 @@
     #735349.
     - Update debian/copyright to include missing license entries for the
       various javascript libraries contained in the source tarball.
+    - Revert changes made to debian/control in 0ad/0.0.15+dfsg-3, i.e.:
+      revert: debian/control: Hardcode versions of 0ad-data{,-common} to
+              depend on to workaround the fact that 0.0.15+dfsg is strictly
+              greater than 0.0.15.
   * Build-dep on libgloox-dev (>= 1.0.9) to ensure that 0ad is built with
     newer enough gloox to avoid lobby connectivity issues.
 

Modified: packages/trunk/0ad/debian/control
===================================================================
--- packages/trunk/0ad/debian/control	2014-05-18 00:05:33 UTC (rev 15101)
+++ packages/trunk/0ad/debian/control	2014-05-18 00:11:44 UTC (rev 15102)
@@ -36,10 +36,10 @@
 Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends:
- 0ad-data (>= 0.0.15),
- 0ad-data (<< 0.0.16),
- 0ad-data-common (>= 0.0.15),
- 0ad-data-common (<< 0.0.16),
+ 0ad-data (>= ${source:Upstream-Version}),
+ 0ad-data (<= ${source:Version}),
+ 0ad-data-common (>= ${source:Upstream-Version}),
+ 0ad-data-common (<= ${source:Version}),
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Real-time strategy game of ancient warfare