diff -u jargoninformatique-1.3.6/debian/changelog jargoninformatique-1.3.6/debian/changelog --- jargoninformatique-1.3.6/debian/changelog +++ jargoninformatique-1.3.6/debian/changelog @@ -1,3 +1,10 @@ +jargoninformatique (1.3.6-0ubuntu4) precise; urgency=low + + * debian/patches/fix-ftbfs-armhf-format-security.dpatch: + Fix FTBFS on armhf (LP: #903112). + + -- Simon Olofsson Mon, 12 Dec 2011 12:11:43 +0100 + jargoninformatique (1.3.6-0ubuntu3) karmic; urgency=low * debian/patches/fix-ftbfs-gcc44-eglibc210.dpatch: diff -u jargoninformatique-1.3.6/debian/control jargoninformatique-1.3.6/debian/control --- jargoninformatique-1.3.6/debian/control +++ jargoninformatique-1.3.6/debian/control @@ -1,7 +1,7 @@ Source: jargoninformatique Section: doc Priority: optional -Maintainer: Ubuntu MOTU Developers +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Gauvain Pocentek Build-Depends: debhelper (>= 5.0.0), dpatch, libfltk1.1-dev, libxpm-dev Standards-Version: 3.7.2 diff -u jargoninformatique-1.3.6/debian/patches/00list jargoninformatique-1.3.6/debian/patches/00list --- jargoninformatique-1.3.6/debian/patches/00list +++ jargoninformatique-1.3.6/debian/patches/00list @@ -1,0 +2 @@ +fix-ftbfs-armhf-format-security.dpatch only in patch2: unchanged: --- jargoninformatique-1.3.6.orig/debian/patches/fix-ftbfs-armhf-format-security.dpatch +++ jargoninformatique-1.3.6/debian/patches/fix-ftbfs-armhf-format-security.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Author: Simon Olofsson +## Description: Fix FTBFS on armhf due to format string errors +## Bug-Ubuntu: https://launchpad.net/bugs/903112 + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' jargoninformatique~/src/flnice.cpp jargoninformatique/src/flnice.cpp +--- jargoninformatique~/src/flnice.cpp 2011-12-12 11:09:00.000000000 +0100 ++++ jargoninformatique/src/flnice.cpp 2011-12-12 11:13:29.796653459 +0100 +@@ -100,7 +100,7 @@ + return (MessageBox(GET_HWND,out,"",MB_YESNO|MB_ICONQUESTION)==IDYES)?1:0; + #endif + #ifdef LINUX +- return fl_choice(out,"Oui","Non",0)?0:1; ++ return fl_choice("%s",out,"Oui","Non",0)?0:1; + #endif + } + +@@ -122,7 +122,7 @@ + MessageBox(GET_HWND,out,"" /* mettre ici le titre de la fenĂȘtre parente? */,MB_OK|MB_ICONINFORMATION); + #endif + #ifdef LINUX +- fl_alert(out); ++ fl_alert("%s",out); + #endif + } + +@@ -144,7 +144,7 @@ + MessageBox(GET_HWND,out,"" /* mettre ici le titre de la fenĂȘtre parente? */,MB_OK|MB_ICONEXCLAMATION); + #endif + #ifdef LINUX +- fl_alert(out); ++ fl_alert("%s",out); + #endif + } +