On Tue, Jul 10, 2012 at 11:02:07PM +0200, Petr Salinger wrote: >Package: terminal.app >Version: 0.9.8-1 >Severity: serious >Tags: patch >User: debian-...@lists.debian.org >Usertags: kfreebsd
I've just uploaded an NMU with this patch. Here's the debdiff. -- Steve McIntyre, Cambridge, UK. st...@einval.com "Further comment on how I feel about IBM will appear once I've worked out whether they're being malicious or incompetent. Capital letters are forecast." Matthew Garrett, http://www.livejournal.com/users/mjg59/30675.html
diff -Nru terminal.app-0.9.8/debian/changelog terminal.app-0.9.8/debian/changelog --- terminal.app-0.9.8/debian/changelog 2012-06-14 11:56:19.000000000 +0100 +++ terminal.app-0.9.8/debian/changelog 2012-10-13 12:04:55.000000000 +0100 @@ -1,3 +1,11 @@ +terminal.app (0.9.8-1+nmu1) unstable; urgency=low + + * NMU + * Fix FTBFS on kFreeBSD. Closes: #681135. Thanks to Petr Salinger for + the patch. + + -- Steve McIntyre <93...@debian.org> Sat, 13 Oct 2012 12:04:51 +0100 + terminal.app (0.9.8-1) unstable; urgency=low * New upstream release: diff -Nru terminal.app-0.9.8/debian/patches/FTBFS-kFreeBSD terminal.app-0.9.8/debian/patches/FTBFS-kFreeBSD --- terminal.app-0.9.8/debian/patches/FTBFS-kFreeBSD 1970-01-01 01:00:00.000000000 +0100 +++ terminal.app-0.9.8/debian/patches/FTBFS-kFreeBSD 2012-10-13 12:07:47.000000000 +0100 @@ -0,0 +1,17 @@ +Description: Fix termio.h header inclusion for GNU/kFreeBSD + . + * Fix FTBFS on kFreeBSD. Closes: #681135 +Author: Petr Salinger <petr.salin...@seznam.cz> +Bug-Debian: http://bugs.debian.org/681135 + +--- terminal.app-0.9.8.orig/TerminalView.m ++++ terminal.app-0.9.8/TerminalView.m +@@ -43,7 +43,7 @@ activated */ + # include <termios.h> + # include <util.h> + # include <sys/ioctl.h> +-#elif defined (__GNU__) ++#elif defined (__GNU__) || defined (__GLIBC__) + #else + # include <termio.h> + #endif diff -Nru terminal.app-0.9.8/debian/patches/series terminal.app-0.9.8/debian/patches/series --- terminal.app-0.9.8/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ terminal.app-0.9.8/debian/patches/series 2012-10-13 12:05:43.000000000 +0100 @@ -0,0 +1 @@ +FTBFS-kFreeBSD
signature.asc
Description: Digital signature
