15 files changed, 1053 insertions, 163 deletions

diff --git a/databases/mysql-workbench52/Makefile b/databases/mysql-workbench52/Makefile
index 6793984fefcc..1bb0d52dc413 100644
--- a/databases/mysql-workbench52/Makefile
+++ b/databases/mysql-workbench52/Makefile
@@ -1,26 +1,113 @@
-# New ports collection makefile for:	MySQL Workbench
-# Date created:				26 June 2009
-# Whom:					Maxim Ignatenko
-#
+# Created by: Maxim Ignatenko
 # $FreeBSD$
-#
 
-PORTVERSION=	5.2.1
-PORTREVISION=	2
+PORTNAME=	mysql-workbench-gpl
+PORTVERSION=	5.2.47
+DISTVERSIONSUFFIX=	-src
+CATEGORIES=	databases
+MASTER_SITES=	MYSQL/MySQLGUITools
 PKGNAMESUFFIX=	52
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Visual database design tool
 
-LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	multi
 
-MASTERDIR=	${.CURDIR}/../mysql-workbench51
-DISTINFO_FILE=	${.CURDIR}/distinfo
-EXTRA_PATCHES=	${.CURDIR}/files/52-patch-frontend__linux__workbench__Makefile.am \
-		${.CURDIR}/files/52-patch-configure.in \
-		${.CURDIR}/files/52-patch-ext__ctemplate__ctemplate-src__configure.ac \
-		${.CURDIR}/files/52-patch-modules__db__Makefile.am
-PLIST=	${.CURDIR}/pkg-plist
+LIB_DEPENDS=	zip:${PORTSDIR}/archivers/libzip \
+		boost_system:${PORTSDIR}/devel/boost-libs \
+		sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
+		pcre:${PORTSDIR}/devel/pcre \
+		cairo:${PORTSDIR}/graphics/cairo \
+		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
+		gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
+		ctemplate:${PORTSDIR}/textproc/google-ctemplate \
+		tinyxml:${PORTSDIR}/textproc/tinyxml \
+		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
+RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}pexpect>0:${PORTSDIR}/misc/py-pexpect \
+		${PYTHON_PKGNAMEPREFIX}paramiko>0:${PORTSDIR}/security/py-paramiko
 
-CONFLICTS=	mysql-workbench-oss51*
+OPTIONS_DEFINE=	PYTHON_UTILS UNIXODBC
+PYTHON_UTILS_DESC=	Python scripts useful for administering MySQL
 
