4 files changed, 139 insertions, 4 deletions

diff --git a/cad/kicad-devel/Makefile.bzr_rev b/cad/kicad-devel/Makefile.bzr_rev
index 94a8b5540e56..b8cb382dee35 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=  5542
+BZR_SRC_REV=  5612
 BZR_LIB_REV=  
-BZR_DOC_REV=  703
+BZR_DOC_REV=  751
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index ee42b8c7b544..c1350e369035 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kicad/kicad-r5542.tar.bz2) = 5433858a3bd5749218d6504cdb52e409b6a9c4fe05172fc8e0a3c2638479f2f5
-SIZE (kicad/kicad-r5542.tar.bz2) = 239413129
+SHA256 (kicad/kicad-r5612.tar.bz2) = b547fd8e2108f8b574fa990a4051505f608e7893731719ec02ec782590a29d55
+SIZE (kicad/kicad-r5612.tar.bz2) = 240348800
diff --git a/cad/kicad-devel/files/patch-include-common.h b/cad/kicad-devel/files/patch-include-common.h
new file mode 100644
index 000000000000..6a3aa545a64d
--- /dev/null
+++ b/cad/kicad-devel/files/patch-include-common.h
@@ -0,0 +1,9 @@
+--- include/common.h.orig	2015-04-19 12:57:35.742686441 +0000
++++ include/common.h	2015-04-19 13:01:10.154899960 +0000
+@@ -56,5 +56,5 @@
+                                                      */
+ #define GR_KB_CTRL       0x40000000                 // CTRL depressed
+-#define GR_KB_ALT        0x80000000                 // ALT depressed
++#define GR_KB_ALT        0x04000000                 // ALT depressed
+ #define GR_KB_SHIFT      (GR_KB_LEFTSHIFT | GR_KB_RIGHTSHIFT)
+ #define GR_KB_SHIFTCTRL  (GR_KB_SHIFT | GR_KB_CTRL)
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index 73a904f685d7..025988326e38 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -392,6 +392,8 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/library/linear.lib
 %%DATADIR%%/library/logo.lib
 %%DATADIR%%/library/makefile
+%%DATADIR%%/library/maxim.dcm
+%%DATADIR%%/library/maxim.lib
 %%DATADIR%%/library/memory.dcm
 %%DATADIR%%/library/memory.lib
 %%DATADIR%%/library/microchip.dcm
@@ -3877,6 +3879,130 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/modules/smd_trans-diodes.equ
 %%DATADIR%%/modules/sockets_miscellaneous.brd
 %%DATADIR%%/modules/standard-trans-diodes.equ
