diff -u gcc-3.3-3.3.6ds1/debian/README.Debian gcc-3.3-3.3.6ds1/debian/README.Debian
--- gcc-3.3-3.3.6ds1/debian/README.Debian
+++ gcc-3.3-3.3.6ds1/debian/README.Debian
@@ -26,7 +26,7 @@
 
 ===============================================================================
 
-Patches that Debian applied in this version:
+Patches that Ubuntu applied in this version:
 
 pr14925:
   Backport of PR14925 to the gcc-3.3 branch
diff -u gcc-3.3-3.3.6ds1/debian/changelog gcc-3.3-3.3.6ds1/debian/changelog
--- gcc-3.3-3.3.6ds1/debian/changelog
+++ gcc-3.3-3.3.6ds1/debian/changelog
@@ -1,3 +1,9 @@
+gcc-3.3 (1:3.3.6ds1-30ubuntu2) focal; urgency=medium
+
+  * Pick up dependency on libgcc-s1.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 11 Apr 2020 10:58:16 +0200
+
 gcc-3.3 (1:3.3.6ds1-30) unstable; urgency=medium
 
   * Use ucontext_t instead of struct ucontext. (Closes: #887782)
diff -u gcc-3.3-3.3.6ds1/debian/control gcc-3.3-3.3.6ds1/debian/control
--- gcc-3.3-3.3.6ds1/debian/control
+++ gcc-3.3-3.3.6ds1/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Philipp Kern <pkern@debian.org>
 Standards-Version: 3.6.2
-Build-Depends: dpkg-dev (>= 1.16.0), libc6.1-dev (>= 2.3.2.ds1-16) [alpha ia64] | libc0.3-dev [hurd-i386] | libc0.1-dev [kfreebsd-i386] | libc12-dev (>= 2.0.ds1-1) [netbsd-i386] | libc6-dev (>= 2.3.2.ds1-16), libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libunwind7-dev (>= 0.98.5-1) [ia64], libatomic-ops-dev [ia64], m4, autoconf2.13, libtool, autotools-dev, gawk, dejagnu (>= 1.4.3) [!hurd-i386], bzip2, binutils (>= 2.15-7) | binutils-multiarch (>= 2.15-7), binutils-hppa64 (>= 2.15-7) [hppa], debhelper (>= 8.1.3), gperf (>= 2.7-3), bison (>= 1:1.875), flex, gettext, texinfo (>= 4.3), zlib1g-dev, libgc-dev [!avr], locales [!netbsd-i386 !hurd-i386 !hurd-i386], procps [!hurd-i386], sharutils, lsb-release
+Build-Depends: dpkg-dev (>= 1.16.0), libc6.1-dev (>= 2.3.5-1ubuntu4) [alpha ia64] | libc0.3-dev [hurd-i386] | libc0.1-dev [kfreebsd-i386] | libc12-dev (>= 2.0.ds1-1) [netbsd-i386] | libc6-dev (>= 2.3.5-1ubuntu4), libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libunwind7-dev (>= 0.98.5-1) [ia64], libatomic-ops-dev [ia64], m4, autoconf2.13, libtool, autotools-dev, gawk, dejagnu (>= 1.4.3) [!hurd-i386], bzip2, binutils (>= 2.15-7) | binutils-multiarch (>= 2.15-7), binutils-hppa64 (>= 2.15-7) [hppa], debhelper (>= 8.1.3), gperf (>= 2.7-3), bison (>= 1:1.875), flex, gettext, texinfo (>= 4.3), zlib1g-dev, libgc-dev [!avr], locales [!netbsd-i386 !hurd-i386 !hurd-i386], procps [!hurd-i386], sharutils, lsb-release
 Build-Depends-Indep: doxygen (>= 1.4.2-3), graphviz (>= 2.2), gsfonts-x11
 
 Package: libstdc++5
diff -u gcc-3.3-3.3.6ds1/debian/rules.conf gcc-3.3-3.3.6ds1/debian/rules.conf
--- gcc-3.3-3.3.6ds1/debian/rules.conf
+++ gcc-3.3-3.3.6ds1/debian/rules.conf
@@ -79,7 +79,7 @@
 DEB_STDCXX_SOVERSION := $(DEB_SOVERSION)
 DEB_FFI_SOVERSION := $(DEB_SOVERSION)
 DEB_OBJC_SOVERSION := 1:3.3.4-4
-DEB_GCC_SOVERSION := 1:3.3.4-3
+DEB_GCC_SOVERSION := 3.3.4-3
 
 # manual ...
 GCC_SONAME := 1
diff -u gcc-3.3-3.3.6ds1/debian/rules.parameters gcc-3.3-3.3.6ds1/debian/rules.parameters
--- gcc-3.3-3.3.6ds1/debian/rules.parameters
+++ gcc-3.3-3.3.6ds1/debian/rules.parameters
@@ -1,13 +1,13 @@
 # configuration parameters taken from upstream source files
 VER		:= 3.3.6
 BASE_VERSION	:= 3.3
-SOURCE_VERSION	:= 1:3.3.6ds1-30
-DEB_VERSION	:= 1:3.3.6-30
+SOURCE_VERSION	:= 1:3.3.6ds1-30ubuntu1
+DEB_VERSION	:= 1:3.3.6-30ubuntu1
 GPC_BASE_VERSION	:= 2.1
-DEB_GPC_VERSION	:= 2:3.3.6.-30
+DEB_GPC_VERSION	:= 2:3.3.6.-30ubuntu1
 DEB_SOVERSION	:= 1:3.3.4-1
 DEB_FFI_SOVERSION	:= 1:3.3.4-1
-DEB_GCC_SOVERSION	:= 1:3.3.4-3
+DEB_GCC_SOVERSION	:= 3.3.4-3
 DEB_OBJC_SOVERSION	:= 1:3.3.4-4
 DEB_STDCXX_SOVERSION	:= 1:3.3.4-1
 GCC_SONAME	:= 1
@@ -21 +21 @@
-LIBC_DEP		:= libc6-dev (>= 2.3.2.ds1-16)
+LIBC_DEP		:= libc6-dev (>= 2.3.5-1ubuntu4)
diff -u gcc-3.3-3.3.6ds1/debian/rules2 gcc-3.3-3.3.6ds1/debian/rules2
--- gcc-3.3-3.3.6ds1/debian/rules2
+++ gcc-3.3-3.3.6ds1/debian/rules2
@@ -571,6 +571,7 @@
 $(check_stamp): $(build_stamp)
 	rm -f test-protocol
 
+ifeq ($(with_check),yes)
 	: # build locales needed by libstdc++ testsuite
 	rm -rf locales
 	mkdir locales
@@ -661,6 +662,7 @@
 	  cat test-summary; \
 	  echo 'END test-summary'; \
 	fi
+endif # with_check
 
 	touch $(check_stamp)
 
@@ -1166,7 +1168,7 @@
 
 ifneq ($(with_libgcc),yes)
 	: # needed for dependency of other shared libs
-	echo 'libgcc_s $(GCC_SONAME) libgcc$(GCC_SONAME) (>= $(DEB_GCC_SOVERSION))' \
+	echo 'libgcc_s $(GCC_SONAME) libgcc-s$(GCC_SONAME) (>= $(DEB_GCC_SOVERSION))' \
 	    > debian/shlibs.local
 endif