Merge lp:~noskcaj/ubuntu/trusty/fs-uae/ftbfs into lp:ubuntu/trusty-proposed/fs-uae

[Jackson Doak]

Fixes FTBFS

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

Does this apply to Debian too? Could it be forwarded there?

review: Approve

Unmerged revisions

5. By Jackson Doak on 2013-11-09

Add build-dependancy on libfreetype6-dev. Fixes FTBFS

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-05 23:43:28 +0000
+++ debian/changelog	2013-11-09 19:46:32 +0000
@@ -1,3 +1,9 @@
+fs-uae (2.2.3+dfsg-4ubuntu1) trusty; urgency=low
+
+  * Add build-dependancy on libfreetype6-dev. Fixes FTBFS
+
+ -- Jackson Doak <[e-mail]>  Sun, 10 Nov 2013 06:26:22 +1100
+
 fs-uae (2.2.3+dfsg-4) unstable; urgency=low
 
   * Update Debian JIT compiler disable patch to include
 
=== modified file 'debian/control'
--- debian/control	2013-11-01 14:33:54 +0000
+++ debian/control	2013-11-09 19:46:32 +0000
@@ -1,8 +1,9 @@
 Source: fs-uae
 Section: otherosfs
 Priority: optional
-Maintainer: John Paul Adrian Glaubitz <[e-mail]>
-Build-Depends: debhelper (>= 9), libsdl1.2-dev, libglib2.0-dev, libopenal-dev, gettext, python (>= 2.6), python-setuptools, glee-dev
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: John Paul Adrian Glaubitz <[e-mail]>
+Build-Depends: debhelper (>= 9), libsdl1.2-dev, libglib2.0-dev, libopenal-dev, gettext, python (>= 2.6), python-setuptools, glee-dev, libfreetype6-dev
 Standards-Version: 3.9.4
 Homepage: http://fs-uae.net
 Vcs-Git: git://github.com/glaubitz/fs-uae-debian.git