+%%DATADIR%%/template/Arduino_As_Uno_R3/Arduino_As_Uno-cache.lib
+%%DATADIR%%/template/Arduino_As_Uno_R3/Arduino_As_Uno.bak
+%%DATADIR%%/template/Arduino_As_Uno_R3/Arduino_As_Uno.cmp
+%%DATADIR%%/template/Arduino_As_Uno_R3/Arduino_As_Uno.kicad_pcb
+%%DATADIR%%/template/Arduino_As_Uno_R3/Arduino_As_Uno.kicad_pcb-bak
+%%DATADIR%%/template/Arduino_As_Uno_R3/Arduino_As_Uno.net
+%%DATADIR%%/template/Arduino_As_Uno_R3/Arduino_As_Uno.pro
+%%DATADIR%%/template/Arduino_As_Uno_R3/Arduino_As_Uno.sch
+%%DATADIR%%/template/Arduino_As_Uno_R3/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x06.wings
+%%DATADIR%%/template/Arduino_As_Uno_R3/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x06.wrl
+%%DATADIR%%/template/Arduino_As_Uno_R3/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x08.wings
+%%DATADIR%%/template/Arduino_As_Uno_R3/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x08.wrl
+%%DATADIR%%/template/Arduino_As_Uno_R3/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x10.wings
+%%DATADIR%%/template/Arduino_As_Uno_R3/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x10.wrl
+%%DATADIR%%/template/Arduino_As_Uno_R3/Socket_Arduino_Uno.pretty/Arduino_1pin.kicad_mod
+%%DATADIR%%/template/Arduino_As_Uno_R3/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x06.kicad_mod
+%%DATADIR%%/template/Arduino_As_Uno_R3/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x08.kicad_mod
+%%DATADIR%%/template/Arduino_As_Uno_R3/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x10.kicad_mod
+%%DATADIR%%/template/Arduino_As_Uno_R3/meta/brd.png
+%%DATADIR%%/template/Arduino_As_Uno_R3/meta/icon.png
+%%DATADIR%%/template/Arduino_As_Uno_R3/meta/info.html
+%%DATADIR%%/template/Arduino_Fio/Arduino_Fio-cache.lib
+%%DATADIR%%/template/Arduino_Fio/Arduino_Fio.bak
+%%DATADIR%%/template/Arduino_Fio/Arduino_Fio.cmp
+%%DATADIR%%/template/Arduino_Fio/Arduino_Fio.kicad_pcb
+%%DATADIR%%/template/Arduino_Fio/Arduino_Fio.kicad_pcb-bak
+%%DATADIR%%/template/Arduino_Fio/Arduino_Fio.net
+%%DATADIR%%/template/Arduino_Fio/Arduino_Fio.pro
+%%DATADIR%%/template/Arduino_Fio/Arduino_Fio.sch
+%%DATADIR%%/template/Arduino_Fio/Socket_Arduino_Fio.3dshapes/Socket_header_Arduino_1x14.wings
+%%DATADIR%%/template/Arduino_Fio/Socket_Arduino_Fio.3dshapes/Socket_header_Arduino_1x14.wrl
+%%DATADIR%%/template/Arduino_Fio/Socket_Arduino_Fio.pretty/Socket_Strip_Straight_1x14.kicad_mod
+%%DATADIR%%/template/Arduino_Fio/meta/brd.png
+%%DATADIR%%/template/Arduino_Fio/meta/icon.png
+%%DATADIR%%/template/Arduino_Fio/meta/info.html
+%%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega-cache.bak
+%%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega-cache.dcm
+%%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega-cache.lib
+%%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega.bak
+%%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega.cmp
+%%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega.kicad_pcb
+%%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega.kicad_pcb-bak
+%%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega.net
+%%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega.pro
+%%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega.sch
+%%DATADIR%%/template/Arduino_Mega_R3/Socket_Arduino_Mega.3dshapes/Socket_header_Arduino_1x08.wings
+%%DATADIR%%/template/Arduino_Mega_R3/Socket_Arduino_Mega.3dshapes/Socket_header_Arduino_1x08.wrl
+%%DATADIR%%/template/Arduino_Mega_R3/Socket_Arduino_Mega.3dshapes/Socket_header_Arduino_1x10.wings
+%%DATADIR%%/template/Arduino_Mega_R3/Socket_Arduino_Mega.3dshapes/Socket_header_Arduino_1x10.wrl
+%%DATADIR%%/template/Arduino_Mega_R3/Socket_Arduino_Mega.3dshapes/Socket_header_Arduino_2x18.wings
+%%DATADIR%%/template/Arduino_Mega_R3/Socket_Arduino_Mega.3dshapes/Socket_header_Arduino_2x18.wrl
+%%DATADIR%%/template/Arduino_Mega_R3/Socket_Arduino_Mega.pretty/Arduino_1pin.kicad_mod
+%%DATADIR%%/template/Arduino_Mega_R3/Socket_Arduino_Mega.pretty/Socket_Strip_Arduino_1x08.kicad_mod
+%%DATADIR%%/template/Arduino_Mega_R3/Socket_Arduino_Mega.pretty/Socket_Strip_Arduino_1x10.kicad_mod
+%%DATADIR%%/template/Arduino_Mega_R3/Socket_Arduino_Mega.pretty/Socket_Strip_Arduino_2x18.kicad_mod
+%%DATADIR%%/template/Arduino_Mega_R3/meta/brd.png
+%%DATADIR%%/template/Arduino_Mega_R3/meta/icon.png
+%%DATADIR%%/template/Arduino_Mega_R3/meta/info.html
+%%DATADIR%%/template/Arduino_Micro/Arduino_Micro-cache.lib
+%%DATADIR%%/template/Arduino_Micro/Arduino_Micro.bak
+%%DATADIR%%/template/Arduino_Micro/Arduino_Micro.cmp
+%%DATADIR%%/template/Arduino_Micro/Arduino_Micro.kicad_pcb
+%%DATADIR%%/template/Arduino_Micro/Arduino_Micro.kicad_pcb-bak
+%%DATADIR%%/template/Arduino_Micro/Arduino_Micro.net
+%%DATADIR%%/template/Arduino_Micro/Arduino_Micro.pro
+%%DATADIR%%/template/Arduino_Micro/Arduino_Micro.sch
+%%DATADIR%%/template/Arduino_Micro/Socket_Arduino_Micro.3dshapes/Socket_header_Arduino_1x17.wings
+%%DATADIR%%/template/Arduino_Micro/Socket_Arduino_Micro.3dshapes/Socket_header_Arduino_1x17.wrl
+%%DATADIR%%/template/Arduino_Micro/Socket_Arduino_Micro.pretty/1pin_Micro.kicad_mod
+%%DATADIR%%/template/Arduino_Micro/Socket_Arduino_Micro.pretty/Socket_Strip_Arduino_1x17.kicad_mod
+%%DATADIR%%/template/Arduino_Micro/meta/brd.png
+%%DATADIR%%/template/Arduino_Micro/meta/icon.png
+%%DATADIR%%/template/Arduino_Micro/meta/info.html
+%%DATADIR%%/template/Arduino_Mini/Arduino_Mini-cache.lib
+%%DATADIR%%/template/Arduino_Mini/Arduino_Mini.bak
+%%DATADIR%%/template/Arduino_Mini/Arduino_Mini.cmp
+%%DATADIR%%/template/Arduino_Mini/Arduino_Mini.kicad_pcb
+%%DATADIR%%/template/Arduino_Mini/Arduino_Mini.kicad_pcb-bak
+%%DATADIR%%/template/Arduino_Mini/Arduino_Mini.net
+%%DATADIR%%/template/Arduino_Mini/Arduino_Mini.pro
+%%DATADIR%%/template/Arduino_Mini/Arduino_Mini.sch
+%%DATADIR%%/template/Arduino_Mini/Socket_Arduino_Mini.3dshapes/Socket_header_Arduino_1x12.wings
+%%DATADIR%%/template/Arduino_Mini/Socket_Arduino_Mini.3dshapes/Socket_header_Arduino_1x12.wrl
+%%DATADIR%%/template/Arduino_Mini/Socket_Arduino_Mini.pretty/Socket_Strip_Arduino_1x02.kicad_mod
+%%DATADIR%%/template/Arduino_Mini/Socket_Arduino_Mini.pretty/Socket_Strip_Arduino_1x05.kicad_mod
+%%DATADIR%%/template/Arduino_Mini/Socket_Arduino_Mini.pretty/Socket_Strip_Arduino_1x12.kicad_mod
+%%DATADIR%%/template/Arduino_Mini/meta/brd.png
+%%DATADIR%%/template/Arduino_Mini/meta/icon.png
+%%DATADIR%%/template/Arduino_Mini/meta/info.html
+%%DATADIR%%/template/Arduino_Nano/Arduino_Nano-cache.bak
+%%DATADIR%%/template/Arduino_Nano/Arduino_Nano-cache.dcm
+%%DATADIR%%/template/Arduino_Nano/Arduino_Nano-cache.lib
+%%DATADIR%%/template/Arduino_Nano/Arduino_Nano.bak
+%%DATADIR%%/template/Arduino_Nano/Arduino_Nano.cmp
+%%DATADIR%%/template/Arduino_Nano/Arduino_Nano.kicad_pcb
+%%DATADIR%%/template/Arduino_Nano/Arduino_Nano.kicad_pcb-bak
+%%DATADIR%%/template/Arduino_Nano/Arduino_Nano.net
+%%DATADIR%%/template/Arduino_Nano/Arduino_Nano.pro
+%%DATADIR%%/template/Arduino_Nano/Arduino_Nano.sch
+%%DATADIR%%/template/Arduino_Nano/Socket_Arduino_Nano.3dshapes/Socket_header_Arduino_1x15.wings
+%%DATADIR%%/template/Arduino_Nano/Socket_Arduino_Nano.3dshapes/Socket_header_Arduino_1x15.wrl
+%%DATADIR%%/template/Arduino_Nano/Socket_Arduino_Nano.pretty/1pin_Nano.kicad_mod
+%%DATADIR%%/template/Arduino_Nano/Socket_Arduino_Nano.pretty/Socket_Strip_Arduino_1x15.kicad_mod
+%%DATADIR%%/template/Arduino_Nano/meta/brd.png
+%%DATADIR%%/template/Arduino_Nano/meta/icon.png
+%%DATADIR%%/template/Arduino_Nano/meta/info.html
+%%DATADIR%%/template/Arduino_Pro_Mini/Arduino_Mini_Pro.bak
+%%DATADIR%%/template/Arduino_Pro_Mini/Arduino_Mini_Pro.kicad_pcb-bak
+%%DATADIR%%/template/Arduino_Pro_Mini/Arduino_Pro_Mini-cache.lib
+%%DATADIR%%/template/Arduino_Pro_Mini/Arduino_Pro_Mini.bak
+%%DATADIR%%/template/Arduino_Pro_Mini/Arduino_Pro_Mini.cmp
+%%DATADIR%%/template/Arduino_Pro_Mini/Arduino_Pro_Mini.kicad_pcb
+%%DATADIR%%/template/Arduino_Pro_Mini/Arduino_Pro_Mini.kicad_pcb-bak
+%%DATADIR%%/template/Arduino_Pro_Mini/Arduino_Pro_Mini.net
+%%DATADIR%%/template/Arduino_Pro_Mini/Arduino_Pro_Mini.pro
+%%DATADIR%%/template/Arduino_Pro_Mini/Arduino_Pro_Mini.sch
+%%DATADIR%%/template/Arduino_Pro_Mini/Socket_Arduino_Pro_Mini.3dshapes/Socket_header_Arduino_1x12.wings
+%%DATADIR%%/template/Arduino_Pro_Mini/Socket_Arduino_Pro_Mini.3dshapes/Socket_header_Arduino_1x12.wrl
+%%DATADIR%%/template/Arduino_Pro_Mini/Socket_Arduino_Pro_Mini.pretty/Socket_Strip_Arduino_1x02.kicad_mod
+%%DATADIR%%/template/Arduino_Pro_Mini/Socket_Arduino_Pro_Mini.pretty/Socket_Strip_Arduino_1x06.kicad_mod
+%%DATADIR%%/template/Arduino_Pro_Mini/Socket_Arduino_Pro_Mini.pretty/Socket_Strip_Arduino_1x12.kicad_mod
+%%DATADIR%%/template/Arduino_Pro_Mini/meta/brd.png
+%%DATADIR%%/template/Arduino_Pro_Mini/meta/icon.png
+%%DATADIR%%/template/Arduino_Pro_Mini/meta/info.html
 %%DATADIR%%/template/CMakeLists.txt
 %%DATADIR%%/template/fp-lib-table.for-eagle-6.4.0
 %%DATADIR%%/template/fp-lib-table.for-github