← Back to branch summary

~ubuntu-branches/debian/sid/freeciv/sid

« back to all changes in this revision

Viewing changes to debian/patches/themes_sdl_use_system_fonts.diff

  • Committer: Package Import Robot
  • Author(s): Clint Adams, Karl Goetz, Clint Adams
  • Date: 2011-08-28 22:40:00 UTC
  • mfrom: (1.2.19 upstream)
  • Revision ID: package-import@ubuntu.com-20110828224000-j2r1erewlem25dox
Tags: 2.3.0-1
[ Karl Goetz ]
* New upstream version.
* Fix themes_sdl_use_system_fonts.diff to apply cleanly on 2.3.0
* Massage work_around_unity_induced_breakage.diff to get it
  applying to the new codebase (The patch assumes commits made
  after 2.3.0 was tagged upstream).

[ Clint Adams ]
* Fudge build system to think there is no libtool mismatch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/themes_sdl_use_system_fonts.diff
1
1
Description: Patch to use fonts provided by external packages not in built copies
 
2
 Refreshed by kgoetz for 2.3.0 because of the comment added after DejaVuSans.
2
3
Author: jordi
3
4
Forwarded: no
4
 
Last-Update: 2007-12-28
 
5
Last-Update: 2011-08-18
5
6
 
6
 
--- freeciv-2.1.2/data/themes/gui-sdl/human/theme.themespec     2007-12-28 00:46:03.000000000 +0100
7
 
+++ freeciv-2.1.2/data/themes/gui-sdl/human/theme.themespec     2007-12-28 00:49:16.000000000 +0100
8
 
@@ -8,10 +8,10 @@
 
7
--- freeciv-2.3.0/data/themes/gui-sdl/human/theme.themespec     2007-12-28 00:46:03.000000000 +0100
 
8
+++ freeciv-2.3.0/data/themes/gui-sdl/human/theme.themespec     2007-12-28 00:49:16.000000000 +0100
 
9
@@ -8,13 +8,13 @@
9
10
 priority = 20
10
11
 
11
12
 ; The font to be used:
12
13
-font_file         = "themes/gui-sdl/human/DejaVuSans.ttf"
 
14
+font_file         = "../../fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
 
15
 ; To use CJK fonts, provide the path to the font below.
 
16
 ; Fonts recommended for Freeciv can be fetched from svn trunk, e.g.:
 
17
 ; http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-sdl/human/
13
18
-font_file_zh_CN   = "themes/gui-sdl/human/fireflysung.ttf"
14
19
-font_file_ja      = "themes/gui-sdl/human/sazanami-gothic.ttf"
15
20
-font_file_ko      = "themes/gui-sdl/human/UnDotum.ttf"
16
 
+font_file         = "../../fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
17
21
+font_file_zh_CN   = "../../fonts/truetype/arphic/uming.ttf"
18
22
+font_file_ja      = "../../fonts/truetype/sazanami/sazanami-gothic.ttf"
19
23
+font_file_ko      = "../../fonts/truetype/unfonts/UnDotum.ttf"