4 files changed, 15 insertions, 34 deletions

diff --git a/cad/kicad-devel/Makefile.bzr_rev b/cad/kicad-devel/Makefile.bzr_rev
index a430160a8ddb..3d69a2db6129 100644
--- a/cad/kicad-devel/Makefile.bzr_rev
+++ b/cad/kicad-devel/Makefile.bzr_rev
@@ -1,5 +1,5 @@
 BOOST_RELEASE=  1.54.0
 BOOST_VERS=  1_54_0
-BZR_SRC_REV=  4913
+BZR_SRC_REV=  5104
 BZR_LIB_REV=  
-BZR_DOC_REV=  577
+BZR_DOC_REV=  601
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index 560f7e380937..26f8a0561dd3 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kicad/kicad-r4913.tar.bz2) = 5651ecace38272d99b6e90e60a48d5f15aa5363b8a084ce59c90d8d37322ccdf
-SIZE (kicad/kicad-r4913.tar.bz2) = 255516016
+SHA256 (kicad/kicad-r5104.tar.bz2) = 4a792017791153db9570c52b45ae2039c737570742becd621e1abb58952c0be8
+SIZE (kicad/kicad-r5104.tar.bz2) = 264006093
diff --git a/cad/kicad-devel/files/patch-utils-idftools-idf_parser.cpp b/cad/kicad-devel/files/patch-utils-idftools-idf_parser.cpp
deleted file mode 100644
index ed34465d26d0..000000000000
--- a/cad/kicad-devel/files/patch-utils-idftools-idf_parser.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- utils/idftools/idf_parser.cpp.orig	2014-06-05 12:18:16.912481412 +0000
-+++ utils/idftools/idf_parser.cpp	2014-06-05 12:19:15.292871266 +0000
-@@ -1489,6 +1489,6 @@
-     do
-     {
--        std::map<std::string, GROUP_OUTLINE*>::iterator its = olnGroup.begin();
--        std::map<std::string, GROUP_OUTLINE*>::iterator ite = olnGroup.end();
-+        std::multimap<std::string, GROUP_OUTLINE*>::iterator its = olnGroup.begin();
-+        std::multimap<std::string, GROUP_OUTLINE*>::iterator ite = olnGroup.end();
- 
-         while( its != ite )
-@@ -2906,6 +2906,6 @@
-         do
-         {
--            std::map<std::string, GROUP_OUTLINE*>::iterator its = olnGroup.begin();
--            std::map<std::string, GROUP_OUTLINE*>::iterator ite = olnGroup.end();
-+            std::multimap<std::string, GROUP_OUTLINE*>::iterator its = olnGroup.begin();
-+            std::multimap<std::string, GROUP_OUTLINE*>::iterator ite = olnGroup.end();
- 
-             while( its != ite )
-@@ -4103,6 +4103,6 @@
-     do
-     {
--        std::map<std::string, GROUP_OUTLINE*>::iterator os = olnGroup.begin();
--        std::map<std::string, GROUP_OUTLINE*>::iterator oe = olnGroup.end();
-+        std::multimap<std::string, GROUP_OUTLINE*>::iterator os = olnGroup.begin();
-+        std::multimap<std::string, GROUP_OUTLINE*>::iterator oe = olnGroup.end();
- 
-         while( os != oe )
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index b6d51345989f..96810aa93b25 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -179,7 +179,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/demos/interf_u/pagelayout_logo.kicad_wks
 %%DATADIR%%/demos/interf_u/tux.bmp
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.sch
-%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.dcm
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.lib
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.cmp
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_pcb
@@ -370,6 +369,8 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/library/intel.lib
 %%DATADIR%%/library/interface.dcm
 %%DATADIR%%/library/interface.lib
+%%DATADIR%%/library/ir.dcm
+%%DATADIR%%/library/ir.lib
 %%DATADIR%%/library/linear.dcm
 %%DATADIR%%/library/linear.lib
 %%DATADIR%%/library/logo.lib
@@ -513,6 +514,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/modules/Printtrafo_CHK_Part2_RevA_04Aug2010.kicad_pcb
 %%DATADIR%%/modules/Printtrafo_CHK_Part3_RevA_04Aug2010.kicad_pcb
 %%DATADIR%%/modules/Relays_ThroughHole.kicad_pcb
+%%DATADIR%%/modules/Resistor_ThroughHole.kicad_pcb
 %%DATADIR%%/modules/Resistors_SMD.kicad_pcb
 %%DATADIR%%/modules/Resistors_ThroughHole.kicad_pcb
 %%DATADIR%%/modules/Resistors_Universal.kicad_pcb
@@ -2043,6 +2045,14 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/modules/packages3d/discret/leds/led3_vertical_branco.wrl
 %%DATADIR%%/modules/packages3d/discret/leds/led3_vertical_verde.wings
 %%DATADIR%%/modules/packages3d/discret/leds/led3_vertical_verde.wrl
+%%DATADIR%%/modules/packages3d/discret/leds/led5-3_vertical-H10mm.wings
+%%DATADIR%%/modules/packages3d/discret/leds/led5-3_vertical-H10mm.wrl
+%%DATADIR%%/modules/packages3d/discret/leds/led5-3_vertical-H15mm.wings
+%%DATADIR%%/modules/packages3d/discret/leds/led5-3_vertical-H15mm.wrl
+%%DATADIR%%/modules/packages3d/discret/leds/led5-3_vertical-H5mm.wings
+%%DATADIR%%/modules/packages3d/discret/leds/led5-3_vertical-H5mm.wrl
+%%DATADIR%%/modules/packages3d/discret/leds/led5-3_vertical.wings
+%%DATADIR%%/modules/packages3d/discret/leds/led5-3_vertical.wrl
 %%DATADIR%%/modules/packages3d/discret/leds/led5_vertical_amarelo.wings
 %%DATADIR%%/modules/packages3d/discret/leds/led5_vertical_amarelo.wrl
 %%DATADIR%%/modules/packages3d/discret/leds/led5_vertical_branco.wings