diff -Nru mysql-workbench-6.3.10+dfsg/debian/changelog mysql-workbench-6.3.10+dfsg/debian/changelog
--- mysql-workbench-6.3.10+dfsg/debian/changelog	2018-06-29 13:05:02.000000000 +0000
+++ mysql-workbench-6.3.10+dfsg/debian/changelog	2018-07-07 07:38:42.000000000 +0000
@@ -1,3 +1,20 @@
+mysql-workbench (6.3.10+dfsg-3ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Ignore "maybe-uninitialized" errors, they seems false positives on ppc64el
+    - Comment out the no-MYSQL_TYPE_JSON.patch, Ubuntu still has mysql.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 07 Jul 2018 09:38:42 +0200
+
+mysql-workbench (6.3.10+dfsg-3) unstable; urgency=medium
+
+  * rules: build with "-Wno-error=deprecated-declarations" (Closes: #896577)
+    to fix FTBFS with GDAL 2.3.0.
+    Thanks, Bas Couwenberg.
+  * Vcs URLs to Salsa
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Wed, 06 Jun 2018 17:18:44 +1000
+
 mysql-workbench (6.3.10+dfsg-2ubuntu3) cosmic; urgency=medium
 
   * Rebuild against new gdal PIC enabled.
diff -Nru mysql-workbench-6.3.10+dfsg/debian/control mysql-workbench-6.3.10+dfsg/debian/control
--- mysql-workbench-6.3.10+dfsg/debian/control	2018-03-04 13:34:47.000000000 +0000
+++ mysql-workbench-6.3.10+dfsg/debian/control	2018-07-07 01:48:41.000000000 +0000
@@ -39,8 +39,8 @@
  ,xdg-utils
 Standards-Version: 4.1.3
 Homepage: http://dev.mysql.com/workbench/
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/mysql-workbench.git
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/mysql-workbench.git
+Vcs-Browser: https://salsa.debian.org/debian/mysql-workbench
+Vcs-Git: https://salsa.debian.org/debian/mysql-workbench.git
 
 Package: mysql-workbench
 Architecture: any
diff -Nru mysql-workbench-6.3.10+dfsg/debian/.gitlab-ci.yml mysql-workbench-6.3.10+dfsg/debian/.gitlab-ci.yml
--- mysql-workbench-6.3.10+dfsg/debian/.gitlab-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ mysql-workbench-6.3.10+dfsg/debian/.gitlab-ci.yml	2018-05-06 13:16:32.000000000 +0000
@@ -0,0 +1,108 @@
+---
+variables:
+  GIT_DEPTH: 128
+  PB_RESULT: '${CI_PROJECT_DIR}/../${CI_PROJECT_NAME}_${CI_BUILD_REF}_${CI_JOB_NAME}_${CI_JOB_ID}'
+  LINTIAN_CMD: eval lintian --no-tag-display-limit --info --display-info --color=auto --display-experimental --pedantic "${PB_RESULT}"/*.changes
+  ORIGTAR_CMD: origtargz --tar-only
+# PDEBUILD_CMD: eval pdebuild --use-pdebuild-internal --pbuildersatisfydepends "/usr/lib/pbuilder/pbuilder-satisfydepends-classic" --buildresult "${PB_RESULT}" --debbuildopts -sa
+  PDEBUILD_CMD: eval pdebuild --use-pdebuild-internal --buildresult "${PB_RESULT}" --debbuildopts -sa
+  EATMYDATA: "yes"
+  AUTOCLEANAPTCACHE: "yes"
+  USE_PDEBUILD_INTERNAL: "yes"
+
+.pre_build:
+  script: &pre_build |
+    uname -a
+    date
+    env
+    pwd
+    mkdir -v -p "${PB_RESULT}"
+
+stages:
+  - check
+  - build
+
+yamllint:
+  stage: check
+  tags:
+    - yamllint
+  dependencies: []
+  allow_failure: false
+  script: |
+    yamllint -c debian/.yamllint debian/.*.yml
+
+dpkg-copyright:
+  stage: check
+  tags:
+    - cme
+  dependencies: []
+  allow_failure: false
+  script: |
+    cme check dpkg-copyright
+
+dpkg-control:
+  stage: check
+  tags:
+    - cme
+  dependencies: []
+  allow_failure: true
+  script:
+    - wrap-and-sort --keep-first --trailing-comma # terrible way to fix "Cannot parse: ''" in "cme check dpkg-control".
+    - cme check dpkg-control
+
+## Build
+
+testing_unstable-amd64:
+  stage: build
+  tags:
+    - pbuilder
+    - amd64
+  dependencies: []
+  allow_failure: false
+  before_script:
+    - *pre_build
+  script:
+    - ${ORIGTAR_CMD}
+    - ${PDEBUILD_CMD} --architecture amd64 -- --basetgz /var/cache/pbuilder/testing_unstable-amd64.tgz
+    - ${LINTIAN_CMD}
+
+unstable-i386:
+  stage: build
+  tags:
+    - pbuilder
+    - amd64
+  dependencies: []
+  allow_failure: false
+  before_script:
+    - *pre_build
+  script:
+    - ${ORIGTAR_CMD}
+    - ${PDEBUILD_CMD} --architecture i386 -- --basetgz /var/cache/pbuilder/unstable-i386.tgz
+
+unstable-amd64:
+  stage: build
+  tags:
+    - pbuilder
+    - amd64
+  dependencies: []
+  allow_failure: false
+  before_script:
+    - *pre_build
+  script:
+    - ${ORIGTAR_CMD}
+    - ${PDEBUILD_CMD} --architecture amd64 -- --basetgz /var/cache/pbuilder/unstable-amd64.tgz
+    - ${LINTIAN_CMD}
+
+unstable-amd64_twice:
+  stage: build
+  tags:
+    - pbuilder
+    - amd64
+  dependencies: []
+  allow_failure: false
+  before_script:
+    - *pre_build
+  script:
+    - ${ORIGTAR_CMD}
+    - ${PDEBUILD_CMD} --architecture amd64 -- --twice --basetgz /var/cache/pbuilder/unstable-amd64.tgz
+    - ${LINTIAN_CMD}
diff -Nru mysql-workbench-6.3.10+dfsg/debian/.yamllint mysql-workbench-6.3.10+dfsg/debian/.yamllint
--- mysql-workbench-6.3.10+dfsg/debian/.yamllint	1970-01-01 00:00:00.000000000 +0000
+++ mysql-workbench-6.3.10+dfsg/debian/.yamllint	2017-03-13 23:40:54.000000000 +0000
@@ -0,0 +1,17 @@
+---
+extends: default
+
+rules:
+  line-length:
+    level: warning
+    max: 120
+  braces:
+    level: warning
+    max-spaces-inside: 8
+  trailing-spaces:
+    level: warning
+  colons:
+    level: warning
+    max-spaces-after: 16
+  empty-lines:
+    level: warning