widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

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

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/debian-revert-fonts/+merge/238827

Revert changes for font dependencies.

This was done for older Ubuntu releases which didn't have the newer packages. Not an issue for Ubuntu 14.04 and later which we currently build for with our main PPA. (This fix should probably not be merged over to the 12.04 PPA where I believe the alternative font packages are still needed)

(Basically drops our changes, bringing us one step closer to upstream packaging)

(Now also targetting the packaging branch)
-- 
https://code.launchpad.net/~hjd/widelands/debian-revert-fonts/+merge/238827
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/debian-revert-fonts into lp:~widelands-dev/widelands/debian.

=== modified file 'debian/control'
--- debian/control	2014-06-21 16:11:41 +0000
+++ debian/control	2014-10-19 17:15:08 +0000
@@ -33,7 +33,7 @@
 Depends: widelands-data (= ${source:Version}), 
   ${shlibs:Depends}, 
   ${misc:Depends}, 
-  fonts-freefont-ttf | ttf-freefont, fonts-dejavu-core | ttf-dejavu-core, fonts-dejavu-extra | ttf-dejavu-extra,
+  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,7 +46,7 @@
 
 Package: widelands-data
 Architecture: all
-Depends: fonts-freefont-ttf | ttf-freefont,
+Depends: fonts-freefont-ttf,
   ${misc:Depends}
 Description: fantasy real-time strategy game (data files)
  This package contains the graphics and levels for Widelands.