widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/use-bundled-fonts into lp:~widelands-dev/widelands/debian.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #973714 in widelands: "fonts are different between daily ppa and bzr repository"
  https://bugs.launchpad.net/widelands/+bug/973714

For more details, see:
https://code.launchpad.net/~hjd/widelands/use-bundled-fonts/+merge/243323

As discussed in the bug report, once Gun's font branch has been merged, we stop linking to fonts in external packages and use the ones bundled in the Widelands repo. This change removes the lookup/linking for some fonts and instead simply uses whatever we bundle.



I have built (well, technically speaking they are still in progress) test-packages with these changes at
https://code.launchpad.net/~hjd/+recipe/widelands-test

Unfortunately, I won't have have opportunity to test them more thoroughly right now than whether they manage to build or not. If someone wants to test whether they are installable and the file list they provide (hint: dpkg -L packagename), feel free. :)
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/use-bundled-fonts into lp:~widelands-dev/widelands/debian.

=== modified file 'debian/control'
--- debian/control	2014-10-28 18:38:14 +0000
+++ debian/control	2014-12-01 19:27:03 +0000
@@ -33,7 +33,6 @@
 Depends: widelands-data (= ${source:Version}), 
   ${shlibs:Depends}, 
   ${misc:Depends}, 
-  fonts-freefont-ttf, fonts-dejavu-core, fonts-dejavu-extra,
 Description: fantasy real-time strategy game
  Widelands is a strategy game aiming for gameplay similar to Settlers II by
  BlueByte.
@@ -46,8 +45,7 @@
 
 Package: widelands-data
 Architecture: all
-Depends: fonts-freefont-ttf,
-  ${misc:Depends}
+Depends: ${misc:Depends}
 Description: fantasy real-time strategy game (data files)
  This package contains the graphics and levels for Widelands.
  .

=== modified file 'debian/rules'
--- debian/rules	2014-10-28 18:13:18 +0000
+++ debian/rules	2014-12-01 19:27:03 +0000
@@ -22,39 +22,8 @@
 
 override_dh_auto_install:
 	dh_auto_install --parallel
-	mkdir -p  debian/tmp/usr/share/applications/
+	mkdir -p debian/tmp/usr/share/applications/
 	cp debian/widelands.desktop debian/tmp/usr/share/applications/
-	# Take care of the fonts (use system-wide ones)
-	for ttf in FreeSans.ttf FreeSerif.ttf ; do \
-	  rm debian/tmp/usr/share/games/widelands/fonts/$$ttf; \
-	  (cd debian/tmp/usr/share/games/widelands/fonts/; ln -s /usr/share/fonts/truetype/freefont/$$ttf) ;\
-	done
-	# Damn, widelands does not use the standard name of fonts, 
-	# but removes the hyphen (-) from those names
-	for hyphen in \
-	  DejaVuSans-BoldOblique.ttf \
-	  DejaVuSans-Bold.ttf \
-	  DejaVuSansCondensed-Bold.ttf \
-	  DejaVuSansCondensed.ttf \
-	  DejaVuSans-ExtraLight.ttf \
-	  DejaVuSansMono-Bold.ttf \
-	  DejaVuSansMono.ttf \
-	  DejaVuSans.ttf \
-	  DejaVuSerif-BoldItalic.ttf \
-	  DejaVuSerif-Bold.ttf \
-	  DejaVuSerifCondensed-BoldItalic.ttf \
-	  DejaVuSerifCondensed-Bold.ttf \
-	  DejaVuSerifCondensed-Italic.ttf \
-	  DejaVuSerifCondensed.ttf \
-	  DejaVuSerif-Italic.ttf \
-	  DejaVuSerif.ttf \
-	  ; do \
-	  ttf=`echo $$hyphen | sed 's/-//'` ; \
-	  if [ -e /usr/share/fonts/truetype/dejavu/$$hyphen ]; then \
-	    rm debian/tmp/usr/share/games/widelands/fonts/$$ttf; \
-	    (cd debian/tmp/usr/share/games/widelands/fonts/; ln -s /usr/share/fonts/truetype/dejavu/$$hyphen $$ttf) ;\
-	  fi; \
-	done
 	rm debian/tmp/usr/share/games/widelands/fonts/Widelands/LICENSE
 	# Do not include the GPL-2 license file again to keep lintian happy
 	# (but the file is listed from the user interface, so dont kill it completely)