diff -u gcc-6-6.5.0/debian/changelog gcc-6-6.5.0/debian/changelog
--- gcc-6-6.5.0/debian/changelog
+++ gcc-6-6.5.0/debian/changelog
@@ -1,15 +1,22 @@
-gcc-6 (6.5.0-1ubuntu1~16.04) xenial; urgency=medium
+gcc-6 (6.5.0-2ubuntu1~16.04) xenial; urgency=medium
 
   * PPA upload.
-  * LP: #1800197. Update gcc-6 to the last GCC 6.5.0 upstream release.
 
- -- Matthias Klose <doko@ubuntu.com>  Fri, 26 Oct 2018 19:48:57 +0200
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 12 Nov 2018 09:31:28 +0100
 
-gcc-6 (6.5.0-1ubuntu1) delayed; urgency=medium
+gcc-6 (6.5.0-2ubuntu1) disco; urgency=medium
 
-  * GCC 6.5.0 release.
+  * Merge with Debian; remaining changes:
+    - Build from upstream sources.
 
- -- Matthias Klose <doko@ubuntu.com>  Fri, 26 Oct 2018 13:02:26 +0200
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 03 Nov 2018 18:06:16 +0100
+
+gcc-6 (6.5.0-2) unstable; urgency=medium
+
+  * Fix PR libstdc++/87822, taken from the bug report.
+  * Fix VCS attribute in the control file. Addresses: #912405.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 03 Nov 2018 18:04:37 +0100
 
 gcc-6 (6.5.0-1) unstable; urgency=medium
 
diff -u gcc-6-6.5.0/debian/control gcc-6-6.5.0/debian/control
--- gcc-6-6.5.0/debian/control
+++ gcc-6-6.5.0/debian/control
@@ -25,7 +25,7 @@
 Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns, 
 Homepage: http://gcc.gnu.org/
 Vcs-Browser: https://salsa.debian.org/toolchain-team/gcc/tree/gcc-6-debian
-Vcs-Svn: https://salsa.debian.org/toolchain-team/gcc.git
+Vcs-Git: https://salsa.debian.org/toolchain-team/gcc.git -b gcc-6-debian
 XS-Testsuite: autopkgtest
 
 Package: gcc-6-base
diff -u gcc-6-6.5.0/debian/control.m4 gcc-6-6.5.0/debian/control.m4
--- gcc-6-6.5.0/debian/control.m4
+++ gcc-6-6.5.0/debian/control.m4
@@ -96,7 +96,7 @@
 Homepage: http://gcc.gnu.org/
 ')dnl SRCNAME
 Vcs-Browser: https://salsa.debian.org/toolchain-team/gcc/tree/gcc-6-debian
-Vcs-Svn: https://salsa.debian.org/toolchain-team/gcc.git
+Vcs-Git: https://salsa.debian.org/toolchain-team/gcc.git -b gcc-6-debian
 XS-Testsuite: autopkgtest
 
 ifelse(regexp(SRCNAME, `gcc-snapshot'),0,`dnl
diff -u gcc-6-6.5.0/debian/rules.parameters gcc-6-6.5.0/debian/rules.parameters
--- gcc-6-6.5.0/debian/rules.parameters
+++ gcc-6-6.5.0/debian/rules.parameters
@@ -2,14 +2,14 @@
 GCC_VERSION	:= 6.5.0
 NEXT_GCC_VERSION	:= 6.5.1
 BASE_VERSION	:= 6
-SOURCE_VERSION	:= 6.5.0-1ubuntu1~16.04
-DEB_VERSION	:= 6.5.0-1ubuntu1~16.04
-DEB_EVERSION	:= 1:6.5.0-1ubuntu1~16.04
-DEB_GDC_VERSION	:= 6.5.0-1ubuntu1~16.04
+SOURCE_VERSION	:= 6.5.0-2ubuntu1~16.04
+DEB_VERSION	:= 6.5.0-2ubuntu1~16.04
+DEB_EVERSION	:= 1:6.5.0-2ubuntu1~16.04
+DEB_GDC_VERSION	:= 6.5.0-2ubuntu1~16.04
 DEB_SOVERSION	:= 5
 DEB_SOEVERSION	:= 1:5
 DEB_LIBGCC_SOVERSION	:= 
-DEB_LIBGCC_VERSION	:= 1:6.5.0-1ubuntu1~16.04
+DEB_LIBGCC_VERSION	:= 1:6.5.0-2ubuntu1~16.04
 DEB_STDCXX_SOVERSION	:= 5
 DEB_GCJ_SOVERSION	:= 5
 PKG_GCJ_EXT	:= 17
diff -u gcc-6-6.5.0/debian/rules.patch gcc-6-6.5.0/debian/rules.patch
--- gcc-6-6.5.0/debian/rules.patch
+++ gcc-6-6.5.0/debian/rules.patch
@@ -121,6 +121,7 @@
 	gcc-force-cross-layout \
 	pr86139 \
 	r235876-backport-ppc64el \
+	pr87822 \
 
 #	$(if $(filter yes, $(DEB_CROSS)),,gcc-print-file-name) \
 #	libstdc++-nothumb-check \
only in patch2:
unchanged:
--- gcc-6-6.5.0.orig/debian/patches/pr87822.diff
+++ gcc-6-6.5.0/debian/patches/pr87822.diff
@@ -0,0 +1,22 @@
+# DP: Fix PR libstdc++/87822, taken from the bug report
+
+--- a/src/libstdc++-v3/include/bits/stl_pair.h
++++ b/src/libstdc++-v3/include/bits/stl_pair.h
+@@ -187,7 +187,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+   };
+ #endif // C++11
+ 
+-  class __pair_base
++  template<typename _U1, typename _U2> class __pair_base
+   {
+ #if __cplusplus >= 201103L
+     template<typename _T1, typename _T2> friend struct pair;
+@@ -206,7 +206,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+    */
+   template<typename _T1, typename _T2>
+     struct pair
+-    : private __pair_base
++    : private __pair_base<_T1, _T2>
+     {
+       typedef _T1 first_type;    /// @c first_type is the first bound type
+       typedef _T2 second_type;   /// @c second_type is the second bound type