Merge lp:~hjd/widelands/use-bundled-fonts into lp:~widelands-dev/widelands/debian

[Hans Joachim Desserud]

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. :)

[SirVer (sirver)]

lgtm. lots of deletes which always means simpler code :)

review: Approve

[Hans Joachim Desserud (hjd)]

Updated to take into account that the fonts directory has been moved into i18n, please re-review this. :)

(debian/copyright should probably be updated with the various licenses the new fonts are available under, but I don't have a complete overview for this)

[Hans Joachim Desserud (hjd)]

review: Needs Resubmitting

[GunChleoc (gunchleoc)]

> Updated to take into account that the fonts directory has been moved into
> i18n, please re-review this. :)
>
> (debian/copyright should probably be updated with the various licenses the new
> fonts are available under, but I don't have a complete overview for this)

I have dropped a license file into each font folder, and I grabbed them at the same time that I downloaded the fonts. Is this what you need?

[Hans Joachim Desserud (hjd)]

>I have dropped a license file into each font folder, and I grabbed them at the same time that I downloaded the fonts. Is this what you need?

Probably :) I saw you had added them, which should make this easier.

To be honest I'm not familiar with this file, but I've looked at the current copyright file and section 12.5 at https://www.debian.org/doc/debian-policy/ch-docs.html. Based on this it looks like it states all licenses used by the project as well as which files/paths are covered by each.

(Minor warning: I might be busy the following days, so I don't know when I'll get time to add this)

[Hans Joachim Desserud (hjd)]

The copyright file should be updated, but I don't think it's critical. (At least not for our part). Though, in the meantime the PPA builders fail. Should I just merge this and then we can deal with adding the various font licenses later?

[SirVer (sirver)]

Go ahead, but best open a bug for the font licensens so we will not forget.

[Hans Joachim Desserud (hjd)]

Thanks. :) Filed bug 1404539 for follow-up.

=== modified file 'debian/control'
--- debian/control	2014-12-04 19:36:25 +0000
+++ debian/control	2014-12-13 19:01:04 +0000
@@ -32,7 +32,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.
@@ -45,8 +44,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/copyright'
--- debian/copyright	2014-02-15 13:00:44 +0000
+++ debian/copyright	2014-12-13 19:01:04 +0000
@@ -22,7 +22,7 @@
  On Debian systems, the complete text of the GNU General Public
  License version 2 can be found in "/usr/share/common-licenses/GPL-2".
   
-Files: fonts/Widelands/Widelands.ttf
+Files: i18n/fonts/Widelands/Widelands.ttf
 Copyright: 2006-2010, Peter Schwanemann (Peter (AT) drehatlas (DOT) de)
 License: SIL Open Font License, Version 1.1 (http://scripts.sil.org/OFL)
  PREAMBLE

=== modified file 'debian/rules'
--- debian/rules	2014-10-28 18:13:18 +0000
+++ debian/rules	2014-12-13 19:01:04 +0000
@@ -22,40 +22,10 @@
 
 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
+	# Probably need to remove other duplicated license files in i18n/fonts
+	rm debian/tmp/usr/share/games/widelands/i18n/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)
 	# (we cannot patch the user interface because that's in a translated text)