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

[Clint Adams]

The following commit has been merged in the master branch:
commit 012e1f538e35fea79fc906f1908904b83746d9c4
Author: Clint Adams <schizo at debian.org>
Date:   Tue Feb 23 22:14:23 2010 -0500

    Drop data_dsc_use_bindir.diff (binary pathnames have changed).

diff --git a/debian/patches/data_dsc_use_bindir.diff b/debian/patches/data_dsc_use_bindir.diff
deleted file mode 100644
index 88cc78d..0000000
--- a/debian/patches/data_dsc_use_bindir.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- freeciv-2.1.0.orig/data/civclient.dsc.in	2007-10-27 13:19:02.000000000 +0200
-+++ freeciv-2.1.0/data/civclient.dsc.in	2007-10-29 13:27:55.572240136 +0100
-@@ -2,7 +2,7 @@
- 
- [ModuleInfo]
- Author = See http://www.freeciv.org/wiki/People
--CommandLine = @prefix@/bin/civclient
-+CommandLine = /usr/games/civclient-gtk
- Frontend = any
- Homepage = http://www.freeciv.org/
- Name = Freeciv
---- freeciv-2.1.0.orig/data/civserver.dsc.in	2007-10-27 13:19:02.000000000 +0200
-+++ freeciv-2.1.0/data/civserver.dsc.in	2007-10-29 13:28:15.069750798 +0100
-@@ -8,7 +8,7 @@
- Version = @VERSION@
- 
- [LaunchInfo]
--ExecutablePath = @prefix@/bin/civserver -q 180 -e
-+ExecutablePath = /usr/games/civserver -q 180 -e
- 
- [Protocol]
- Engine = Freeciv
diff --git a/debian/patches/series b/debian/patches/series
index ce9b174..5c82104 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-data_dsc_use_bindir.diff
 themes_sdl_use_system_fonts.diff
 99_build_without_ggzd.diff

-- 
Civilization turn-based strategy game