Control: tags -1 + patch pending Dear Maintainer,
On Sun, 19 Jul 2015 20:57:03 +0200 =?iso-8859-1?Q?S=E9bastien?= Villemot <sebast...@debian.org> wrote: > Package: src:pfstools > Version: 1.8.5-2 > Severity: serious > pfstools fails to compile against Octave 4.0, which has recently been uploaded > to unstable. I have uploaded to DELAYED/2 an NMU of pfstools that fixes this issue. The debdiff is attached. Don't hesitate to tell me if I should delay it longer. And sorry for the very short notice. Best, -- .''`. Sébastien Villemot : :' : Debian Developer `. `' http://sebastien.villemot.name `- GPG Key: 4096R/381A7594
diff -Nru pfstools-1.8.5/debian/changelog pfstools-1.8.5/debian/changelog --- pfstools-1.8.5/debian/changelog 2014-08-02 18:47:28.000000000 +0200 +++ pfstools-1.8.5/debian/changelog 2015-07-20 21:01:43.000000000 +0200 @@ -1,3 +1,11 @@ +pfstools (1.8.5-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * d/p/octave-4.0.diff: new patch, fixes FTBFS against Octave 4.0. + (Closes: #792890) + + -- Sébastien Villemot <sebast...@debian.org> Mon, 20 Jul 2015 20:17:58 +0200 + pfstools (1.8.5-2) unstable; urgency=medium [ Jackson Doak ] diff -Nru pfstools-1.8.5/debian/patches/octave-4.0.diff pfstools-1.8.5/debian/patches/octave-4.0.diff --- pfstools-1.8.5/debian/patches/octave-4.0.diff 1970-01-01 01:00:00.000000000 +0100 +++ pfstools-1.8.5/debian/patches/octave-4.0.diff 2015-07-20 21:07:06.000000000 +0200 @@ -0,0 +1,207 @@ +Description: Fix FTBFS against Octave 4.0 + Note that release 2.0.4 of pfstools includes a similar patch, but it does not + compile… +Author: Sébastien Villemot <sebast...@debian.org> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792890 +Last-Update: 2015-07-20 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/octave/pfsclose.cpp ++++ b/src/octave/pfsclose.cpp +@@ -53,9 +53,9 @@ DEFUN_DLD( pfsclose, args, , helpString + return retval; + } + +- Octave_map pfsStream = args(0).map_value(); ++ octave_map pfsStream = args(0).map_value(); + +- Octave_map::const_iterator itFH = pfsStream.seek( "FH" ); ++ octave_map::const_iterator itFH = pfsStream.seek( "FH" ); + if( itFH == pfsStream.end() || + !pfsStream.contents( itFH )(0).is_real_scalar() ) + { +--- a/src/octave/pfsopen.cpp ++++ b/src/octave/pfsopen.cpp +@@ -137,7 +137,7 @@ DEFUN_DLD( pfsopen, args, , helpString) + } + } + +- Octave_map pfsStream; ++ octave_scalar_map pfsStream; + pfsStream.assign( "FH", octave_value((double)((long)fh)) ); + pfsStream.assign( "MODE", writeMode ? octave_value("W") : octave_value("R") ); + pfsStream.assign( "EOF", octave_value(false) ); +@@ -145,10 +145,10 @@ DEFUN_DLD( pfsopen, args, , helpString) + if( writeMode ) { + pfsStream.assign( "columns", octave_value(width) ); + pfsStream.assign( "rows", octave_value(height) ); +- Octave_map channels; ++ octave_scalar_map channels; + pfsStream.assign( "channels", octave_value(channels) ); + } +- ++ + retval.append(pfsStream); + + return retval; +--- a/src/octave/pfsput.cpp ++++ b/src/octave/pfsput.cpp +@@ -52,9 +52,9 @@ DEFUN_DLD( pfsput, args, , helpString) + return retval; + } + +- Octave_map pfsStream = args(0).map_value(); ++ octave_map pfsStream = args(0).map_value(); + +- Octave_map::const_iterator itFH = pfsStream.seek( "FH" ); ++ octave_map::const_iterator itFH = pfsStream.seek( "FH" ); + if( itFH == pfsStream.end() || + !pfsStream.contents( itFH )(0).is_real_scalar() ) + { +@@ -65,7 +65,7 @@ DEFUN_DLD( pfsput, args, , helpString) + + // Check mode + { +- Octave_map::const_iterator itMode = pfsStream.seek( "MODE" ); ++ octave_map::const_iterator itMode = pfsStream.seek( "MODE" ); + if( itMode == pfsStream.end() || !pfsStream.contents( itMode )(0).is_string() ) + { + error( SCRIPT_NAME ": MODE field missing in the structure or it has wrong type"); +@@ -80,8 +80,8 @@ DEFUN_DLD( pfsput, args, , helpString) + // Get width & height + int width, height; + { +- Octave_map::const_iterator itCols = pfsStream.seek( "columns" ); +- Octave_map::const_iterator itRows = pfsStream.seek( "rows" ); ++ octave_map::const_iterator itCols = pfsStream.seek( "columns" ); ++ octave_map::const_iterator itRows = pfsStream.seek( "rows" ); + if( itCols == pfsStream.end() || itRows == pfsStream.end() || + !pfsStream.contents( itCols )(0).is_real_scalar() || + !pfsStream.contents( itRows )(0).is_real_scalar() ) +@@ -94,9 +94,9 @@ DEFUN_DLD( pfsput, args, , helpString) + } + + // Get channels +- Octave_map channels; ++ octave_map channels; + { +- Octave_map::const_iterator itChannels = pfsStream.seek( "channels" ); ++ octave_map::const_iterator itChannels = pfsStream.seek( "channels" ); + if( itChannels == pfsStream.end() || + !pfsStream.contents( itChannels )(0).is_map() ) + { +@@ -111,7 +111,7 @@ DEFUN_DLD( pfsput, args, , helpString) + pfs::Frame *frame = ctx.createFrame( width, height ); + + // For each channel in the 'channels' map +- for( Octave_map::iterator itCh = channels.begin(); itCh != channels.end(); itCh++ ) { ++ for( octave_map::iterator itCh = channels.begin(); itCh != channels.end(); itCh++ ) { + std::string channelName = channels.key(itCh); + + if( !channels.contents( itCh )(0).is_real_matrix() ) { +@@ -135,15 +135,15 @@ DEFUN_DLD( pfsput, args, , helpString) + + // Copy frame tags + { +- Octave_map::const_iterator itTags = pfsStream.seek( "tags" ); ++ octave_map::const_iterator itTags = pfsStream.seek( "tags" ); + if( itTags != pfsStream.end() ) { + if( !pfsStream.contents( itTags )(0).is_map() ) + { + throw pfs::Exception( "'tags' field must be a structure" ); + } + +- Octave_map tags = pfsStream.contents( itTags )(0).map_value(); +- for( Octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) { ++ octave_map tags = pfsStream.contents( itTags )(0).map_value(); ++ for( octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) { + std::string tagName = tags.key(itTag); + + if( !tags.contents( itTag )(0).is_string() ) +@@ -156,14 +156,14 @@ DEFUN_DLD( pfsput, args, , helpString) + + // Copy channel tags + { +- Octave_map::const_iterator itChTags = pfsStream.seek( "channelTags" ); ++ octave_map::const_iterator itChTags = pfsStream.seek( "channelTags" ); + if( itChTags != pfsStream.end() ) { + if( !pfsStream.contents( itChTags )(0).is_map() ) + { + throw pfs::Exception( "'channelTags' field must be a structure" ); + } +- Octave_map tagChannels = pfsStream.contents( itChTags )(0).map_value(); +- for( Octave_map::iterator itCh = tagChannels.begin(); itCh != tagChannels.end(); itCh++ ) { ++ octave_map tagChannels = pfsStream.contents( itChTags )(0).map_value(); ++ for( octave_map::iterator itCh = tagChannels.begin(); itCh != tagChannels.end(); itCh++ ) { + std::string channelName = tagChannels.key(itCh); + if( !tagChannels.contents( itCh )(0).is_map() ) { + throw pfs::Exception( "each channelTags file must be a structure" ); +@@ -173,8 +173,8 @@ DEFUN_DLD( pfsput, args, , helpString) + throw pfs::Exception( "can not set channel tag if channel is missing" ); + } + +- Octave_map tags = tagChannels.contents( itCh )(0).map_value(); +- for( Octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) { ++ octave_map tags = tagChannels.contents( itCh )(0).map_value(); ++ for( octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) { + std::string tagName = tags.key(itTag); + if( !tags.contents( itTag )(0).is_string() ) + throw pfs::Exception( "all channel tags must be given as strings" ); +--- a/src/octave/pfsget.cpp ++++ b/src/octave/pfsget.cpp +@@ -52,9 +52,9 @@ DEFUN_DLD( pfsget, args, , helpString) + return retval; + } + +- Octave_map pfsStream = args(0).map_value(); ++ octave_map pfsStream = args(0).map_value(); + +- Octave_map::const_iterator itFH = pfsStream.seek( "FH" ); ++ octave_map::const_iterator itFH = pfsStream.seek( "FH" ); + if( itFH == pfsStream.end() || + !pfsStream.contents( itFH )(0).is_real_scalar() ) + { +@@ -63,7 +63,7 @@ DEFUN_DLD( pfsget, args, , helpString) + } + FILE *fh = (FILE*)((long)(pfsStream.contents( itFH )(0).double_value())); + +- Octave_map::const_iterator itMode = pfsStream.seek( "MODE" ); ++ octave_map::const_iterator itMode = pfsStream.seek( "MODE" ); + if( itMode == pfsStream.end() || !pfsStream.contents( itMode )(0).is_string() ) + { + error( SCRIPT_NAME ": MODE field missing in the structure or it has wrong type"); +@@ -95,7 +95,7 @@ DEFUN_DLD( pfsget, args, , helpString) + + // Add channels as matrices to pfs stream struct + { +- Octave_map channels; ++ octave_scalar_map channels; + + pfs::ChannelIteratorPtr cit( frame->getChannelIterator() ); + while( cit->hasNext() ) { +@@ -115,7 +115,7 @@ DEFUN_DLD( pfsget, args, , helpString) + + //Add tags + { +- Octave_map tags; ++ octave_scalar_map tags; + + pfs::TagIteratorPtr it( frame->getTags()->getIterator() ); + while( it->hasNext() ) { +@@ -124,14 +124,14 @@ DEFUN_DLD( pfsget, args, , helpString) + } + pfsStream.assign( "tags", tags ); + +- Octave_map channelTagList; ++ octave_scalar_map channelTagList; + + //Copy all channel tags + pfs::ChannelIteratorPtr cit( frame->getChannelIterator() ); + while( cit->hasNext() ) { + pfs::Channel *ch = cit->getNext(); + +- Octave_map channelTags; ++ octave_scalar_map channelTags; + + pfs::TagIteratorPtr tit( ch->getTags()->getIterator() ); + while( tit->hasNext() ) { diff -Nru pfstools-1.8.5/debian/patches/series pfstools-1.8.5/debian/patches/series --- pfstools-1.8.5/debian/patches/series 2014-08-02 18:38:59.000000000 +0200 +++ pfstools-1.8.5/debian/patches/series 2015-07-20 20:13:53.000000000 +0200 @@ -2,3 +2,4 @@ octave-signal.dpatch Wformat-security.dpatch 20_stop_overriding_CXXFLAGS.diff +octave-4.0.diff
signature.asc
Description: This is a digitally signed message part
