[SCM] Civilization turn-based strategy game branch, master, updated. debian/2.1.9-1-13-g964117b

[Karl Goetz]

The following commit has been merged in the master branch:
commit 76c9349c499c534ee0e91a9e2b338b9615dc292b
Author: Karl Goetz <karl at kgoetz.id.au>
Date:   Fri Nov 27 21:06:22 2009 +1030

    * Remove our export of datarootdir in debian/rules, upstream does this.

diff --git a/debian/changelog b/debian/changelog
index 6be0b09..73ac4fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ freeciv (2.1.10-1) unstable; urgency=low
   * Relaxed dependencies on freeciv-server for sdl and gtk clients,
   freeciv-server is now a recommends
   * Stop d/rules trying to gzip scenarios - upstream does this.
+  * Remove export of datarootdir in d/rules, upstream seems to handle
+  this correctly now.
 
- -- Karl Goetz <karl at kgoetz.id.au>  Fri, 27 Nov 2009 21:00:02 +1030
+ -- Karl Goetz <karl at kgoetz.id.au>  Fri, 27 Nov 2009 21:05:08 +1030
 
 freeciv (2.1.9-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 85c81c3..1599bcb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,10 +23,6 @@ else
   CFLAGS += -O2 
 endif
 
-# Work around upstream creating tarballs with *ancient* autotools
-# which don't know about $datarootdir.
-export datarootdir=/usr/share
-
 COMMON_CONFIG := --cache-file=$(CURDIR)/config.cache \
 		 --sysconfdir=/etc --prefix=/usr \
 		 --datadir=\$${prefix}/share/games \

-- 
Civilization turn-based strategy game