[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 964117ba8ad3f837fad3ae6e2ee4c078e1e65f14
Author: Karl Goetz <karl at kgoetz.id.au>
Date:   Fri Nov 27 21:14:17 2009 +1030

    * Deleted 01_configure_ac_localedir.diff from d/patches/ and from series.
    	It was used to patch upstream configure to put locales in the correct
    	location (with datarootdir hack in d/rules). Upstream configure handles
    	this correctly now.

diff --git a/debian/changelog b/debian/changelog
index 73ac4fb..b23ffb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ freeciv (2.1.10-1) unstable; urgency=low
   * Stop d/rules trying to gzip scenarios - upstream does this.
   * Remove export of datarootdir in d/rules, upstream seems to handle
   this correctly now.
+  * Deleted 01_configure_ac_localedir.diff from d/patches/ and from series.
 
- -- Karl Goetz <karl at kgoetz.id.au>  Fri, 27 Nov 2009 21:05:08 +1030
+ -- Karl Goetz <karl at kgoetz.id.au>  Fri, 27 Nov 2009 21:28:38 +1030
 
 freeciv (2.1.9-1) unstable; urgency=low
 
diff --git a/debian/patches/01_configure_ac_localedir.diff b/debian/patches/01_configure_ac_localedir.diff
deleted file mode 100644
index 58a9600..0000000
--- a/debian/patches/01_configure_ac_localedir.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- freeciv-2.1.0~beta6.orig/configure
-+++ freeciv-2.1.0~beta6/configure
-@@ -5865,7 +5865,7 @@
- LIBS="$LIBS $LIBICONV"
- 
- if test -z "$localedir"; then
--  localedir="$datadir/locale"
-+  localedir="$prefix/share/locale"
- 
- fi
- 
---- freeciv-2.1.0~beta6.orig/configure.ac
-+++ freeciv-2.1.0~beta6/configure.ac
-@@ -179,7 +179,7 @@
- dnl have to define it here, so that it can be used in po/Makefile.
- dnl You cannot use localedir above this line or it will fail for old ac's.
- if test -z "$localedir"; then
--  localedir="$datadir/locale"
-+  localedir="$prefix/share/locale"
-   AC_SUBST(localedir)
- fi
- 
diff --git a/debian/patches/series b/debian/patches/series
index f60701f..ce9b174 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01_configure_ac_localedir.diff
 data_dsc_use_bindir.diff
 themes_sdl_use_system_fonts.diff
 99_build_without_ggzd.diff

-- 
Civilization turn-based strategy game