diff -Nru codelite-10.0+dfsg/debian/changelog codelite-10.0+dfsg/debian/changelog
--- codelite-10.0+dfsg/debian/changelog	2017-08-29 11:22:56.000000000 +0000
+++ codelite-10.0+dfsg/debian/changelog	2018-07-26 14:24:16.000000000 +0000
@@ -1,3 +1,16 @@
+codelite (10.0+dfsg-3) unstable; urgency=medium
+
+  * debian/control, debian/rules:
+    - Switch to LLVM 6.0. (Closes: #904276)
+    - Migrate Vcs to salsa.debian.org.
+    - Bump standards to 4.1.5.
+    - Set Rules-Requires-Root: no.
+    - Use dpkg's architecture.mk in debian/rules.
+  * debian/patches:
+    - Fix spelling mistake in 05_build-flags.patch.
+
+ -- James Cowgill <jcowgill@debian.org>  Thu, 26 Jul 2018 22:24:16 +0800
+
 codelite (10.0+dfsg-2) unstable; urgency=medium
 
   * debian/copyright:
diff -Nru codelite-10.0+dfsg/debian/control codelite-10.0+dfsg/debian/control
--- codelite-10.0+dfsg/debian/control	2017-08-29 10:44:38.000000000 +0000
+++ codelite-10.0+dfsg/debian/control	2018-07-26 14:22:27.000000000 +0000
@@ -6,19 +6,20 @@
  debhelper (>= 10),
  cmake,
  dpkg-dev (>= 1.16.1.1),
- libclang-5.0-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el sparc64 s390x],
+ libclang-6.0-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el sparc64 s390x],
  libgtk2.0-dev,
  libhunspell-dev,
- liblldb-5.0-dev [amd64 arm64 armel armhf i386 mips mipsel],
+ liblldb-6.0-dev [amd64 arm64 armel armhf i386 mips mipsel],
  libssh-gcrypt-dev,
  libwxgtk3.0-dev,
  libwxsqlite3-3.0-dev,
- llvm-5.0 [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el sparc64 s390x],
+ llvm-6.0 [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el sparc64 s390x],
  pkg-config
-Standards-Version: 4.1.0
+Standards-Version: 4.1.5
+Rules-Requires-Root: no
 Homepage: https://www.codelite.org
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/codelite.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/codelite.git
+Vcs-Git: https://salsa.debian.org/debian/codelite.git
+Vcs-Browser: https://salsa.debian.org/debian/codelite
 
 Package: codelite
 Architecture: any
diff -Nru codelite-10.0+dfsg/debian/patches/05_build-flags.patch codelite-10.0+dfsg/debian/patches/05_build-flags.patch
--- codelite-10.0+dfsg/debian/patches/05_build-flags.patch	2017-08-29 10:36:03.000000000 +0000
+++ codelite-10.0+dfsg/debian/patches/05_build-flags.patch	2018-07-26 14:22:27.000000000 +0000
@@ -1,4 +1,4 @@
-Description: Remove build options not nessesary for Debian
+Description: Remove build options not necessary for Debian
  Do not duplicate all the Debian build flags.
  Stripping is done by dh_strip separately.
 Author: James Cowgill <jcowgill@debian.org>
diff -Nru codelite-10.0+dfsg/debian/rules codelite-10.0+dfsg/debian/rules
--- codelite-10.0+dfsg/debian/rules	2017-08-29 10:41:38.000000000 +0000
+++ codelite-10.0+dfsg/debian/rules	2018-07-26 14:22:27.000000000 +0000
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-LLVM_VERSION := 5.0
+LLVM_VERSION := 6.0
 
 CONFIG_EXTRA := \
     -DCMAKE_INSTALL_LIBDIR=lib \