-.include "${MASTERDIR}/Makefile"
+USES=		gettext gmake pathfix pkgconfig shared-mime-info
+USE_GCC=	any
+USE_GL=		gl
+USE_GNOME=	gnomehier gtk20 libxml2
+USE_PYTHON=	-2.7
+USE_LUA=	5.1
+LUA_COMPS=	lua
+USE_MYSQL=	client
+USE_SQLITE=	3
+USE_AUTOTOOLS=	libtoolize aclocal automake autoheader autoconf
+LIBTOOLIZE_ARGS=--copy --force
+ACLOCAL_ARGS=	# none
+AUTOMAKE_ARGS=	--copy --force-missing --foreign
+CONFIGURE_ENV=	LUA_CFLAGS="$$(pkg-config --cflags lua-${LUA_VER})" \
+		LUA_LIBS="$$(pkg-config --libs lua-${LUA_VER})" \
+		TINYXML_CFLAGS="-I${LOCALBASE}/include" \
+		TINYXML_LIBS="-L${LOCALBASE}/lib -ltinyxml" \
+		ac_cv_header_netinet_tcp_h=yes
+CONFIGURE_ARGS=	--docdir=${WRKDIR}/fakeroot
+USE_LDCONFIG=	${PREFIX}/lib/mysql-workbench
+INSTALLS_ICONS=	yes
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+PLIST_SUB=	VERSION="${PORTVERSION}" PYTHON_VER="${PYTHON_VER}"
+
+CONFLICTS=	mysql-workbench-oss*
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPYTHON_UTILS}
+CONFIGURE_ARGS+=--enable-mysql-utilities
+PLIST_SUB+=	PYTHON_UTILS=""
+.else
+PLIST_SUB+=	PYTHON_UTILS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MUNIXODBC}
+LIB_DEPENDS+=	odbccr:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=--with-unixodbc
+.else
+LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/spawn/s|/bin/bash|/bin/sh|' \
+		${WRKSRC}/ext/python/pexpect/pexpect.py
+	@${REINPLACE_CMD} -e \
+		's|-O0 -g3||' \
+		${WRKSRC}/ext/scintilla/gtk/Makefile.am
+	@${REINPLACE_CMD} -e \
+		'/f.write/s|bash -i|sh -i| ; \
+		 /call/s|/bin/bash|/bin/sh| ; \
+		 /paths/s|/usr/local|${LOCALBASE}|' \
+		${WRKSRC}/modules/wb.utils/wb_utils_grt.py
+	@${REINPLACE_CMD} -e \
+		'/spawn/s|/bin/bash|/bin/sh|' \
+		${WRKSRC}/plugins/wb.admin/backend/wb_server_management.py
+	@${REINPLACE_CMD} -e \
+		's|/usr/bin/sudo|${LOCALBASE}/bin/sudo| ; \
+		 s|/bin/bash|/bin/sh|' \
+		${WRKSRC}/plugins/wb.admin/frontend/wb_admin_grt.py
+	@${FIND} ${WRKSRC} -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \
+		'/^#!/s|/usr/bin/python.*|${SETENV} python|'
+
+post-install:
+.for i in lib/mysql-workbench/modules share/mysql-workbench/libraries
+	@${PYTHON_CMD} -m compileall ${PREFIX}/${i}
+.endfor
+.if ${PORT_OPTIONS:MPYTHON_UTILS}
+	(cd ${WRKSRC}/ext && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} DESTDIR="${DESTDIR}/"  \
+		install-utils install-connector)
+.endif
+
+.include <bsd.port.mk>
diff --git a/databases/mysql-workbench52/distinfo b/databases/mysql-workbench52/distinfo
index 4c12a3bab8bd..15403177fc08 100644
--- a/databases/mysql-workbench52/distinfo
+++ b/databases/mysql-workbench52/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-workbench-oss-5.2.1.tar.gz) = fe0d48980c9798308b97030fc9cc2d002b1910523f60ebec10179ab87a198ee2
-SIZE (mysql-workbench-oss-5.2.1.tar.gz) = 12648817
+SHA256 (mysql-workbench-gpl-5.2.47-src.tar.gz) = e6928beb157f1e0abbb8885d16544eefe4d25b05f54dc0fb75b8375d8775838c
+SIZE (mysql-workbench-gpl-5.2.47-src.tar.gz) = 21924533
diff --git a/databases/mysql-workbench52/files/52-patch-configure.in b/databases/mysql-workbench52/files/52-patch-configure.in
deleted file mode 100644
index 2d1d81854735..000000000000
--- a/databases/mysql-workbench52/files/52-patch-configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.in.orig	2009-06-19 02:45:09.000000000 +0300
-+++ configure.in	2009-06-23 13:23:55.000000000 +0300
-@@ -35,9 +35,9 @@
-   std_edition=$enableval, std_edition=no)
- 
- if test x$std_edition = xyes; then
--     echo -en "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#define EDITION_SE\n#define COMMERCIAL_CODE\n#endif\n" > wb_config.h
-+     echo -e "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#define EDITION_SE\n#define COMMERCIAL_CODE\n#endif" > wb_config.h
- else
--     echo -en "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#undef COMMERCIAL_CODE\n#define EDITION_OSS\n#endif\n" > wb_config.h
-+     echo -e "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#undef COMMERCIAL_CODE\n#define EDITION_OSS\n#endif" > wb_config.h
- fi
- 
- AC_CHECK_HEADERS([sys/select.h])
diff --git a/databases/mysql-workbench52/files/52-patch-ext__ctemplate__ctemplate-src__configure.ac b/databases/mysql-workbench52/files/52-patch-ext__ctemplate__ctemplate-src__configure.ac
deleted file mode 100644
index f0a1a8708a3e..000000000000
--- a/databases/mysql-workbench52/files/52-patch-ext__ctemplate__ctemplate-src__configure.ac
+++ /dev/null
@@ -1,23 +0,0 @@
---- ext/ctemplate/ctemplate-src/configure.ac.orig	2009-06-21 22:09:28.000000000 +0300
-+++ ext/ctemplate/ctemplate-src/configure.ac	2009-06-21 22:11:16.000000000 +0300
-@@ -78,16 +78,16 @@
- AC_SUBST(ac_cv_cxx_hash_namespace)
- AC_SUBST(ac_cv_cxx_hash_map)
- AC_SUBST(ac_cv_cxx_hash_set)
--if test "$ac_cv___attribute__" == "yes"; then
-+if test "$ac_cv___attribute__" = "yes"; then
-    AC_SUBST(ac_google_attribute, 1)
- else
-    AC_SUBST(ac_google_attribute, 0)
- fi
--if test "$ac_cv_type_u_int64_t" == "yes"; then
-+if test "$ac_cv_type_u_int64_t" = "yes"; then
-    AC_SUBST(ac_cv_uint64, u_int64_t)
--elif test "$ac_cv_type_uint64_t" == "yes"; then
-+elif test "$ac_cv_type_uint64_t" = "yes"; then
-    AC_SUBST(ac_cv_uint64, uint64_t)
--elif test "$ac_cv_type___int64" == "yes"; then
-+elif test "$ac_cv_type___int64" = "yes"; then
-    AC_SUBST(ac_cv_uint64, unsigned __int64)
- else
-    AC_SUBST(ac_cv_uint64, unsigned long long)   # best we can do
diff --git a/databases/mysql-workbench52/files/52-patch-frontend__linux__workbench__Makefile.am b/databases/mysql-workbench52/files/52-patch-frontend__linux__workbench__Makefile.am
deleted file mode 100644
index 268865028a41..000000000000
--- a/databases/mysql-workbench52/files/52-patch-frontend__linux__workbench__Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- frontend/linux/workbench/Makefile.am.orig	2009-05-22 03:24:59.000000000 +0300
-+++ frontend/linux/workbench/Makefile.am	2009-06-26 23:10:26.000000000 +0300
-@@ -52,7 +52,7 @@
- 
- 
- mysql-workbench: mysql-workbench.in
--	sed -e "s@#libdir#@$(libdir)@" $< > $@
-+	sed -e "s@#libdir#@$(libdir)@" -e "s|^#!/bin/bash|#!/bin/sh|" mysql-workbench.in > $@
- 
- 
- mysql_workbench_bin_SOURCES=\
diff --git a/databases/mysql-workbench52/files/52-patch-modules__db__Makefile.am b/databases/mysql-workbench52/files/52-patch-modules__db__Makefile.am
deleted file mode 100644
index e2bc5012f89b..000000000000
--- a/databases/mysql-workbench52/files/52-patch-modules__db__Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
---- modules/db/Makefile.am.orig	2009-06-21 23:37:59.000000000 +0300
-+++ modules/db/Makefile.am	2009-06-21 23:38:09.000000000 +0300
-@@ -10,4 +10,3 @@
- 
- dbutils_grt_la_SOURCES=src/dbutils.cpp
- dbutils_grt_la_LDFLAGS=-module
--dnl dbutils_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la $(top_srcdir)/backend/grt/libgrtbe.la
diff --git a/databases/mysql-workbench52/files/patch-backend__wbprivate__Makefile.am b/databases/mysql-workbench52/files/patch-backend__wbprivate__Makefile.am
new file mode 100644
index 000000000000..e5cf8d8b61e5
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-backend__wbprivate__Makefile.am
@@ -0,0 +1,24 @@
+--- backend/wbprivate/Makefile.am.orig
++++ backend/wbprivate/Makefile.am
+@@ -14,7 +14,7 @@
+   -I$(top_srcdir)/ext/scintilla/include\
+   -I$(top_srcdir)/ext/vsqlite++/include\
+   -I$(top_srcdir)/ext/vsqlite\
+-  -I$(top_srcdir)/ext/tinyxml
++  @TINYXML_CFLAGS@
+ 
+ libwbprivate_a_SOURCES=\
+ 	model/canvas_floater.cpp\
+@@ -78,11 +78,7 @@
+   $(top_srcdir)/frontend/common/grt_python_debugger.cpp\
+   $(top_srcdir)/frontend/common/plugin_manager_window.cpp\
+   $(top_srcdir)/frontend/common/plugin_install_window.cpp\
+-  $(top_srcdir)/frontend/common/select_option_dialog.cpp\
+-  $(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\
+-  $(top_srcdir)/ext/tinyxml/tinyxml.cpp\
+-  $(top_srcdir)/ext/tinyxml/tinystr.cpp\
+-  $(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp
++  $(top_srcdir)/frontend/common/select_option_dialog.cpp
+ 
+ #BUILT_SOURCES=stdafx.h.gch
+ #stdafx.h.gch: workbench/stdafx.h
diff --git a/databases/mysql-workbench52/files/patch-configure.in b/databases/mysql-workbench52/files/patch-configure.in
new file mode 100644
index 000000000000..c67ebaa0a1e3
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-configure.in
@@ -0,0 +1,52 @@
+--- configure.in.orig
++++ configure.in
+@@ -66,9 +66,9 @@
+   std_edition=$enableval, std_edition=no)
+ 
+ if test x$std_edition = xyes; then
+-     echo -en "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#define EDITION_SE\n#define COMMERCIAL_CODE\n#endif\n" > wb_config.h
++     echo -e "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#define EDITION_SE\n#define COMMERCIAL_CODE\n#endif\n" > wb_config.h
+ else
+-     echo -en "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#undef COMMERCIAL_CODE\n#define EDITION_OSS\n#endif\n" > wb_config.h
++     echo -e "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#undef COMMERCIAL_CODE\n#define EDITION_OSS\n#endif\n" > wb_config.h
+ fi
+ 
+ AC_CHECK_HEADERS([sys/select.h])
+@@ -99,6 +99,10 @@
+     AM_GLIB_GNU_GETTEXT
+ fi
+ 
++PKG_CHECK_MODULES(TINYXML, [tinyxml])
++AC_SUBST(TINYXML_CFLAGS)
++AC_SUBST(TINYXML_LIBS)
++
+ have_zip="no"
+ if test x"$ac_libzip_libs" = x"no"; then
+     PKG_CHECK_MODULES(ZIP, [libzip])
+@@ -205,7 +209,7 @@
+ 		ac_mysql_config_path="$withval", ac_mysql_config_path="mysql_config")
+ 
+ AC_MSG_CHECKING([for mysql headers and libraries])
+-MYSQL_INCLUDE=`$ac_mysql_config_path --cflags`
++MYSQL_INCLUDE=`$ac_mysql_config_path --include`
+ MYSQL_LIBS=`$ac_mysql_config_path --libs_r`
+ 
+ if test -z "$MYSQL_INCLUDE"; then
+@@ -248,7 +252,7 @@
+ cfg=sysconfig.get_config_vars()
+ lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY'])
+ if os.path.exists(lib):
+-    print \"-L\" + cfg['LIBDIR'] + \" -l\" + cfg['LDLIBRARY'].lstrip(\"lib\").rstrip(\".so\")")]
++    print \"-L\" + cfg['LIBDIR'] + \" -l\" + cfg['LDLIBRARY'].lstrip(\"lib\").rstrip(\".so\").rstrip(\".a\")")]
+ PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig
+ print sysconfig.get_python_inc()")]
+ PYTHON_CFLAGS="-I$PYTHON_CFLAGS"
+@@ -461,7 +465,7 @@
+ elif test "$(uname -s)" = "SunOS"; then
+ 	DLMAKE="gcc -shared -mimpure-text"
+ else
+-	DLMAKE="gcc -shared"
++	DLMAKE="\$(CC) -shared"
+ fi
+ AC_SUBST(DLEXT)
+ AC_SUBST(DLMAKE)
diff --git a/databases/mysql-workbench52/files/patch-frontend__linux__workbench__Makefile.am b/databases/mysql-workbench52/files/patch-frontend__linux__workbench__Makefile.am
new file mode 100644
index 000000000000..a52ba75a5a39
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-frontend__linux__workbench__Makefile.am
@@ -0,0 +1,10 @@
+--- frontend/linux/workbench/Makefile.am.orig
++++ frontend/linux/workbench/Makefile.am
+@@ -60,6 +60,7 @@
+ 	$(top_srcdir)/library/canvas/src/libmdcanvas.la\
+ 	$(top_srcdir)/library/mysql-parser/libmysqlparser.la\
+ 	@CTEMPLATE_LIBS@\
++	@TINYXML_LIBS@\
+ 	@GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ @SQLITE3_LIBS@\
+ 	-lX11
+ 
diff --git a/databases/mysql-workbench52/files/patch-frontend__linux__workbench__mysql-workbench.in b/databases/mysql-workbench52/files/patch-frontend__linux__workbench__mysql-workbench.in
new file mode 100644
index 000000000000..3c8b1dc878cf
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-frontend__linux__workbench__mysql-workbench.in
@@ -0,0 +1,17 @@
+--- frontend/linux/workbench/mysql-workbench.in.orig
++++ frontend/linux/workbench/mysql-workbench.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # Uncomment the following line if you're having trouble with gnome-keyring lockups.
+ # This will cause passwords to be stored only temporarily for the session.
+@@ -58,8 +58,4 @@
+ 
+ export MWB_BASE_DIR="$basedirname"
+ 
+-if type -p catchsegv > /dev/null; then
+-catchsegv $basedirname/$libexecdir/mysql-workbench-bin "$@"
+-else
+ $basedirname/$libexecdir/mysql-workbench-bin "$@"
+-fi
diff --git a/databases/mysql-workbench52/files/patch-library__forms__Makefile.am b/databases/mysql-workbench52/files/patch-library__forms__Makefile.am
new file mode 100644
index 000000000000..ce4d2c2d7b4d
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-library__forms__Makefile.am
@@ -0,0 +1,11 @@
+--- library/forms/Makefile.am.orig
++++ library/forms/Makefile.am
+@@ -91,7 +91,7 @@
+ -I$(top_srcdir)/ext/vsqlite\
+ -I$(top_srcdir)/library/\
+ -I$(top_srcdir)/ext\
+--I$(top_srcdir)/ext/tinyxml\
++@TINYXML_CFLAGS@\
+ -I$(top_srcdir)/ext/scintilla/include
+ 
+ 
diff --git a/databases/mysql-workbench52/files/patch-modules__wb.mysql.import__Makefile.am b/databases/mysql-workbench52/files/patch-modules__wb.mysql.import__Makefile.am
new file mode 100644
index 000000000000..5e80ba4c9ada
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-modules__wb.mysql.import__Makefile.am
@@ -0,0 +1,20 @@
+--- modules/wb.mysql.import/Makefile.am.orig
++++ modules/wb.mysql.import/Makefile.am
+@@ -17,7 +17,7 @@
+ 	-I$(top_srcdir)/library/sql-parser/source/linux\
+ 	-I$(top_srcdir)/ext/vsqlite\
+ 	-I$(top_srcdir)/ext/vsqlite++/include\
+-	-I$(top_srcdir)/ext/tinyxml\
++	@TINYXML_CFLAGS@\
+ 	@MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
+ 
+ 
+@@ -27,7 +27,4 @@
+ wb_mysql_import_grt_la_SOURCES=\
+ 	src/wb_mysql_import.cpp\
+ 	src/wb_mysql_import_dbd4.cpp\
+-	$(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\
+-	$(top_srcdir)/ext/tinyxml/tinyxml.cpp\
+-	$(top_srcdir)/ext/tinyxml/tinystr.cpp\
+-	$(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp
++	$(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp
diff --git a/databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp b/databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp
new file mode 100644
index 000000000000..f8e0d2fa40c0
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp
@@ -0,0 +1,20 @@
+--- plugins/migration/copytable/copytable.cpp.orig
++++ plugins/migration/copytable/copytable.cpp
+@@ -555,7 +555,7 @@
+   //log_debug3("Convert string with %i chars to buffer size %i\n", inbuf_len, outbuf_len);
+   
+   // convert data from UCS-2 to utf-8
+-#ifdef _WIN32
++#if defined(_WIN32) || defined(__FreeBSD__)
+   converted = iconv(_iconv, 
+                     (const char**)&inbuf, &inbuf_len,
+                     (char**)&outbuf, &outbuf_len);
+@@ -617,7 +617,7 @@
+       //log_debug3("Convert string with %i chars to buffer size %i\n", inbuf_len, outbuf_len);
+ 
+       // convert data from UCS-2 to utf-8
+-#ifdef _WIN32
++#if defined(_WIN32) || defined(__FreeBSD__)
+       converted = iconv(_iconv, 
+                         (const char**)&inbuf, &inbuf_len,
+                         (char**)&outbuf, &outbuf_len);      
diff --git a/databases/mysql-workbench52/pkg-descr b/databases/mysql-workbench52/pkg-descr
index 9dbe1d763242..e295b4a61abb 100644
--- a/databases/mysql-workbench52/pkg-descr
+++ b/databases/mysql-workbench52/pkg-descr
@@ -4,4 +4,4 @@ DBDesigner4 project.
 
 5.2 branch still in Alpha stage
 
-WWW: http://dev.mysql.com/workbench/
+WWW: http://www.mysql.com/products/workbench/
diff --git a/databases/mysql-workbench52/pkg-plist b/databases/mysql-workbench52/pkg-plist
index ca689f9ac9aa..a2f32b2bcfbc 100644
--- a/databases/mysql-workbench52/pkg-plist
+++ b/databases/mysql-workbench52/pkg-plist
@@ -1,128 +1,296 @@
-bin/grtshell
 bin/mysql-workbench
-bin/mysql-workbench-bin
-lib/mysql-workbench/libcdbc.a
+bin/wbcopytables
+lib/mysql-workbench/libantlr3c_wb.a
+lib/mysql-workbench/libantlr3c_wb.la
+lib/mysql-workbench/libantlr3c_wb.so
 lib/mysql-workbench/libcdbc.la
 lib/mysql-workbench/libcdbc.so
 lib/mysql-workbench/libcdbc.so.0
-lib/mysql-workbench/libctemplate_wb.a
-lib/mysql-workbench/libctemplate_wb.la
-lib/mysql-workbench/libctemplate_wb.so
-lib/mysql-workbench/libctemplate_wb.so.0
-lib/mysql-workbench/libgrt.a
 lib/mysql-workbench/libgrt.la
 lib/mysql-workbench/libgrt.so
 lib/mysql-workbench/libgrt.so.0
-lib/mysql-workbench/libguiutil.a
-lib/mysql-workbench/libguiutil.la
-lib/mysql-workbench/libguiutil.so
-lib/mysql-workbench/libguiutil.so.0
-lib/mysql-workbench/liblinux_utilities.a
 lib/mysql-workbench/liblinux_utilities.la
 lib/mysql-workbench/liblinux_utilities.so
 lib/mysql-workbench/liblinux_utilities.so.0
-lib/mysql-workbench/libmdcanvas.a
 lib/mysql-workbench/libmdcanvas.la
 lib/mysql-workbench/libmdcanvas.so
 lib/mysql-workbench/libmdcanvas.so.0
-lib/mysql-workbench/libmdcanvasgtk.a
 lib/mysql-workbench/libmdcanvasgtk.la
 lib/mysql-workbench/libmdcanvasgtk.so
 lib/mysql-workbench/libmdcanvasgtk.so.0
-lib/mysql-workbench/libmforms.a
 lib/mysql-workbench/libmforms.la
 lib/mysql-workbench/libmforms.so
 lib/mysql-workbench/libmforms.so.0
-lib/mysql-workbench/libsqlide.a
+lib/mysql-workbench/libmysqlparser.la
+lib/mysql-workbench/libmysqlparser.so
+lib/mysql-workbench/libmysqlparser.so.0
 lib/mysql-workbench/libsqlide.la
 lib/mysql-workbench/libsqlide.so
 lib/mysql-workbench/libsqlide.so.0
-lib/mysql-workbench/libsqlparser.a
 lib/mysql-workbench/libsqlparser.la
 lib/mysql-workbench/libsqlparser.so
 lib/mysql-workbench/libsqlparser.so.0
-lib/mysql-workbench/libvsqlitepp.a
 lib/mysql-workbench/libvsqlitepp.la
 lib/mysql-workbench/libvsqlitepp.so
 lib/mysql-workbench/libvsqlitepp.so.0
-lib/mysql-workbench/libwbpublic.a
+lib/mysql-workbench/libwbbase.la
+lib/mysql-workbench/libwbbase.so
+lib/mysql-workbench/libwbbase.so.0
 lib/mysql-workbench/libwbpublic.la
 lib/mysql-workbench/libwbpublic.so
 lib/mysql-workbench/libwbpublic.so.0
-lib/mysql-workbench/libwbscintilla.a
 lib/mysql-workbench/libwbscintilla.la
 lib/mysql-workbench/libwbscintilla.so
 lib/mysql-workbench/libwbscintilla.so.0
-lib/mysql-workbench/modules/db.mysql.grt.a
+lib/mysql-workbench/modules/DataMigrator.py
+lib/mysql-workbench/modules/DataMigrator.pyc
+lib/mysql-workbench/modules/HTMLGetData.py
+lib/mysql-workbench/modules/HTMLGetData.pyc
+lib/mysql-workbench/modules/HTMLLookup.py
+lib/mysql-workbench/modules/HTMLLookup.pyc
+lib/mysql-workbench/modules/MySQLGetRequestResult.py
+lib/mysql-workbench/modules/MySQLGetRequestResult.pyc
+lib/mysql-workbench/modules/SQLEXT.py
+lib/mysql-workbench/modules/SQLEXT.pyc
+lib/mysql-workbench/modules/_cairo.la
+lib/mysql-workbench/modules/_cairo.so
+lib/mysql-workbench/modules/_cairo.so.0
+lib/mysql-workbench/modules/_mforms.la
+lib/mysql-workbench/modules/_mforms.so
+lib/mysql-workbench/modules/_mforms.so.0
+lib/mysql-workbench/modules/cairo.py
+lib/mysql-workbench/modules/cairo.pyc
+lib/mysql-workbench/modules/cairo_utils.py
+lib/mysql-workbench/modules/cairo_utils.pyc
+lib/mysql-workbench/modules/catalog_utils.grt.lua
+lib/mysql-workbench/modules/code_utils_grt.py
+lib/mysql-workbench/modules/code_utils_grt.pyc
+lib/mysql-workbench/modules/datatype_mapping_editor.py
+lib/mysql-workbench/modules/datatype_mapping_editor.pyc
 lib/mysql-workbench/modules/db.mysql.grt.la
 lib/mysql-workbench/modules/db.mysql.grt.so
 lib/mysql-workbench/modules/db.mysql.grt.so.0
-lib/mysql-workbench/modules/db.mysql.sqlide.grt.a
+lib/mysql-workbench/modules/db.mysql.query.grt.la
+lib/mysql-workbench/modules/db.mysql.query.grt.so
+lib/mysql-workbench/modules/db.mysql.query.grt.so.0
 lib/mysql-workbench/modules/db.mysql.sqlide.grt.la
 lib/mysql-workbench/modules/db.mysql.sqlide.grt.so
 lib/mysql-workbench/modules/db.mysql.sqlide.grt.so.0
-lib/mysql-workbench/modules/db.mysql.sqlparser.grt.a
 lib/mysql-workbench/modules/db.mysql.sqlparser.grt.la
 lib/mysql-workbench/modules/db.mysql.sqlparser.grt.so
 lib/mysql-workbench/modules/db.mysql.sqlparser.grt.so.0
-lib/mysql-workbench/modules/dbutils.grt.a
+lib/mysql-workbench/modules/db_copy_grt.py
+lib/mysql-workbench/modules/db_copy_grt.pyc
+lib/mysql-workbench/modules/db_copy_main.py
+lib/mysql-workbench/modules/db_copy_main.pyc
+lib/mysql-workbench/modules/db_copy_overview.py
+lib/mysql-workbench/modules/db_copy_overview.pyc
+lib/mysql-workbench/modules/db_copy_progress.py
+lib/mysql-workbench/modules/db_copy_progress.pyc
+lib/mysql-workbench/modules/db_copy_report.py
+lib/mysql-workbench/modules/db_copy_report.pyc
+lib/mysql-workbench/modules/db_copy_schema_selection.py
+lib/mysql-workbench/modules/db_copy_schema_selection.pyc
+lib/mysql-workbench/modules/db_copy_source_target.py
+lib/mysql-workbench/modules/db_copy_source_target.pyc
+lib/mysql-workbench/modules/db_generic_migration_grt.py
+lib/mysql-workbench/modules/db_generic_migration_grt.pyc
+lib/mysql-workbench/modules/db_generic_re_grt.py
+lib/mysql-workbench/modules/db_generic_re_grt.pyc
+lib/mysql-workbench/modules/db_mssql_grt.py
+lib/mysql-workbench/modules/db_mssql_grt.pyc
+lib/mysql-workbench/modules/db_mssql_migration_grt.py
+lib/mysql-workbench/modules/db_mssql_migration_grt.pyc
+lib/mysql-workbench/modules/db_mysql_fe_grt.py
+lib/mysql-workbench/modules/db_mysql_fe_grt.pyc
+lib/mysql-workbench/modules/db_mysql_migration_grt.py
+lib/mysql-workbench/modules/db_mysql_migration_grt.pyc
+lib/mysql-workbench/modules/db_mysql_re_grt.py
+lib/mysql-workbench/modules/db_mysql_re_grt.pyc
+lib/mysql-workbench/modules/db_postgresql_migration_grt.py
+lib/mysql-workbench/modules/db_postgresql_migration_grt.pyc
+lib/mysql-workbench/modules/db_postgresql_re_grt.py
+lib/mysql-workbench/modules/db_postgresql_re_grt.pyc
+lib/mysql-workbench/modules/db_sql92_migration_grt.py
+lib/mysql-workbench/modules/db_sql92_migration_grt.pyc
+lib/mysql-workbench/modules/db_sql92_re_grt.py
+lib/mysql-workbench/modules/db_sql92_re_grt.pyc
+lib/mysql-workbench/modules/db_sybase_migration_grt.py
+lib/mysql-workbench/modules/db_sybase_migration_grt.pyc
+lib/mysql-workbench/modules/db_sybase_re_grt.py
+lib/mysql-workbench/modules/db_sybase_re_grt.pyc
 lib/mysql-workbench/modules/dbutils.grt.la
 lib/mysql-workbench/modules/dbutils.grt.so
 lib/mysql-workbench/modules/dbutils.grt.so.0
-lib/mysql-workbench/modules/forms.grt.a
+lib/mysql-workbench/modules/explain_renderer.py
+lib/mysql-workbench/modules/explain_renderer.pyc
 lib/mysql-workbench/modules/forms.grt.la
 lib/mysql-workbench/modules/forms.grt.so
 lib/mysql-workbench/modules/forms.grt.so.0
-lib/mysql-workbench/modules/wb.model.grt.a
+lib/mysql-workbench/modules/mforms.py
+lib/mysql-workbench/modules/mforms.pyc
+lib/mysql-workbench/modules/migration.py
+lib/mysql-workbench/modules/migration.pyc
+lib/mysql-workbench/modules/migration_data_transfer.py
+lib/mysql-workbench/modules/migration_data_transfer.pyc
+lib/mysql-workbench/modules/migration_grt.py
+lib/mysql-workbench/modules/migration_grt.pyc
+lib/mysql-workbench/modules/migration_main.py
+lib/mysql-workbench/modules/migration_main.pyc
+lib/mysql-workbench/modules/migration_object_editing.py
+lib/mysql-workbench/modules/migration_object_editing.pyc
+lib/mysql-workbench/modules/migration_object_migration.py
+lib/mysql-workbench/modules/migration_object_migration.pyc
+lib/mysql-workbench/modules/migration_object_selection.py
+lib/mysql-workbench/modules/migration_object_selection.pyc
+lib/mysql-workbench/modules/migration_overview.py
+lib/mysql-workbench/modules/migration_overview.pyc
+lib/mysql-workbench/modules/migration_project_management.py
+lib/mysql-workbench/modules/migration_project_management.pyc
+lib/mysql-workbench/modules/migration_schema_creation.py
+lib/mysql-workbench/modules/migration_schema_creation.pyc
+lib/mysql-workbench/modules/migration_schema_selection.py
+lib/mysql-workbench/modules/migration_schema_selection.pyc
+lib/mysql-workbench/modules/migration_source_selection.py
+lib/mysql-workbench/modules/migration_source_selection.pyc
+lib/mysql-workbench/modules/migration_summary.py
+lib/mysql-workbench/modules/migration_summary.pyc
+lib/mysql-workbench/modules/migration_toolbars.py
+lib/mysql-workbench/modules/migration_toolbars.pyc
+lib/mysql-workbench/modules/migration_ui_style.py
+lib/mysql-workbench/modules/migration_ui_style.pyc
+lib/mysql-workbench/modules/mysqldoclib.py
+lib/mysql-workbench/modules/mysqldoclib.pyc
+lib/mysql-workbench/modules/optimizer_trace_renderer.py
+lib/mysql-workbench/modules/optimizer_trace_renderer.pyc
+lib/mysql-workbench/modules/opts.py
+lib/mysql-workbench/modules/opts.pyc
+lib/mysql-workbench/modules/performance_charting.py
+lib/mysql-workbench/modules/performance_charting.pyc
+lib/mysql-workbench/modules/sql_reformatter.py
+lib/mysql-workbench/modules/sql_reformatter.pyc
+lib/mysql-workbench/modules/sqlide_grt.py
+lib/mysql-workbench/modules/sqlide_grt.pyc
+lib/mysql-workbench/modules/table_utils_grt.py
+lib/mysql-workbench/modules/table_utils_grt.pyc
+lib/mysql-workbench/modules/text_grt.py
+lib/mysql-workbench/modules/text_grt.pyc
+lib/mysql-workbench/modules/text_output.py
+lib/mysql-workbench/modules/text_output.pyc
 lib/mysql-workbench/modules/wb.model.grt.la
 lib/mysql-workbench/modules/wb.model.grt.so
 lib/mysql-workbench/modules/wb.model.grt.so.0
-lib/mysql-workbench/modules/wb.mysql.import.grt.a
 lib/mysql-workbench/modules/wb.mysql.import.grt.la
 lib/mysql-workbench/modules/wb.mysql.import.grt.so
 lib/mysql-workbench/modules/wb.mysql.import.grt.so.0
-lib/mysql-workbench/modules/wb.mysql.validation.grt.a
-lib/mysql-workbench/modules/wb.mysql.validation.grt.la
-lib/mysql-workbench/modules/wb.mysql.validation.grt.so
-lib/mysql-workbench/modules/wb.mysql.validation.grt.so.0
-lib/mysql-workbench/modules/wb.validation.grt.a
-lib/mysql-workbench/modules/wb.validation.grt.la
-lib/mysql-workbench/modules/wb.validation.grt.so
-lib/mysql-workbench/modules/wb.validation.grt.so.0
-lib/mysql-workbench/mysqlcppconn.a
+lib/mysql-workbench/modules/wb_admin_config_file_be.py
+lib/mysql-workbench/modules/wb_admin_config_file_be.pyc
+lib/mysql-workbench/modules/wb_admin_config_file_ui.py
+lib/mysql-workbench/modules/wb_admin_config_file_ui.pyc
+lib/mysql-workbench/modules/wb_admin_configuration_startup.py
+lib/mysql-workbench/modules/wb_admin_configuration_startup.pyc
+lib/mysql-workbench/modules/wb_admin_connections.py
+lib/mysql-workbench/modules/wb_admin_connections.pyc
+lib/mysql-workbench/modules/wb_admin_control.py
+lib/mysql-workbench/modules/wb_admin_control.pyc
+lib/mysql-workbench/modules/wb_admin_export.py
+lib/mysql-workbench/modules/wb_admin_export.pyc
+lib/mysql-workbench/modules/wb_admin_export_options.py
+lib/mysql-workbench/modules/wb_admin_export_options.pyc
+lib/mysql-workbench/modules/wb_admin_grt.py
+lib/mysql-workbench/modules/wb_admin_grt.pyc
+lib/mysql-workbench/modules/wb_admin_logs.py
+lib/mysql-workbench/modules/wb_admin_logs.pyc
+lib/mysql-workbench/modules/wb_admin_main.py
+lib/mysql-workbench/modules/wb_admin_main.pyc
+lib/mysql-workbench/modules/wb_admin_monitor.py
+lib/mysql-workbench/modules/wb_admin_monitor.pyc
+lib/mysql-workbench/modules/wb_admin_sched.py
+lib/mysql-workbench/modules/wb_admin_sched.pyc
+lib/mysql-workbench/modules/wb_admin_security.py
+lib/mysql-workbench/modules/wb_admin_security.pyc
+lib/mysql-workbench/modules/wb_admin_security_be.py
+lib/mysql-workbench/modules/wb_admin_security_be.pyc
+lib/mysql-workbench/modules/wb_admin_ssh.py
+lib/mysql-workbench/modules/wb_admin_ssh.pyc
+lib/mysql-workbench/modules/wb_admin_ui_profile.py
+lib/mysql-workbench/modules/wb_admin_ui_profile.pyc
+lib/mysql-workbench/modules/wb_admin_utils.py
+lib/mysql-workbench/modules/wb_admin_utils.pyc
+lib/mysql-workbench/modules/wb_admin_variable_list.py
+lib/mysql-workbench/modules/wb_admin_variable_list.pyc
+lib/mysql-workbench/modules/wb_admin_variables.py
+lib/mysql-workbench/modules/wb_admin_variables.pyc
+lib/mysql-workbench/modules/wb_bug_report_grt.py
+lib/mysql-workbench/modules/wb_bug_report_grt.pyc
+lib/mysql-workbench/modules/wb_common.py
+lib/mysql-workbench/modules/wb_common.pyc
+lib/mysql-workbench/modules/wb_dev_utils_grt.py
+lib/mysql-workbench/modules/wb_dev_utils_grt.pyc
+lib/mysql-workbench/modules/wb_doclib_grt.py
+lib/mysql-workbench/modules/wb_doclib_grt.pyc
+lib/mysql-workbench/modules/wb_execute_window.py
+lib/mysql-workbench/modules/wb_execute_window.pyc
+lib/mysql-workbench/modules/wb_log_reader.py
+lib/mysql-workbench/modules/wb_log_reader.pyc
+lib/mysql-workbench/modules/wb_query_analysis_grt.py
+lib/mysql-workbench/modules/wb_query_analysis_grt.pyc
+lib/mysql-workbench/modules/wb_server_control.py
+lib/mysql-workbench/modules/wb_server_control.pyc
+lib/mysql-workbench/modules/wb_server_management.py
+lib/mysql-workbench/modules/wb_server_management.pyc
+lib/mysql-workbench/modules/wb_utils_grt.py
+lib/mysql-workbench/modules/wb_utils_grt.pyc
+lib/mysql-workbench/modules/wb_variables.py
+lib/mysql-workbench/modules/wb_variables.pyc
+lib/mysql-workbench/modules/wba_monitor_be.py
+lib/mysql-workbench/modules/wba_monitor_be.pyc
+lib/mysql-workbench/modules/wba_ssh_ui.py
+lib/mysql-workbench/modules/wba_ssh_ui.pyc
 lib/mysql-workbench/mysqlcppconn.la
 lib/mysql-workbench/mysqlcppconn.so
 lib/mysql-workbench/mysqlcppconn.so.0
-lib/mysql-workbench/plugins/db.checks.wbp.a
 lib/mysql-workbench/plugins/db.checks.wbp.la
 lib/mysql-workbench/plugins/db.checks.wbp.so
 lib/mysql-workbench/plugins/db.checks.wbp.so.0
-lib/mysql-workbench/plugins/db.mysql.diff.reporting.wbp.a
 lib/mysql-workbench/plugins/db.mysql.diff.reporting.wbp.la
 lib/mysql-workbench/plugins/db.mysql.diff.reporting.wbp.so
 lib/mysql-workbench/plugins/db.mysql.diff.reporting.wbp.so.0
-lib/mysql-workbench/plugins/db.mysql.editors.wbp.a
 lib/mysql-workbench/plugins/db.mysql.editors.wbp.la
 lib/mysql-workbench/plugins/db.mysql.editors.wbp.so
 lib/mysql-workbench/plugins/db.mysql.editors.wbp.so.0
-lib/mysql-workbench/plugins/db.mysql.wbp.a
 lib/mysql-workbench/plugins/db.mysql.wbp.la
 lib/mysql-workbench/plugins/db.mysql.wbp.so
 lib/mysql-workbench/plugins/db.mysql.wbp.so.0
-lib/mysql-workbench/plugins/wb.model.editors.wbp.a
 lib/mysql-workbench/plugins/wb.model.editors.wbp.la
 lib/mysql-workbench/plugins/wb.model.editors.wbp.so
 lib/mysql-workbench/plugins/wb.model.editors.wbp.so.0
-lib/mysql-workbench/plugins/wb.printing.wbp.a
+lib/mysql-workbench/plugins/wb.model.snippets.wbp.la
+lib/mysql-workbench/plugins/wb.model.snippets.wbp.so
+lib/mysql-workbench/plugins/wb.model.snippets.wbp.so.0
 lib/mysql-workbench/plugins/wb.printing.wbp.la
 lib/mysql-workbench/plugins/wb.printing.wbp.so
 lib/mysql-workbench/plugins/wb.printing.wbp.so.0
+libexec/mysql-workbench-bin
 share/applications/MySQLWorkbench.desktop
+share/icons/hicolor/128x128/apps/mysql-workbench.png
+share/icons/hicolor/128x128/mimetypes/application-vnd.mysql-workbench-model.png
+share/icons/hicolor/128x128/mimetypes/application-vnd.mysql-workbench-plugin.png
+share/icons/hicolor/16x16/apps/mysql-workbench.png
+share/icons/hicolor/16x16/mimetypes/application-vnd.mysql-workbench-model.png
+share/icons/hicolor/16x16/mimetypes/application-vnd.mysql-workbench-plugin.png
+share/icons/hicolor/48x48/apps/mysql-workbench.png
+share/icons/hicolor/48x48/mimetypes/application-vnd.mysql-workbench-model.png
+share/icons/hicolor/48x48/mimetypes/application-vnd.mysql-workbench-plugin.png
+share/mime/packages/mysql-workbench.xml
+share/mime-info/mysql-workbench.mime
+share/mysql-workbench/data/code_editor.xml
 share/mysql-workbench/data/data.db
 share/mysql-workbench/data/db_datatype_groups.xml
 share/mysql-workbench/data/dbquery_toolbar.xml
 share/mysql-workbench/data/default_toolbar.xml
 share/mysql-workbench/data/main_menu.xml
+share/mysql-workbench/data/model_diagram_toolbar.xml
 share/mysql-workbench/data/model_option_toolbar_layer.xml
 share/mysql-workbench/data/model_option_toolbar_note.xml
 share/mysql-workbench/data/model_option_toolbar_physical_relationship.xml
@@ -132,17 +300,21 @@ share/mysql-workbench/data/model_option_toolbar_physical_view.xml
 share/mysql-workbench/data/model_option_toolbar_selection.xml
 share/mysql-workbench/data/model_toolbar.xml
 share/mysql-workbench/data/paper_types.xml
+share/mysql-workbench/data/predefined_starters.xml
 share/mysql-workbench/data/shortcuts.xml
 share/mysql-workbench/data/shortcuts_basic.xml
 share/mysql-workbench/data/shortcuts_physical.xml
 share/mysql-workbench/data/tools_toolbar.xml
 share/mysql-workbench/data/tools_toolbar_basic.xml
 share/mysql-workbench/data/tools_toolbar_physical.xml
-share/mysql-workbench/db_sql_editor_view.glade
+share/mysql-workbench/db_mysql_catalog_reporting/Basic_Text.tpl/basic_text_report.txt.tpl
 share/mysql-workbench/diagram_size_form.glade
+share/mysql-workbench/diagram_view.glade
+share/mysql-workbench/embedded_find.glade
+share/mysql-workbench/extras/build_freetds.sh
+share/mysql-workbench/extras/sakila_full.mwb
 share/mysql-workbench/find.glade
 share/mysql-workbench/grt/structs.app.xml
-share/mysql-workbench/grt/structs.db.maxdb.xml
 share/mysql-workbench/grt/structs.db.mgmt.xml
 share/mysql-workbench/grt/structs.db.migration.xml
 share/mysql-workbench/grt/structs.db.mssql.xml
@@ -154,15 +326,16 @@ share/mysql-workbench/grt/structs.db.xml
 share/mysql-workbench/grt/structs.eer.xml
 share/mysql-workbench/grt/structs.meta.xml
 share/mysql-workbench/grt/structs.model.xml
+share/mysql-workbench/grt/structs.ui.xml
 share/mysql-workbench/grt/structs.workbench.logical.xml
 share/mysql-workbench/grt/structs.workbench.model.reporting.xml
 share/mysql-workbench/grt/structs.workbench.model.xml
 share/mysql-workbench/grt/structs.workbench.physical.xml
 share/mysql-workbench/grt/structs.workbench.xml
 share/mysql-workbench/grt/structs.xml
-share/mysql-workbench/grt_sidebar.glade
 share/mysql-workbench/images/Apply.png
 share/mysql-workbench/images/Apply_16x16.png
+share/mysql-workbench/images/BackupBackground.png
 share/mysql-workbench/images/Close_18x18.png
 share/mysql-workbench/images/Discard.png
 share/mysql-workbench/images/Discard_16x16.png
@@ -170,6 +343,8 @@ share/mysql-workbench/images/DotBlue.png
 share/mysql-workbench/images/DotDisabled.png
 share/mysql-workbench/images/DotGrey.png
 share/mysql-workbench/images/DotRed.png
+share/mysql-workbench/images/EditorCollapsed.png
+share/mysql-workbench/images/EditorExpanded.png
 share/mysql-workbench/images/First_16x16.png
 share/mysql-workbench/images/GrtObject.16x16.png
 share/mysql-workbench/images/GrtObject.24x24.png
@@ -183,37 +358,104 @@ share/mysql-workbench/images/GrtObject.many_32x32.png
 share/mysql-workbench/images/GrtStoredNote.48x48.png
 share/mysql-workbench/images/GrtStoredNote.add.48x48.png
 share/mysql-workbench/images/Last_16x16.png
+share/mysql-workbench/images/MacWizardBackground.png
 share/mysql-workbench/images/MySQLWorkbench-128.png
 share/mysql-workbench/images/MySQLWorkbench-16.png
 share/mysql-workbench/images/MySQLWorkbench-24.png
 share/mysql-workbench/images/MySQLWorkbench-32.png
 share/mysql-workbench/images/MySQLWorkbench-48.png
 share/mysql-workbench/images/MySQLWorkbench-64.png
-share/mysql-workbench/images/MySQLWorkbenchDoc-128.png
-share/mysql-workbench/images/MySQLWorkbenchDoc-16.png
-share/mysql-workbench/images/MySQLWorkbenchDoc-24.png
-share/mysql-workbench/images/MySQLWorkbenchDoc-32.png
-share/mysql-workbench/images/MySQLWorkbenchDoc-48.png
-share/mysql-workbench/images/MySQLWorkbenchDoc-64.png
-share/mysql-workbench/images/PinDown_18x18.png
-share/mysql-workbench/images/Pin_18x18.png
 share/mysql-workbench/images/Refresh_16x16.png
-share/mysql-workbench/images/alert_thin.png
+share/mysql-workbench/images/Refresh_18x18.png
+share/mysql-workbench/images/Refresh_disabled_18x18.png
+share/mysql-workbench/images/WB_Home.png
+share/mysql-workbench/images/action_add_schema_objects.png
+share/mysql-workbench/images/action_admin.png
+share/mysql-workbench/images/action_button_left.png
+share/mysql-workbench/images/action_button_middle.png
+share/mysql-workbench/images/action_button_right.png
+share/mysql-workbench/images/action_edit_sql_script.png
+share/mysql-workbench/images/action_edit_table_data.png
+share/mysql-workbench/images/action_eer_open.png
+share/mysql-workbench/images/action_eer_rev_eng_db.png
+share/mysql-workbench/images/action_eer_rev_eng_file.png
+share/mysql-workbench/images/action_import_export.png
+share/mysql-workbench/images/action_manage_connection.png
+share/mysql-workbench/images/action_manage_servers.png
+share/mysql-workbench/images/action_new_connection.png
+share/mysql-workbench/images/action_new_eer.png
+share/mysql-workbench/images/action_new_server.png
+share/mysql-workbench/images/action_query.png
+share/mysql-workbench/images/action_security.png
+share/mysql-workbench/images/admin_add_user.png
+share/mysql-workbench/images/admin_add_user_win.png
+share/mysql-workbench/images/admin_config_wizard.png
+share/mysql-workbench/images/admin_config_wizard_win.png
+share/mysql-workbench/images/admin_export.png
+share/mysql-workbench/images/admin_export_win.png
+share/mysql-workbench/images/admin_info_running.png
+share/mysql-workbench/images/admin_info_stopped.png
+share/mysql-workbench/images/admin_info_unknown.png
+share/mysql-workbench/images/admin_manage_exported.png
+share/mysql-workbench/images/admin_manage_exported_win.png
+share/mysql-workbench/images/admin_manage_privs.png
+share/mysql-workbench/images/admin_manage_privs_win.png
+share/mysql-workbench/images/admin_manage_users.png
+share/mysql-workbench/images/admin_manage_users_win.png
+share/mysql-workbench/images/admin_meb_backup_win.png
+share/mysql-workbench/images/admin_meb_restore_win.png
+share/mysql-workbench/images/admin_option_file.png
+share/mysql-workbench/images/admin_option_file_win.png
+share/mysql-workbench/images/admin_restore_data.png
+share/mysql-workbench/images/admin_restore_data_win.png
+share/mysql-workbench/images/admin_schema_management.png
+share/mysql-workbench/images/admin_schema_management_win.png
+share/mysql-workbench/images/admin_scripts.png
+share/mysql-workbench/images/admin_scripts_win.png
+share/mysql-workbench/images/admin_server_logs.png
+share/mysql-workbench/images/admin_server_logs_win.png
+share/mysql-workbench/images/admin_server_status.png
+share/mysql-workbench/images/admin_server_status_win.png
+share/mysql-workbench/images/admin_start.png
+share/mysql-workbench/images/admin_start_disabled.png
+share/mysql-workbench/images/admin_start_stop.png
+share/mysql-workbench/images/admin_start_stop_win.png
+share/mysql-workbench/images/admin_status_vars.png
+share/mysql-workbench/images/admin_status_vars_win.png
+share/mysql-workbench/images/admin_system_startup.png
+share/mysql-workbench/images/admin_system_startup_win.png
+share/mysql-workbench/images/auto-completion-column.png
+share/mysql-workbench/images/auto-completion-function.png
+share/mysql-workbench/images/auto-completion-keyword.png
+share/mysql-workbench/images/auto-completion-operator.png
+share/mysql-workbench/images/auto-completion-routine.png
+share/mysql-workbench/images/auto-completion-schema.png
+share/mysql-workbench/images/auto-completion-table.png
+share/mysql-workbench/images/auto-completion-view.png
 share/mysql-workbench/images/background.png
 share/mysql-workbench/images/background_top_shadow.png
+share/mysql-workbench/images/busy_sidebar.png
+share/mysql-workbench/images/button_edit_icon.png
+share/mysql-workbench/images/change_alert_thin.png
 share/mysql-workbench/images/change_backward.png
 share/mysql-workbench/images/change_forward.png
 share/mysql-workbench/images/change_ignore.png
 share/mysql-workbench/images/change_nothing.png
+share/mysql-workbench/images/clear_output.png
 share/mysql-workbench/images/collapsing_panel_bg.png
 share/mysql-workbench/images/collapsing_panel_grid_bg.png
+share/mysql-workbench/images/collapsing_panel_grid_details.png
 share/mysql-workbench/images/collapsing_panel_grid_details2.png
+share/mysql-workbench/images/collapsing_panel_grid_large_icons.png
 share/mysql-workbench/images/collapsing_panel_grid_large_icons2.png
+share/mysql-workbench/images/collapsing_panel_grid_small_icons.png
 share/mysql-workbench/images/collapsing_panel_grid_small_icons2.png
 share/mysql-workbench/images/collapsing_panel_header_bg.png
 share/mysql-workbench/images/collapsing_panel_header_bg_flat.png
 share/mysql-workbench/images/collapsing_panel_header_shadow.png
+share/mysql-workbench/images/collapsing_panel_header_tab_add.png
 share/mysql-workbench/images/collapsing_panel_header_tab_add2.png
+share/mysql-workbench/images/collapsing_panel_header_tab_del.png
 share/mysql-workbench/images/collapsing_panel_header_tab_del2.png
 share/mysql-workbench/images/collapsing_panel_header_tab_left.png
 share/mysql-workbench/images/collapsing_panel_header_tab_left_flat.png
@@ -235,18 +477,30 @@ share/mysql-workbench/images/db.Column.11x11.png
 share/mysql-workbench/images/db.Column.16x16.png
 share/mysql-workbench/images/db.Column.fk.11x11.png
 share/mysql-workbench/images/db.Column.fk.16x16.png
+share/mysql-workbench/images/db.Column.fk.side.16x16.png
 share/mysql-workbench/images/db.Column.fknn.11x11.png
 share/mysql-workbench/images/db.Column.fknn.16x16.png
+share/mysql-workbench/images/db.Column.many.side.16x16.png
 share/mysql-workbench/images/db.Column.nn.11x11.png
 share/mysql-workbench/images/db.Column.nn.16x16.png
 share/mysql-workbench/images/db.Column.pk.11x11.png
 share/mysql-workbench/images/db.Column.pk.16x16.png
+share/mysql-workbench/images/db.Column.pk.side.16x16.png
+share/mysql-workbench/images/db.Column.pkai.11x11.png
+share/mysql-workbench/images/db.Column.pkai.16x16.png
+share/mysql-workbench/images/db.Column.side.16x16.png
 share/mysql-workbench/images/db.DatatypeGroup.blob.16x16.png
 share/mysql-workbench/images/db.DatatypeGroup.datetime.16x16.png
 share/mysql-workbench/images/db.DatatypeGroup.geo.16x16.png
 share/mysql-workbench/images/db.DatatypeGroup.numeric.16x16.png
 share/mysql-workbench/images/db.DatatypeGroup.text.16x16.png
 share/mysql-workbench/images/db.DatatypeGroup.userdefined.16x16.png
+share/mysql-workbench/images/db.ForeignKey.16x16.png
+share/mysql-workbench/images/db.ForeignKey.many.side.16x16.png
+share/mysql-workbench/images/db.ForeignKey.side.16x16.png
+share/mysql-workbench/images/db.Index.16x16.png
+share/mysql-workbench/images/db.Index.many.side.16x16.png
+share/mysql-workbench/images/db.Index.side.16x16.png
 share/mysql-workbench/images/db.Role.16x16.png
 share/mysql-workbench/images/db.Role.48x48.png
 share/mysql-workbench/images/db.Role.add.16x16.png
@@ -259,7 +513,10 @@ share/mysql-workbench/images/db.Routine.64x64.png
 share/mysql-workbench/images/db.Routine.add.16x16.png
 share/mysql-workbench/images/db.Routine.add.48x48.png
 share/mysql-workbench/images/db.Routine.editor.48x48.png
+share/mysql-workbench/images/db.Routine.many.16x16.png
 share/mysql-workbench/images/db.Routine.many.32x32.png
+share/mysql-workbench/images/db.Routine.many.side.16x16.png
+share/mysql-workbench/images/db.Routine.side.16x16.png
 share/mysql-workbench/images/db.RoutineGroup.16x16.png
 share/mysql-workbench/images/db.RoutineGroup.48x48.png
 share/mysql-workbench/images/db.RoutineGroup.add.16x16.png
@@ -269,8 +526,12 @@ share/mysql-workbench/images/db.Schema.24x24.png
 share/mysql-workbench/images/db.Schema.32x32.png
 share/mysql-workbench/images/db.Schema.add.32x32.png
 share/mysql-workbench/images/db.Schema.editor.48x48.png
+share/mysql-workbench/images/db.Schema.loading.side.16x16.png
 share/mysql-workbench/images/db.Schema.many.16x16.png
 share/mysql-workbench/images/db.Schema.many.32x32.png
+share/mysql-workbench/images/db.Schema.selected.32x32.png
+share/mysql-workbench/images/db.Schema.side.16x16.png
+share/mysql-workbench/images/db.Schema.unloaded.side.16x16.png
 share/mysql-workbench/images/db.Script.48x48.png
 share/mysql-workbench/images/db.Script.add.48x48.png
 share/mysql-workbench/images/db.Table.16x16.png
@@ -278,8 +539,15 @@ share/mysql-workbench/images/db.Table.24x24.png
 share/mysql-workbench/images/db.Table.48x48.png
 share/mysql-workbench/images/db.Table.add.16x16.png
 share/mysql-workbench/images/db.Table.add.48x48.png
+share/mysql-workbench/images/db.Table.editor.24x24.png
 share/mysql-workbench/images/db.Table.editor.48x48.png
+share/mysql-workbench/images/db.Table.many.16x16.png
 share/mysql-workbench/images/db.Table.many.32x32.png
+share/mysql-workbench/images/db.Table.many.side.16x16.png
+share/mysql-workbench/images/db.Table.side.16x16.png
+share/mysql-workbench/images/db.Trigger.16x16.png
+share/mysql-workbench/images/db.Trigger.many.side.16x16.png
+share/mysql-workbench/images/db.Trigger.side.16x16.png
 share/mysql-workbench/images/db.User.16x16.png
 share/mysql-workbench/images/db.User.48x48.png
 share/mysql-workbench/images/db.User.add.16x16.png
@@ -291,17 +559,37 @@ share/mysql-workbench/images/db.View.48x48.png
 share/mysql-workbench/images/db.View.64x64.png
 share/mysql-workbench/images/db.View.add.16x16.png
 share/mysql-workbench/images/db.View.add.48x48.png
+share/mysql-workbench/images/db.View.broken.side.16x16.png
 share/mysql-workbench/images/db.View.editor.48x48.png
+share/mysql-workbench/images/db.View.many.16x16.png
 share/mysql-workbench/images/db.View.many.32x32.png
+share/mysql-workbench/images/db.View.many.side.16x16.png
+share/mysql-workbench/images/db.View.side.16x16.png
 share/mysql-workbench/images/db.mgmt.Connection.16x16.png
 share/mysql-workbench/images/db.mgmt.Connection.32x32.png
 share/mysql-workbench/images/db.mgmt.Connection.48x48.png
 share/mysql-workbench/images/db.mgmt.Connection.add.16x16.png
 share/mysql-workbench/images/db.mgmt.Connection.add.48x48.png
 share/mysql-workbench/images/db.mgmt.Connection.manage.48x48.png
+share/mysql-workbench/images/db.mgmt.ServerInstance.48x48.png
+share/mysql-workbench/images/db.mgmt.ServerInstance.manage.48x48.png
+share/mysql-workbench/images/db_connection_34x34.png
+share/mysql-workbench/images/db_connection_warning.png
+share/mysql-workbench/images/db_model_34x34.png
+share/mysql-workbench/images/db_model_warning.png
+share/mysql-workbench/images/db_server_34x34.png
+share/mysql-workbench/images/debug_continue.png
+share/mysql-workbench/images/debug_pause.png
+share/mysql-workbench/images/debug_step.png
+share/mysql-workbench/images/debug_step_into.png
+share/mysql-workbench/images/debug_step_out.png
+share/mysql-workbench/images/debug_stop.png
 share/mysql-workbench/images/dialog_input.png
-share/mysql-workbench/images/execute_script.png
-share/mysql-workbench/images/execute_selection.png
+share/mysql-workbench/images/editor_breakpoint.xpm
+share/mysql-workbench/images/editor_breakpoint_hit.xpm
+share/mysql-workbench/images/editor_current_pos.xpm
+share/mysql-workbench/images/editor_error.xpm
+share/mysql-workbench/images/editor_statement.xpm
 share/mysql-workbench/images/field_overlay_blob.png
 share/mysql-workbench/images/field_overlay_null.png
 share/mysql-workbench/images/grt.png
@@ -317,27 +605,100 @@ share/mysql-workbench/images/header_bar_blue.png
 share/mysql-workbench/images/header_bar_gray.png
 share/mysql-workbench/images/header_bar_orange.png
 share/mysql-workbench/images/history.png
+share/mysql-workbench/images/home_header_admin.png
+share/mysql-workbench/images/home_header_eer.png
+share/mysql-workbench/images/home_header_sql.png
 share/mysql-workbench/images/image.cur
 share/mysql-workbench/images/layer.cur
-share/mysql-workbench/images/layer_mixed.png
-share/mysql-workbench/images/layer_selected.png
-share/mysql-workbench/images/layer_unselected.png
 share/mysql-workbench/images/layers.png
+share/mysql-workbench/images/list_group_closed.png
+share/mysql-workbench/images/list_group_open.png
 share/mysql-workbench/images/magnify_region.cur
 share/mysql-workbench/images/menu_se.png
 share/mysql-workbench/images/message_confirm.png
 share/mysql-workbench/images/message_edit.png
 share/mysql-workbench/images/message_error.png
 share/mysql-workbench/images/message_warning.png
+share/mysql-workbench/images/message_wb_bug.png
+share/mysql-workbench/images/message_wb_lock.png
+share/mysql-workbench/images/message_wb_wait.png
+share/mysql-workbench/images/migration.png
+share/mysql-workbench/images/migration_background.png
+share/mysql-workbench/images/migration_check_current_win.png
+share/mysql-workbench/images/migration_check_done_win.png
+share/mysql-workbench/images/migration_check_open_win.png
+share/mysql-workbench/images/migration_check_point_win.png
+share/mysql-workbench/images/migration_icon_32x32.png
+share/mysql-workbench/images/migration_logo.png
+share/mysql-workbench/images/migration_title.png
+share/mysql-workbench/images/migration_win.png
+share/mysql-workbench/images/mini_edit.png
 share/mysql-workbench/images/mini_error.png
 share/mysql-workbench/images/mini_notice.png
+share/mysql-workbench/images/mini_ok.png
 share/mysql-workbench/images/mini_warning.png
 share/mysql-workbench/images/navigator_zoom_in.png
 share/mysql-workbench/images/navigator_zoom_out.png
 share/mysql-workbench/images/news_arrow.png
 share/mysql-workbench/images/note.128x128.png
 share/mysql-workbench/images/note.cur
+share/mysql-workbench/images/options-horizontal-separator.png
 share/mysql-workbench/images/properties.png
+share/mysql-workbench/images/qe_main-tb-icon_add-routine.png
+share/mysql-workbench/images/qe_main-tb-icon_add-schema.png
+share/mysql-workbench/images/qe_main-tb-icon_add-sql-editor.png
+share/mysql-workbench/images/qe_main-tb-icon_add-table.png
+share/mysql-workbench/images/qe_main-tb-icon_add-view.png
+share/mysql-workbench/images/qe_main-tb-icon_execute-sql-file.png
+share/mysql-workbench/images/qe_main-tb-icon_open-sql-file.png
+share/mysql-workbench/images/qe_main-tb-icon_refresh-conn.png
+share/mysql-workbench/images/qe_main-tb-sep.png
+share/mysql-workbench/images/qe_resultset-tb-switcher_form_off.png
+share/mysql-workbench/images/qe_resultset-tb-switcher_form_on.png
+share/mysql-workbench/images/qe_resultset-tb-switcher_grid_off.png
+share/mysql-workbench/images/qe_resultset-tb-switcher_grid_on.png
+share/mysql-workbench/images/qe_resultset-tb-switcher_sql_off.png
+share/mysql-workbench/images/qe_resultset-tb-switcher_sql_on.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_autocommit-off.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_autocommit-on.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_beautifier.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_beautifier_current.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_commit.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_execute-current.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_execute.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_explain.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_find.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_open.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_rollback.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_save.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_special-chars-off.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_special-chars-on.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_stop-on-error-off.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_stop-on-error-on.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_stop.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_word-wrap-off.png
+share/mysql-workbench/images/qe_sql-editor-tb-icon_word-wrap-on.png
+share/mysql-workbench/images/query_continue_on_error.png
+share/mysql-workbench/images/query_stop_on_error.png
+share/mysql-workbench/images/record_add.png
+share/mysql-workbench/images/record_back.png
+share/mysql-workbench/images/record_del.png
+share/mysql-workbench/images/record_discard.png
+share/mysql-workbench/images/record_edit.png
+share/mysql-workbench/images/record_export.png
+share/mysql-workbench/images/record_fetch_all.png
+share/mysql-workbench/images/record_fetch_next.png
+share/mysql-workbench/images/record_fetch_prev.png
+share/mysql-workbench/images/record_first.png
+share/mysql-workbench/images/record_import.png
+share/mysql-workbench/images/record_last.png
+share/mysql-workbench/images/record_next.png
+share/mysql-workbench/images/record_save.png
+share/mysql-workbench/images/record_sort_asc.png
+share/mysql-workbench/images/record_sort_desc.png
+share/mysql-workbench/images/record_sort_reset.png
+share/mysql-workbench/images/record_wrap_vertical.png
+share/mysql-workbench/images/refresh_sidebar.png
 share/mysql-workbench/images/rel11.cur
 share/mysql-workbench/images/rel1n.cur
 share/mysql-workbench/images/relnm.cur
@@ -345,21 +706,46 @@ share/mysql-workbench/images/routine.cur
 share/mysql-workbench/images/rubber.cur
 share/mysql-workbench/images/sakila.png
 share/mysql-workbench/images/schemata.png
-share/mysql-workbench/images/script_load.png
-share/mysql-workbench/images/script_save.png
-share/mysql-workbench/images/script_save_as.png
 share/mysql-workbench/images/search_clear.png
 share/mysql-workbench/images/search_doc_action.png
 share/mysql-workbench/images/search_icon.png
+share/mysql-workbench/images/section_expanded.png
+share/mysql-workbench/images/section_unexpandable.png
+share/mysql-workbench/images/section_unexpanded.png
+share/mysql-workbench/images/separator-dots.png
 share/mysql-workbench/images/show_eof.png
 share/mysql-workbench/images/show_whitespace.png
+share/mysql-workbench/images/small_toolbar_bg.png
+share/mysql-workbench/images/snippet_add.png
+share/mysql-workbench/images/snippet_clipboard.png
+share/mysql-workbench/images/snippet_css.png
+share/mysql-workbench/images/snippet_del.png
+share/mysql-workbench/images/snippet_htm.png
+share/mysql-workbench/images/snippet_insert.png
+share/mysql-workbench/images/snippet_lua.png
+share/mysql-workbench/images/snippet_mwb.png
+share/mysql-workbench/images/snippet_php.png
+share/mysql-workbench/images/snippet_py.png
+share/mysql-workbench/images/snippet_sql.png
+share/mysql-workbench/images/snippet_use.png
 share/mysql-workbench/images/statusbar_output.png
 share/mysql-workbench/images/statusbar_separator.png
 share/mysql-workbench/images/statusbar_shell.png
+share/mysql-workbench/images/switcher_bottom_off.png
+share/mysql-workbench/images/switcher_bottom_on.png
+share/mysql-workbench/images/switcher_left_off.png
+share/mysql-workbench/images/switcher_left_on.png
+share/mysql-workbench/images/switcher_right_off.png
+share/mysql-workbench/images/switcher_right_on.png
+share/mysql-workbench/images/tab.diagram.16x16.png
+share/mysql-workbench/images/tab.overview.home.16x16.png
+share/mysql-workbench/images/tab.overview.physical.16x16.png
+share/mysql-workbench/images/tab.sqlquery.16x16.png
 share/mysql-workbench/images/table.cur
 share/mysql-workbench/images/task_checked.png
 share/mysql-workbench/images/task_disabled.png
 share/mysql-workbench/images/task_error.png
+share/mysql-workbench/images/task_executing.png
 share/mysql-workbench/images/task_unchecked.png
 share/mysql-workbench/images/task_warning.png
 share/mysql-workbench/images/tiny_align_h_left.png
@@ -374,36 +760,75 @@ share/mysql-workbench/images/tiny_align_v_middle.png
 share/mysql-workbench/images/tiny_align_v_middle2.png
 share/mysql-workbench/images/tiny_align_v_top.png
 share/mysql-workbench/images/tiny_align_v_top2.png
+share/mysql-workbench/images/tiny_autocommit_off.png
+share/mysql-workbench/images/tiny_autocommit_off_mac.png
+share/mysql-workbench/images/tiny_autocommit_on.png
+share/mysql-workbench/images/tiny_autocommit_on_mac.png
+share/mysql-workbench/images/tiny_bookmark.png
+share/mysql-workbench/images/tiny_bookmark_mac.png
 share/mysql-workbench/images/tiny_cancel.png
 share/mysql-workbench/images/tiny_cancel_disabled.png
+share/mysql-workbench/images/tiny_cancel_mac.png
 share/mysql-workbench/images/tiny_commit.png
 share/mysql-workbench/images/tiny_commit_disabled.png
+share/mysql-workbench/images/tiny_commit_mac.png
 share/mysql-workbench/images/tiny_execute.png
+share/mysql-workbench/images/tiny_execute_current.png
+share/mysql-workbench/images/tiny_execute_current_mac.png
 share/mysql-workbench/images/tiny_execute_disabled.png
+share/mysql-workbench/images/tiny_execute_mac.png
+share/mysql-workbench/images/tiny_explain.png
+share/mysql-workbench/images/tiny_explain_mac.png
 share/mysql-workbench/images/tiny_grid.png
 share/mysql-workbench/images/tiny_gridview.png
 share/mysql-workbench/images/tiny_grtshell.png
 share/mysql-workbench/images/tiny_hidesidebar.png
+share/mysql-workbench/images/tiny_less_space.png
+share/mysql-workbench/images/tiny_load.png
 share/mysql-workbench/images/tiny_loadsql.png
+share/mysql-workbench/images/tiny_loadsql_mac.png
 share/mysql-workbench/images/tiny_lock.png
+share/mysql-workbench/images/tiny_manage_connections.png
+share/mysql-workbench/images/tiny_manage_instances.png
+share/mysql-workbench/images/tiny_more_space.png
 share/mysql-workbench/images/tiny_new.png
+share/mysql-workbench/images/tiny_new_diagram.png
 share/mysql-workbench/images/tiny_new_doc.png
+share/mysql-workbench/images/tiny_new_routine.png
+share/mysql-workbench/images/tiny_new_schema.png
+share/mysql-workbench/images/tiny_new_script.png
+share/mysql-workbench/images/tiny_new_script_mac.png
+share/mysql-workbench/images/tiny_new_table.png
+share/mysql-workbench/images/tiny_new_view.png
 share/mysql-workbench/images/tiny_open.png
+share/mysql-workbench/images/tiny_open_mac.png
+share/mysql-workbench/images/tiny_print_mac.png
+share/mysql-workbench/images/tiny_reconnect.png
+share/mysql-workbench/images/tiny_reconnect_mac.png
 share/mysql-workbench/images/tiny_redo.png
+share/mysql-workbench/images/tiny_redo_mac.png
 share/mysql-workbench/images/tiny_refresh.png
 share/mysql-workbench/images/tiny_refresh_plugins.png
 share/mysql-workbench/images/tiny_rollback.png
 share/mysql-workbench/images/tiny_rollback_disabled.png
+share/mysql-workbench/images/tiny_rollback_mac.png
 share/mysql-workbench/images/tiny_ruler.png
 share/mysql-workbench/images/tiny_save.png
+share/mysql-workbench/images/tiny_save_mac.png
 share/mysql-workbench/images/tiny_saveas.png
+share/mysql-workbench/images/tiny_saveas_mac.png
 share/mysql-workbench/images/tiny_savesql.png
+share/mysql-workbench/images/tiny_savesql_mac.png
+share/mysql-workbench/images/tiny_search.png
 share/mysql-workbench/images/tiny_undo.png
+share/mysql-workbench/images/tiny_undo_mac.png
 share/mysql-workbench/images/user_datatypes.png
 share/mysql-workbench/images/view.cur
+share/mysql-workbench/images/warning_icon.png
+share/mysql-workbench/images/wb-wizard-vista-bg.png
 share/mysql-workbench/images/wb_arrow.png
-share/mysql-workbench/images/wb_central.png
-share/mysql-workbench/images/wb_central_bg.png
+share/mysql-workbench/images/wb_central_logo.png
+share/mysql-workbench/images/wb_central_title_en.png
 share/mysql-workbench/images/wb_db_routinegroup.png
 share/mysql-workbench/images/wb_db_table.png
 share/mysql-workbench/images/wb_db_view.png
@@ -424,10 +849,35 @@ share/mysql-workbench/images/wb_rel_1n_nonid.png
 share/mysql-workbench/images/wb_rel_1n_pick.png
 share/mysql-workbench/images/wb_rel_nm.png
 share/mysql-workbench/images/wb_rubber.png
-share/mysql-workbench/images/wb_splashscreen_ee.png
 share/mysql-workbench/images/wb_splashscreen_oss.png
-share/mysql-workbench/images/wb_splashscreen_pro.png
 share/mysql-workbench/images/wb_splashscreen_se.png
+share/mysql-workbench/images/wb_starter_button_left.png
+share/mysql-workbench/images/wb_starter_button_middle.png
+share/mysql-workbench/images/wb_starter_button_right.png
+share/mysql-workbench/images/wb_starter_grt_shell_52.png
+share/mysql-workbench/images/wb_starter_grt_shell_68.png
+share/mysql-workbench/images/wb_starter_legal.png
+share/mysql-workbench/images/wb_starter_more.png
+share/mysql-workbench/images/wb_starter_mysql_bug_reporter_52.png
+share/mysql-workbench/images/wb_starter_mysql_bug_reporter_68.png
+share/mysql-workbench/images/wb_starter_mysql_doc_lib_52.png
+share/mysql-workbench/images/wb_starter_mysql_doc_lib_68.png
+share/mysql-workbench/images/wb_starter_mysql_forums_52.png
+share/mysql-workbench/images/wb_starter_mysql_forums_68.png
+share/mysql-workbench/images/wb_starter_mysql_migration_52.png
+share/mysql-workbench/images/wb_starter_mysql_migration_68.png
+share/mysql-workbench/images/wb_starter_mysql_news_52.png
+share/mysql-workbench/images/wb_starter_mysql_news_68.png
+share/mysql-workbench/images/wb_starter_mysql_utilities_52.png
+share/mysql-workbench/images/wb_starter_mysql_utilities_68.png
+share/mysql-workbench/images/wb_starter_mysql_wb_blog_52.png
+share/mysql-workbench/images/wb_starter_mysql_wb_blog_68.png
+share/mysql-workbench/images/wb_starter_mysql_wb_twitters_52.png
+share/mysql-workbench/images/wb_starter_mysql_wb_twitters_68.png
+share/mysql-workbench/images/wb_starter_planet_mysql_52.png
+share/mysql-workbench/images/wb_starter_planet_mysql_68.png
+share/mysql-workbench/images/wb_starter_type_community.png
+share/mysql-workbench/images/wb_starter_type_mysql.png
 share/mysql-workbench/images/workbench.Document.16x16.png
 share/mysql-workbench/images/workbench.Document.32x32.png
 share/mysql-workbench/images/workbench.Document.48x48.png
@@ -462,14 +912,44 @@ share/mysql-workbench/images/zoom_in.png
 share/mysql-workbench/images/zoom_out.cur
 share/mysql-workbench/images/zoom_out.png
 share/mysql-workbench/images/zoom_reset.png
+share/mysql-workbench/input_dialog.glade
+share/mysql-workbench/libraries/db_utils.py
+share/mysql-workbench/libraries/db_utils.pyc
+share/mysql-workbench/libraries/grt_python_debugger.py
+share/mysql-workbench/libraries/grt_python_debugger.pyc
 share/mysql-workbench/libraries/wb.py
+share/mysql-workbench/libraries/wb.pyc
 share/mysql-workbench/libraries/wb_library.lua
-share/mysql-workbench/model_sidebar.glade
+share/mysql-workbench/libraries/workbench/__init__.py
+share/mysql-workbench/libraries/workbench/__init__.pyc
+share/mysql-workbench/libraries/workbench/database_object_selector_widget.py
+share/mysql-workbench/libraries/workbench/database_object_selector_widget.pyc
+share/mysql-workbench/libraries/workbench/database_schema_selector_widget.py
+share/mysql-workbench/libraries/workbench/database_schema_selector_widget.pyc
+share/mysql-workbench/libraries/workbench/db_driver.py
+share/mysql-workbench/libraries/workbench/db_driver.pyc
+share/mysql-workbench/libraries/workbench/db_utils.py
+share/mysql-workbench/libraries/workbench/db_utils.pyc
+share/mysql-workbench/libraries/workbench/exceptions.py
+share/mysql-workbench/libraries/workbench/exceptions.pyc
+share/mysql-workbench/libraries/workbench/template.py
+share/mysql-workbench/libraries/workbench/template.pyc
+share/mysql-workbench/libraries/workbench/ui.py
+share/mysql-workbench/libraries/workbench/ui.pyc
+share/mysql-workbench/libraries/workbench/utils.py
+share/mysql-workbench/libraries/workbench/utils.pyc
+share/mysql-workbench/libraries/workbench/wizard_page_widget.py
+share/mysql-workbench/libraries/workbench/wizard_page_widget.pyc
+share/mysql-workbench/libraries/workbench/wizard_progress_page_widget.py
+share/mysql-workbench/libraries/workbench/wizard_progress_page_widget.pyc
+share/mysql-workbench/model_view.glade
+share/mysql-workbench/modules/data/DocLibrary/mysqldoclib.sqlite
+share/mysql-workbench/modules/data/DocLibrary/mysqldoclib_webui.sqlite
 share/mysql-workbench/modules/data/com.mysql.rdbms.mysql.sql.editor.xml
-share/mysql-workbench/modules/data/db_mysql_catalog_reporting/Basic_Text.tpl/basic_text_report.txt.tpl
 share/mysql-workbench/modules/data/editor_image.glade
 share/mysql-workbench/modules/data/editor_layer.glade
 share/mysql-workbench/modules/data/editor_mysql_table.glade
+share/mysql-workbench/modules/data/editor_mysql_table_live.glade
 share/mysql-workbench/modules/data/editor_note.glade
 share/mysql-workbench/modules/data/editor_relationship.glade
 share/mysql-workbench/modules/data/editor_rg.glade
@@ -479,9 +959,48 @@ share/mysql-workbench/modules/data/editor_schema.glade
 share/mysql-workbench/modules/data/editor_storednote.glade
 share/mysql-workbench/modules/data/editor_user.glade
 share/mysql-workbench/modules/data/editor_view.glade
+share/mysql-workbench/modules/data/generic_rdbms_info.xml
+share/mysql-workbench/modules/data/live_editor_decoration.glade
+share/mysql-workbench/modules/data/migration_generic_typemap.xml
+share/mysql-workbench/modules/data/mssql_rdbms_info.xml
 share/mysql-workbench/modules/data/mysql_engines.xml
 share/mysql-workbench/modules/data/mysql_rdbms_info.xml
 share/mysql-workbench/modules/data/mysql_reserved.xml
+share/mysql-workbench/modules/data/postgresql_rdbms_info.xml
+share/mysql-workbench/modules/data/sql92_rdbms_info.xml
+share/mysql-workbench/modules/data/sqlide/CSV.pre.tpl
+share/mysql-workbench/modules/data/sqlide/CSV.tpl
+share/mysql-workbench/modules/data/sqlide/CSV.tpli
+share/mysql-workbench/modules/data/sqlide/CSV_semicolon.pre.tpl
+share/mysql-workbench/modules/data/sqlide/CSV_semicolon.tpl
+share/mysql-workbench/modules/data/sqlide/CSV_semicolon.tpli
+share/mysql-workbench/modules/data/sqlide/HTML.post.tpl
+share/mysql-workbench/modules/data/sqlide/HTML.pre.tpl
+share/mysql-workbench/modules/data/sqlide/HTML.tpl
+share/mysql-workbench/modules/data/sqlide/HTML.tpli
+share/mysql-workbench/modules/data/sqlide/JSON.post.tpl
+share/mysql-workbench/modules/data/sqlide/JSON.pre.tpl
+share/mysql-workbench/modules/data/sqlide/JSON.tpl
+share/mysql-workbench/modules/data/sqlide/JSON.tpli
+share/mysql-workbench/modules/data/sqlide/SQL_inserts.pre.tpl
+share/mysql-workbench/modules/data/sqlide/SQL_inserts.tpl
+share/mysql-workbench/modules/data/sqlide/SQL_inserts.tpli
+share/mysql-workbench/modules/data/sqlide/XLS.post.tpl
+share/mysql-workbench/modules/data/sqlide/XLS.pre.tpl
+share/mysql-workbench/modules/data/sqlide/XLS.tpl
+share/mysql-workbench/modules/data/sqlide/XLS.tpli
+share/mysql-workbench/modules/data/sqlide/XML.post.tpl
+share/mysql-workbench/modules/data/sqlide/XML.pre.tpl
+share/mysql-workbench/modules/data/sqlide/XML.tpl
+share/mysql-workbench/modules/data/sqlide/XML.tpli
+share/mysql-workbench/modules/data/sqlide/XML_mysql.post.tpl
+share/mysql-workbench/modules/data/sqlide/XML_mysql.pre.tpl
+share/mysql-workbench/modules/data/sqlide/XML_mysql.tpl
+share/mysql-workbench/modules/data/sqlide/XML_mysql.tpli
+share/mysql-workbench/modules/data/sqlide/tab.pre.tpl
+share/mysql-workbench/modules/data/sqlide/tab.tpl
+share/mysql-workbench/modules/data/sqlide/tab.tpli
+share/mysql-workbench/modules/data/sybase_rdbms_info.xml
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Basic_Frames.tpl/basic.css.tpl
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Basic_Frames.tpl/index.html.tpl
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Basic_Frames.tpl/info.xml
@@ -494,10 +1013,8 @@ share/mysql-workbench/modules/data/wb_model_reporting/HTML_Basic_Single_Page.tpl
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Basic_Single_Page.tpl/info.xml
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/basic.css.tpl
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/coated.css.tpl
-share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/details_list.html.tpl
-share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/full_list.html.tpl
-share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/images/Logo.gif
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/images/back.png
+share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/images/logo.png
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/images/next.png
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/images/preview_coated.png
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/images/preview_main.png
@@ -506,36 +1023,223 @@ share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/i
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/info.xml
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/overview.html.tpl
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/overview_list.html.tpl
+share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/routine_details.html.tpl
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/table_details.html.tpl
+share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/table_details_list.html.tpl
+share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/table_element_details.html.tpl
 share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/top.html.tpl
+share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/view_details.html.tpl
 share/mysql-workbench/modules/data/wb_model_reporting/Text_Basic.tpl/info.xml
 share/mysql-workbench/modules/data/wb_model_reporting/Text_Basic.tpl/preview_basic.png
 share/mysql-workbench/modules/data/wb_model_reporting/Text_Basic.tpl/report.txt.tpl
-share/mysql-workbench/query_sidebar.glade
+share/mysql-workbench/mysql.profiles/Fedora_Linux_(MySQL_Package).xml
+share/mysql-workbench/mysql.profiles/Fedora_Linux_(Vendor_Package).xml
+share/mysql-workbench/mysql.profiles/Fedora_Linux_15_(Vendor_Package).xml
+share/mysql-workbench/mysql.profiles/Fedora_Linux_16_(Vendor_Package).xml
+share/mysql-workbench/mysql.profiles/FreeBSD_(MySQL_Package).xml
+share/mysql-workbench/mysql.profiles/Generic_Linux_(MySQL_tar_package).xml
+share/mysql-workbench/mysql.profiles/Linux_(Custom).xml
+share/mysql-workbench/mysql.profiles/MacOS_X_(MySQL_Package).xml
+share/mysql-workbench/mysql.profiles/OpenSolaris_(MySQL_Package).xml
+share/mysql-workbench/mysql.profiles/RHEL_(MySQL_Package).xml
+share/mysql-workbench/mysql.profiles/SLES_(MySQL_Package).xml
+share/mysql-workbench/mysql.profiles/Ubuntu_Linux_(MySQL_Package).xml
+share/mysql-workbench/mysql.profiles/Ubuntu_Linux_(Vendor_Package).xml
+share/mysql-workbench/mysql.profiles/Ubuntu_Linux_Upstart_(MySQL_Package).xml
+share/mysql-workbench/mysql.profiles/Ubuntu_Linux_Upstart_(Vendor_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_(MySQL_5.0_x64_Installer_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_(MySQL_5.0_x86_Installer_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_(MySQL_5.1_x64_Installer_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_(MySQL_5.1_x86_Installer_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_(MySQL_5.5_x64_Installer_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_(MySQL_5.5_x86_Installer_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_(MySQL_5.6_x64_Installer_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_(MySQL_5.6_x86_Installer_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_(MySQL_x64_zip_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_(MySQL_x86_zip_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_x64_(MySQL_5.0_x86_Installer_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_x64_(MySQL_5.1_x86_Installer_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_x64_(MySQL_5.5_x86_Installer_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_x64_(MySQL_5.6_x86_Installer_Package).xml
+share/mysql-workbench/mysql.profiles/Windows_x64_(MySQL_x86_zip_Package).xml
+share/mysql-workbench/mysql_system_status.vbs
+share/mysql-workbench/mysql_system_status_rmt.vbs
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/__init__.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/__init__.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/__init__.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/__init__.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/_version.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/_version.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/connection.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/connection.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/constants.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/constants.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/conversion.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/conversion.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/cursor.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/cursor.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/dbapi.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/dbapi.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/errors.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/errors.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/protocol.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/protocol.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/utils.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/connector/utils.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/__init__.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/__init__.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/__init__.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/__init__.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/audit_log.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/audit_log.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/check_rpl.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/check_rpl.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/dbcompare.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/dbcompare.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/dbcopy.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/dbcopy.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/dbexport.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/dbexport.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/dbimport.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/dbimport.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/diff.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/diff.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/diskusage.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/diskusage.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/failover_console.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/failover_console.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/grep.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/grep.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/indexcheck.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/indexcheck.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/proc.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/proc.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/rpl_admin.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/rpl_admin.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/serverclone.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/serverclone.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/serverinfo.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/serverinfo.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/setup_rpl.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/setup_rpl.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/show_rpl.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/show_rpl.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/userclone.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/userclone.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/utilitiesconsole.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/command/utilitiesconsole.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/__init__.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/__init__.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/audit_log_parser.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/audit_log_parser.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/audit_log_reader.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/audit_log_reader.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/console.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/console.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/database.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/database.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/dbcompare.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/dbcompare.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/format.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/format.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/lock.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/lock.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/my_print_defaults.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/my_print_defaults.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/options.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/options.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/parser.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/parser.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/pattern_matching.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/pattern_matching.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/replication.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/replication.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/server.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/server.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/sql_transform.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/sql_transform.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/table.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/table.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/tools.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/tools.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/topology.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/topology.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/topology_map.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/topology_map.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/user.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/user.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/utilities.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/utilities.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/variables.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/common/variables.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/exception.py
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql/utilities/exception.pyc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql_connector_python-0.3.0_devel-py%%PYTHON_VER%%.egg-info
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysql_utilities-1.2.0._.MySQL.Workbench.Distribution.%%VERSION%%-py%%PYTHON_VER%%.egg-info
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqlauditadmin
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqlauditgrep
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqldbcompare
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqldbcopy
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqldbexport
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqldbimport
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqldiff
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqldiskusage
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqlfailover
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqlindexcheck
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqlmetagrep
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqlprocgrep
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqlreplicate
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqlrpladmin
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqlrplcheck
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqlrplshow
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqlserverclone
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqlserverinfo
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqluc
+%%PYTHON_UTILS%%share/mysql-workbench/python/mysqluserclone
 share/mysql-workbench/recordset_view.glade
-share/mysql-workbench/sqlide/CSV.tpl
-share/mysql-workbench/sqlide/HTML.tpl
-share/mysql-workbench/sqlide/XML.tpl
+share/mysql-workbench/script_templates/eer_model_object_grt.py.txt
+share/mysql-workbench/script_templates/eer_model_utility_grt.py.txt
+share/mysql-workbench/script_templates/generic_grt.py.txt
+share/mysql-workbench/script_templates/sql_editor_catalog_grt.py.txt
+share/mysql-workbench/script_templates/sql_editor_filter_grt.py.txt
+share/mysql-workbench/script_templates/sql_editor_resultset_grt.py.txt
+share/mysql-workbench/script_templates/sql_editor_utility_grt.py.txt
+share/mysql-workbench/shell_snippets.py.txt
+share/mysql-workbench/snippets/DB_Management.txt
+share/mysql-workbench/snippets/SQL_DDL_Statements.txt
+share/mysql-workbench/snippets/SQL_DML_Statements.txt
+share/mysql-workbench/sshtunnel.py
 share/mysql-workbench/wb.glade
-share/mysql-workbench/wb_central.glade
 share/mysql-workbench/workbench.rc
-@dirrm lib/mysql-workbench/modules
-@dirrm lib/mysql-workbench/plugins
-@dirrm lib/mysql-workbench
-@dirrm share/mysql-workbench/modules/data/db_mysql_catalog_reporting/Basic_Text.tpl
-@dirrm share/mysql-workbench/modules/data/db_mysql_catalog_reporting
-@dirrm share/mysql-workbench/modules/data/wb_model_reporting/HTML_Basic_Frames.tpl
-@dirrm share/mysql-workbench/modules/data/wb_model_reporting/HTML_Basic_Single_Page.tpl
+@dirrm share/mysql-workbench/snippets
+@dirrm share/mysql-workbench/script_templates
+%%PYTHON_UTILS%%@dirrm share/mysql-workbench/python/mysql/utilities/common
+%%PYTHON_UTILS%%@dirrm share/mysql-workbench/python/mysql/utilities/command
+%%PYTHON_UTILS%%@dirrm share/mysql-workbench/python/mysql/utilities
+%%PYTHON_UTILS%%@dirrm share/mysql-workbench/python/mysql/connector
+%%PYTHON_UTILS%%@dirrm share/mysql-workbench/python/mysql
+%%PYTHON_UTILS%%@dirrm share/mysql-workbench/python
+@dirrm share/mysql-workbench/mysql.profiles
+@dirrm share/mysql-workbench/modules/data/wb_model_reporting/Text_Basic.tpl
 @dirrm share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl/images
 @dirrm share/mysql-workbench/modules/data/wb_model_reporting/HTML_Detailed_Frames.tpl
-@dirrm share/mysql-workbench/modules/data/wb_model_reporting/Text_Basic.tpl
+@dirrm share/mysql-workbench/modules/data/wb_model_reporting/HTML_Basic_Single_Page.tpl
+@dirrm share/mysql-workbench/modules/data/wb_model_reporting/HTML_Basic_Frames.tpl
 @dirrm share/mysql-workbench/modules/data/wb_model_reporting
+@dirrm share/mysql-workbench/modules/data/sqlide
+@dirrm share/mysql-workbench/modules/data/DocLibrary
 @dirrm share/mysql-workbench/modules/data
 @dirrm share/mysql-workbench/modules
-@dirrm share/mysql-workbench/grt
-@dirrm share/mysql-workbench/data
-@dirrm share/mysql-workbench/sqlide
+@dirrm share/mysql-workbench/libraries/workbench
 @dirrm share/mysql-workbench/libraries
 @dirrm share/mysql-workbench/images
+@dirrm share/mysql-workbench/grt
+@dirrm share/mysql-workbench/extras
+@dirrm share/mysql-workbench/db_mysql_catalog_reporting/Basic_Text.tpl
+@dirrm share/mysql-workbench/db_mysql_catalog_reporting
+@dirrm share/mysql-workbench/data
 @dirrm share/mysql-workbench
 @dirrmtry share/applications
+@dirrm lib/mysql-workbench/plugins
+@dirrm lib/mysql-workbench/modules
+@dirrm lib/mysql-workbench