diff -Nru psychtoolbox-3-3.0.11.20131017.dfsg1/debian/changelog psychtoolbox-3-3.0.11.20131017.dfsg1/debian/changelog --- psychtoolbox-3-3.0.11.20131017.dfsg1/debian/changelog 2013-11-20 04:35:25.000000000 +0000 +++ psychtoolbox-3-3.0.11.20131017.dfsg1/debian/changelog 2013-12-23 08:18:39.000000000 +0000 @@ -1,3 +1,9 @@ +psychtoolbox-3 (3.0.11.20131017.dfsg1-3+rpi1) jessie-staging; urgency=medium + + * Fix a freetype include. + + -- Peter Michael Green <plugwash@raspbian.org> Mon, 23 Dec 2013 08:18:21 +0000 + psychtoolbox-3 (3.0.11.20131017.dfsg1-3) unstable; urgency=low * Upload to unsable since fresh glew has arrived to sid! diff -Nru psychtoolbox-3-3.0.11.20131017.dfsg1/debian/patches/fix-freetype-include psychtoolbox-3-3.0.11.20131017.dfsg1/debian/patches/fix-freetype-include --- psychtoolbox-3-3.0.11.20131017.dfsg1/debian/patches/fix-freetype-include 1970-01-01 00:00:00.000000000 +0000 +++ psychtoolbox-3-3.0.11.20131017.dfsg1/debian/patches/fix-freetype-include 2013-12-23 08:19:45.000000000 +0000 @@ -0,0 +1,27 @@ +Description: Fix a freetype include. +Author: Peter Michael Green <plugwash@raspbian.org> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- psychtoolbox-3-3.0.11.20131017.dfsg1.orig/PsychSourceGL/Cohorts/FTGLTextRenderer/OGLFT.cpp ++++ psychtoolbox-3-3.0.11.20131017.dfsg1/PsychSourceGL/Cohorts/FTGLTextRenderer/OGLFT.cpp +@@ -35,7 +35,7 @@ + #include <qregexp.h> + #endif + #endif +-#include <freetype/ftbitmap.h> ++#include <ftbitmap.h> + + namespace OGLFT { + diff -Nru psychtoolbox-3-3.0.11.20131017.dfsg1/debian/patches/series psychtoolbox-3-3.0.11.20131017.dfsg1/debian/patches/series --- psychtoolbox-3-3.0.11.20131017.dfsg1/debian/patches/series 2013-11-20 04:35:25.000000000 +0000 +++ psychtoolbox-3-3.0.11.20131017.dfsg1/debian/patches/series 2013-12-23 08:19:29.000000000 +0000 @@ -7,3 +7,4 @@ deb_psychtoolboxversion deb_consistent_octave_outdir deb_no_special_arm +fix-freetype-include