diff -Nru kicad-201910071149+34b26a0~86~ubuntu16.04.1/debian/changelog kicad-201910081149+58d4a8b~86~ubuntu16.04.1/debian/changelog --- kicad-201910071149+34b26a0~86~ubuntu16.04.1/debian/changelog 2019-10-07 11:49:32.000000000 +0000 +++ kicad-201910081149+58d4a8b~86~ubuntu16.04.1/debian/changelog 2019-10-08 11:49:17.000000000 +0000 @@ -1,8 +1,8 @@ -kicad (201910071149+34b26a0~86~ubuntu16.04.1) xenial; urgency=low +kicad (201910081149+58d4a8b~86~ubuntu16.04.1) xenial; urgency=low * Auto build. - -- js-reynaud Mon, 07 Oct 2019 11:49:32 +0000 + -- js-reynaud Tue, 08 Oct 2019 11:49:17 +0000 kicad (3.9.9-16) unstable; urgency=medium diff -Nru kicad-201910071149+34b26a0~86~ubuntu16.04.1/debian/git-build-recipe.manifest kicad-201910081149+58d4a8b~86~ubuntu16.04.1/debian/git-build-recipe.manifest --- kicad-201910071149+34b26a0~86~ubuntu16.04.1/debian/git-build-recipe.manifest 2019-10-07 11:49:32.000000000 +0000 +++ kicad-201910081149+58d4a8b~86~ubuntu16.04.1/debian/git-build-recipe.manifest 2019-10-08 11:49:17.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version 201910071149+34b26a0~86 +# git-build-recipe format 0.4 deb-version 201910081149+58d4a8b~86 lp:~js-reynaud/+git/kicad-daily-pkg git-commit:4ee21123c8822e6340a9c6f0ce4ced4d30acfeb1 -nest kicad lp:kicad kicad git-commit:34b26a0ac7d78e52ae8f2578ca55a8510b8da2af +nest kicad lp:kicad kicad git-commit:58d4a8bb4a65a258b99077fff48b7b9f4a4eee8d diff -Nru kicad-201910071149+34b26a0~86~ubuntu16.04.1/kicad/pcbnew/kicad_netlist_reader.cpp kicad-201910081149+58d4a8b~86~ubuntu16.04.1/kicad/pcbnew/kicad_netlist_reader.cpp --- kicad-201910071149+34b26a0~86~ubuntu16.04.1/kicad/pcbnew/kicad_netlist_reader.cpp 2019-10-07 11:49:32.000000000 +0000 +++ kicad-201910081149+58d4a8b~86~ubuntu16.04.1/kicad/pcbnew/kicad_netlist_reader.cpp 2019-10-08 11:49:16.000000000 +0000 @@ -83,8 +83,7 @@ void KICAD_NETLIST_PARSER::Parse() { - int plevel = 0; // the count of ')' to read and end of file, - // after parsing all sections + int plevel = 0; // the count of ')' to read at end of file after parsing all sections while( ( token = NextTok() ) != T_EOF ) { @@ -94,8 +93,7 @@ switch( token ) { case T_export: // The netlist starts here. - // nothing to do here, - // just increment the count of ')' to read and end of file + // nothing to do here, just increment the count of ')' to read at end of file plevel++; break; @@ -106,43 +104,43 @@ break; case T_components: // The section comp starts here. - while( ( token = NextTok() ) != T_RIGHT ) + while( ( token = NextTok() ) != T_EOF ) { - if( token == T_LEFT ) + if( token == T_RIGHT ) + break; + else if( token == T_LEFT ) token = NextTok(); - if( token == T_comp ) // A component section found. Read it + if( token == T_comp ) // A component section found. Read it parseComponent(); } break; case T_nets: // The section nets starts here. - while( ( token = NextTok() ) != T_RIGHT ) + while( ( token = NextTok() ) != T_EOF ) { - if( token == T_LEFT ) + if( token == T_RIGHT ) + break; + else if( token == T_LEFT ) token = NextTok(); - if( token == T_net ) - { - // A net section if found. Read it + if( token == T_net ) // A net section if found. Read it parseNet(); - } } break; case T_libparts: // The section libparts starts here. - while( ( token = NextTok() ) != T_RIGHT ) + while( ( token = NextTok() ) != T_EOF ) { - if( token == T_LEFT ) + if( token == T_RIGHT ) + break; + else if( token == T_LEFT ) token = NextTok(); - if( token == T_libpart ) - { - // A libpart section if found. Read it + if( token == T_libpart ) // A libpart section if found. Read it parseLibPartList(); - } } break; @@ -159,7 +157,6 @@ break; case T_RIGHT: // The closing parenthesis of the file. - // Not used (mainly they are comments), just skip it plevel--; break; @@ -194,9 +191,11 @@ int nodecount = 0; // The token net was read, so the next data is (code ) - while( (token = NextTok()) != T_RIGHT ) + while( (token = NextTok()) != T_EOF ) { - if( token == T_LEFT ) + if( token == T_RIGHT ) + break; + else if( token == T_LEFT ) token = NextTok(); switch( token ) @@ -218,9 +217,11 @@ break; case T_node: - while( (token = NextTok()) != T_RIGHT ) + while( (token = NextTok()) != T_EOF ) { - if( token == T_LEFT ) + if( token == T_RIGHT ) + break; + else if( token == T_LEFT ) token = NextTok(); switch( token ) @@ -348,7 +349,12 @@ break; case T_sheetpath: - while( ( token = NextTok() ) != T_tstamps ); + while( ( token = NextTok() ) != T_EOF ) + { + if( token == T_tstamps ) + break; + } + NeedSYMBOLorNUMBER(); pathtimestamp = FROM_UTF8( CurText() ); NeedRIGHT(); diff -Nru kicad-201910071149+34b26a0~86~ubuntu16.04.1/kicad/pcbnew/router/router_tool.cpp kicad-201910081149+58d4a8b~86~ubuntu16.04.1/kicad/pcbnew/router/router_tool.cpp --- kicad-201910071149+34b26a0~86~ubuntu16.04.1/kicad/pcbnew/router/router_tool.cpp 2019-10-07 11:49:32.000000000 +0000 +++ kicad-201910081149+58d4a8b~86~ubuntu16.04.1/kicad/pcbnew/router/router_tool.cpp 2019-10-08 11:49:16.000000000 +0000 @@ -76,32 +76,32 @@ #define _(s) s static const TOOL_ACTION ACT_EndTrack( "pcbnew.InteractiveRouter.EndTrack", - AS_CONTEXT, + AS_CONTEXT, WXK_END, "", _( "Finish Track" ), _( "Stops laying the current track." ), checked_ok_xpm ); -static const TOOL_ACTION ACT_AutoEndRoute( "pcbnew.InteractiveRouter.AutoEndRoute", - AS_CONTEXT, +static const TOOL_ACTION ACT_AutoEndRoute( "pcbnew.InteractiveRouter.AutoEndRoute", + AS_CONTEXT, 'F', "", _( "Auto-finish Track" ), _( "Automagically finishes laying the current track." ) ); static const TOOL_ACTION ACT_PlaceThroughVia( "pcbnew.InteractiveRouter.PlaceVia", - AS_CONTEXT, + AS_CONTEXT, 'V', LEGACY_HK_NAME( "Add Through Via" ), _( "Place Through Via" ), _( "Adds a through-hole via at the end of currently routed track." ), via_xpm, AF_NONE, (void*) VIA_ACTION_FLAGS::VIA ); static const TOOL_ACTION ACT_PlaceBlindVia( "pcbnew.InteractiveRouter.PlaceBlindVia", - AS_CONTEXT, + AS_CONTEXT, MD_ALT + MD_SHIFT + 'V', LEGACY_HK_NAME( "Add Blind/Buried Via" ), _( "Place Blind/Buried Via" ), _( "Adds a blind or buried via at the end of currently routed track."), via_buried_xpm, AF_NONE, (void*) VIA_ACTION_FLAGS::BLIND_VIA ); static const TOOL_ACTION ACT_PlaceMicroVia( "pcbnew.InteractiveRouter.PlaceMicroVia", - AS_CONTEXT, + AS_CONTEXT, MD_CTRL + 'V', LEGACY_HK_NAME( "Add MicroVia" ), _( "Place Microvia" ), _( "Adds a microvia at the end of currently routed track." ), via_microvia_xpm, AF_NONE, (void*) VIA_ACTION_FLAGS::MICROVIA ); @@ -115,7 +115,7 @@ (void*) ( VIA_ACTION_FLAGS::VIA | VIA_ACTION_FLAGS::SELECT_LAYER ) ); static const TOOL_ACTION ACT_SelLayerAndPlaceBlindVia( "pcbnew.InteractiveRouter.SelLayerAndPlaceBlindVia", - AS_CONTEXT, + AS_CONTEXT, MD_ALT + '<', LEGACY_HK_NAME( "Select Layer and Add Blind/Buried Via" ), _( "Select Layer and Place Blind/Buried Via..." ), _( "Select a layer, then add a blind or buried via at the end of currently routed track."), @@ -123,13 +123,13 @@ (void*) ( VIA_ACTION_FLAGS::BLIND_VIA | VIA_ACTION_FLAGS::SELECT_LAYER ) ); static const TOOL_ACTION ACT_CustomTrackWidth( "pcbnew.InteractiveRouter.CustomTrackViaSize", - AS_CONTEXT, + AS_CONTEXT, 'Q', LEGACY_HK_NAME( "Custom Track/Via Size" ), _( "Custom Track/Via Size..." ), _( "Shows a dialog for changing the track width and via size." ), width_track_xpm ); -static const TOOL_ACTION ACT_SwitchPosture( "pcbnew.InteractiveRouter.SwitchPosture", +static const TOOL_ACTION ACT_SwitchPosture( "pcbnew.InteractiveRouter.SwitchPosture", AS_CONTEXT, '/', LEGACY_HK_NAME( "Switch Track Posture" ), _( "Switch Track Posture" ), @@ -1215,7 +1215,6 @@ if( item->Type() != PCB_TRACE_T ) return 0; - Init(); Activate(); m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true );