diff -Nru kicad-201710111449+f685cfa~60~ubuntu15.04.1/debian/changelog kicad-201710121449+e0b9a21~60~ubuntu15.04.1/debian/changelog --- kicad-201710111449+f685cfa~60~ubuntu15.04.1/debian/changelog 2017-10-11 14:49:23.000000000 +0000 +++ kicad-201710121449+e0b9a21~60~ubuntu15.04.1/debian/changelog 2017-10-12 14:49:34.000000000 +0000 @@ -1,8 +1,8 @@ -kicad (201710111449+f685cfa~60~ubuntu15.04.1) vivid; urgency=low +kicad (201710121449+e0b9a21~60~ubuntu15.04.1) vivid; urgency=low * Auto build. - -- js-reynaud Wed, 11 Oct 2017 14:49:23 +0000 + -- js-reynaud Thu, 12 Oct 2017 14:49:34 +0000 kicad (3.9.9-14) unstable; urgency=medium diff -Nru kicad-201710111449+f685cfa~60~ubuntu15.04.1/debian/git-build-recipe.manifest kicad-201710121449+e0b9a21~60~ubuntu15.04.1/debian/git-build-recipe.manifest --- kicad-201710111449+f685cfa~60~ubuntu15.04.1/debian/git-build-recipe.manifest 2017-10-11 14:49:23.000000000 +0000 +++ kicad-201710121449+e0b9a21~60~ubuntu15.04.1/debian/git-build-recipe.manifest 2017-10-12 14:49:34.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version 201710111449+f685cfa~60 +# git-build-recipe format 0.4 deb-version 201710121449+e0b9a21~60 lp:~js-reynaud/+git/kicad-daily-pkg git-commit:24233691c08d2b443fa2a547e8d2e49c0d44fbfc -nest kicad lp:kicad kicad git-commit:f685cfaf3d6d2cf777a67ffa2cfc21261a0d8636 +nest kicad lp:kicad kicad git-commit:e0b9a21417e694dd7b2550b3746d8a6bf9318404 diff -Nru kicad-201710111449+f685cfa~60~ubuntu15.04.1/kicad/3d-viewer/3d_cache/sg/ifsg_api.cpp kicad-201710121449+e0b9a21~60~ubuntu15.04.1/kicad/3d-viewer/3d_cache/sg/ifsg_api.cpp --- kicad-201710111449+f685cfa~60~ubuntu15.04.1/kicad/3d-viewer/3d_cache/sg/ifsg_api.cpp 2017-10-11 14:49:22.000000000 +0000 +++ kicad-201710121449+e0b9a21~60~ubuntu15.04.1/kicad/3d-viewer/3d_cache/sg/ifsg_api.cpp 2017-10-12 14:49:33.000000000 +0000 @@ -128,11 +128,10 @@ if( op.fail() ) { - std::ostringstream ostr; - ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "failed to open file" ); - ostr << " * [INFO] " << errmsg.ToUTF8() << " '" << filename << "'"; - wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() ); + wxString errmsg; + errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; + errmsg << " * [INFO] " << "failed to open file" << " '" << filename << "'"; + wxLogTrace( MASK_3D_SG, errmsg ); return false; } @@ -155,13 +154,10 @@ CLOSE_STREAM( op ); - do { - std::ostringstream ostr; - ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "problems encountered writing file" ); - ostr << " * [INFO] " << errmsg.ToUTF8() << " '" << filename << "'"; - wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() ); - } while( 0 ); + wxString errmsg; + errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; + errmsg << " * [INFO] " << "problems encountered writing file" << " '" << filename << "'"; + wxLogTrace( MASK_3D_SG, errmsg ); return false; } @@ -260,12 +256,11 @@ { if( !overwrite ) { - std::ostringstream ostr; - ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "file exists; not overwriting" ); - ostr << " * [INFO] " << errmsg.ToUTF8() << " '"; - ostr << aFileName << "'"; - wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() ); + wxString errmsg; + errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; + errmsg << " * [INFO] " << "file exists; not overwriting" << " '"; + errmsg << aFileName << "'"; + wxLogTrace( MASK_3D_SG, errmsg ); return false; } @@ -273,12 +268,11 @@ // make sure we make no attempt to write a directory if( !wxFileName::FileExists( aFileName ) ) { - std::ostringstream ostr; - ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "specified path is a directory" ); - ostr << " * [INFO] " << errmsg.ToUTF8() << " '"; - ostr << aFileName << "'"; - wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() ); + wxString errmsg; + errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; + errmsg << " * [INFO] " << "specified path is a directory" << " '"; + errmsg << aFileName << "'"; + wxLogTrace( MASK_3D_SG, errmsg ); return false; } } @@ -287,11 +281,10 @@ if( output.fail() ) { - std::ostringstream ostr; - ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "failed to open file" ); - ostr << " * [INFO] " << errmsg.ToUTF8() << " '" << aFileName << "'"; - wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() ); + wxString errmsg; + errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; + errmsg << " * [INFO] " << "failed to open file" << " '" << aFileName << "'"; + wxLogTrace( MASK_3D_SG, errmsg ); return false; } diff -Nru kicad-201710111449+f685cfa~60~ubuntu15.04.1/kicad/eeschema/dialogs/dialog_eeschema_config_fbp.cpp kicad-201710121449+e0b9a21~60~ubuntu15.04.1/kicad/eeschema/dialogs/dialog_eeschema_config_fbp.cpp --- kicad-201710111449+f685cfa~60~ubuntu15.04.1/kicad/eeschema/dialogs/dialog_eeschema_config_fbp.cpp 2017-10-11 14:49:22.000000000 +0000 +++ kicad-201710121449+e0b9a21~60~ubuntu15.04.1/kicad/eeschema/dialogs/dialog_eeschema_config_fbp.cpp 2017-10-12 14:49:33.000000000 +0000 @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 28 2015) +// C++ code generated with wxFormBuilder (version Aug 4 2017) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -50,10 +50,10 @@ bRightSizer->Add( m_buttonRemoveLib, 0, wxALL|wxEXPAND, 5 ); - m_buttonUp = new wxButton( this, wxID_ANY, _("Up"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonUp = new wxButton( this, wxID_ANY, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 ); bRightSizer->Add( m_buttonUp, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - m_buttonDown = new wxButton( this, wxID_ANY, _("Down"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonDown = new wxButton( this, wxID_ANY, _("Move Down"), wxDefaultPosition, wxDefaultSize, 0 ); bRightSizer->Add( m_buttonDown, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); diff -Nru kicad-201710111449+f685cfa~60~ubuntu15.04.1/kicad/eeschema/dialogs/dialog_eeschema_config_fbp.fbp kicad-201710121449+e0b9a21~60~ubuntu15.04.1/kicad/eeschema/dialogs/dialog_eeschema_config_fbp.fbp --- kicad-201710111449+f685cfa~60~ubuntu15.04.1/kicad/eeschema/dialogs/dialog_eeschema_config_fbp.fbp 2017-10-11 14:49:22.000000000 +0000 +++ kicad-201710121449+e0b9a21~60~ubuntu15.04.1/kicad/eeschema/dialogs/dialog_eeschema_config_fbp.fbp 2017-10-12 14:49:33.000000000 +0000 @@ -588,7 +588,7 @@ 0 0 wxID_ANY - Up + Move Up 0 @@ -676,7 +676,7 @@ 0 0 wxID_ANY - Down + Move Down 0 diff -Nru kicad-201710111449+f685cfa~60~ubuntu15.04.1/kicad/eeschema/dialogs/dialog_eeschema_config_fbp.h kicad-201710121449+e0b9a21~60~ubuntu15.04.1/kicad/eeschema/dialogs/dialog_eeschema_config_fbp.h --- kicad-201710111449+f685cfa~60~ubuntu15.04.1/kicad/eeschema/dialogs/dialog_eeschema_config_fbp.h 2017-10-11 14:49:22.000000000 +0000 +++ kicad-201710121449+e0b9a21~60~ubuntu15.04.1/kicad/eeschema/dialogs/dialog_eeschema_config_fbp.h 2017-10-12 14:49:33.000000000 +0000 @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 28 2015) +// C++ code generated with wxFormBuilder (version Aug 4 2017) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff -Nru kicad-201710111449+f685cfa~60~ubuntu15.04.1/kicad/include/multivector.h kicad-201710121449+e0b9a21~60~ubuntu15.04.1/kicad/include/multivector.h --- kicad-201710111449+f685cfa~60~ubuntu15.04.1/kicad/include/multivector.h 2017-10-11 14:49:23.000000000 +0000 +++ kicad-201710121449+e0b9a21~60~ubuntu15.04.1/kicad/include/multivector.h 2017-10-12 14:49:34.000000000 +0000 @@ -232,10 +232,16 @@ m_data[ i ].sort(); } + /** + * Remove duplicate elements in list + */ void unique() { for( int i = 0; i < TYPES_COUNT; ++i ) - m_data[ i ].unique(); + { + if( m_data[ i ].size() > 1 ) + m_data[ i ].unique(); + } } ITEM_PTR_VECTOR& operator[]( int aType )