Hi, The attached file is the diff for my vbrfix 0.24-1.2 NMU. The changelog entry contains:
vbrfix (0.24-1.2) unstable; urgency=medium * Non-maintainer upload. * Add gcc-4.3.diff patch to really fix GCC 4.3-related FTBFS (Closes: #474833) * Correct typo in -help invokation and allow '-always' as well as '-allways' (Closes: #463140) * Bump Standards-Version to 3.7.3. Regards, -- Chris Lamb, UK [EMAIL PROTECTED] GPG: 0x634F9A20
diff -u vbrfix-0.24/debian/control vbrfix-0.24/debian/control --- vbrfix-0.24/debian/control +++ vbrfix-0.24/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Rogério Brito <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 5), autotools-dev, quilt -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Package: vbrfix Architecture: any diff -u vbrfix-0.24/debian/changelog vbrfix-0.24/debian/changelog --- vbrfix-0.24/debian/changelog +++ vbrfix-0.24/debian/changelog @@ -1,3 +1,14 @@ +vbrfix (0.24-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Add gcc-4.3.diff patch to really fix GCC 4.3-related FTBFS + (Closes: #474833) + * Correct typo in -help invokation and allow '-always' as well as '-allways' + (Closes: #463140) + * Bump Standards-Version to 3.7.3. + + -- Chris Lamb <[EMAIL PROTECTED]> Fri, 11 Apr 2008 23:44:54 +0100 + vbrfix (0.24-1.1) unstable; urgency=low * Non-maintainer upload. diff -u vbrfix-0.24/debian/patches/series vbrfix-0.24/debian/patches/series --- vbrfix-0.24/debian/patches/series +++ vbrfix-0.24/debian/patches/series @@ -1,0 +2 @@ +gcc-4.3.diff only in patch2: unchanged: --- vbrfix-0.24.orig/vbrfixc/main.cpp +++ vbrfix-0.24/vbrfixc/main.cpp @@ -44,7 +44,7 @@ if(f=="-ri1")return VBR_RemoveId3v1; if(f=="-ri2")return VBR_RemoveId3v2; if(f=="-skiplame")return VBR_SkipLAME; - if(f=="-allways")return VBR_AlwaysWrite; + if(f=="-allways"||f=="-always")return VBR_AlwaysWrite; if(f=="-makevbr")return VBR_AlwaysWriteVBR; if(f=="-log")return VBR_WriteLogFile; if(f=="-lameinfo")return VBR_ReplaceLAMEkeepinfo; @@ -64,8 +64,8 @@ cout << "-ri1 removeId3v1 Tag"<<endl; cout << "-ri2 removeId3v2 Tag"<<endl; cout << "-skiplame if tag made by lame don't fix it"<<endl; - cout << "-allways always write even if not vbr"<<endl; - cout << "-makevbr make it vbr(you need -allways also)"<<endl; + cout << "-always always write even if not vbr"<<endl; + cout << "-makevbr make it vbr (you need -always also)"<<endl; cout << "-log write a log file"<<endl; cout << "-lameinfo keep the lame info"<<endl; return EXIT_SUCCESS; only in patch2: unchanged: --- vbrfix-0.24.orig/debian/patches/gcc-4.3.diff +++ vbrfix-0.24/debian/patches/gcc-4.3.diff @@ -0,0 +1,12 @@ +diff -urNad vbrfix-0.24.orig/vbrfixc/vbrfix.cpp vbrfix-0.24/vbrfixc/vbrfix.cpp +--- vbrfix-0.24.orig/vbrfixc/vbrfix.cpp 2008-04-09 21:43:30.000000000 +0100 ++++ vbrfix-0.24/vbrfixc/vbrfix.cpp 2008-04-09 21:47:08.000000000 +0100 +@@ -15,7 +15,8 @@ + * * + ***************************************************************************/ + #include "vbrfix.h" + #include "arpa/inet.h" ++#include <cstring> + //#include "stdafx.h"//include in mfc version + int getXHpos(int ver,int chan); + VbrFix::VbrFix(){
signature.asc
Description: PGP signature