Manual merge of version 1.1+git20181118-2+rpi1 and 1.1+git20181118-4 to produce 1...

diff --cc debian/changelog
index 4bf3cfcdcb435c3f6d8d23b793239ef7db37319f,5ef4e1b75204a464a72b90fed4f589bcf425566a..36cfdc728c16d8eff517b8d798e1c38bf5e63035
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,17 +1,24 @@@
- performous (1.1+git20181118-2+rpi1) buster-staging; urgency=medium
++performous (1.1+git20181118-4+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 1.1+git20181118-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 14 Mar 2019 16:20:56 +0000]
 +  * Link against -latomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 14 Mar 2019 16:20:56 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 25 Feb 2020 17:01:57 +0000
++
+ performous (1.1+git20181118-4) unstable; urgency=medium
+ 
+   * Team upload
+   * Apply fixes from experimental branch to fix builds with latomic flag
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 14 Feb 2020 12:12:49 +0100
+ 
+ performous (1.1+git20181118-3) unstable; urgency=medium
+ 
+   * Team upload
+   * New pango requires new harfbuzz, patch taken from Ubuntu that fixes FTBFS
+     with pango from debian/experimental
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 13 Feb 2020 11:19:20 +0100
  
  performous (1.1+git20181118-2) unstable; urgency=medium
  

diff --cc debian/rules
index 55e2739a44959a82bf05e46f90f2d426fff515e1,57a1a7b0de2da843b9627295718973ebcfbbafc5..121fd9ea78edbd4bd99da9309c63b7cd95544518
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -1,17 -1,37 +1,37 @@@
  #!/usr/bin/make -f
- #export DH_VERBOSE=1
- export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+ 
+ ifeq (,$(filter terse,${DEB_BUILD_OPTIONS}))
+ export DH_VERBOSE=1
+ export V=1
+ export VERBOSE=1
+ endif
+ 
+ LC_ALL:=C.UTF-8
+ export LC_ALL
+ 
+ DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+ 
+ OUR_CPPFLAGS:=
+ OUR_CXXFLAGS:=
+ OUR_LDFLAGS:= -Wl,--as-needed
+ 
+ # needed so top-level exceptions are displayed as fatal errors for users
+ OUR_CPPFLAGS+=        -DNDEBUG
  
  # Build without Altivec on ppc64el to prevent build failures
- DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
  ifeq ($(DEB_HOST_ARCH),ppc64el)
- export DEB_CXXFLAGS_MAINT_APPEND := -mno-altivec
+ OUR_CXXFLAGS+=        -mno-altivec
  endif
  
- ifneq (,$(filter $(DEB_HOST_ARCH), armhf armel m68k mips mipsel powerpc powerpcspe sh4))
- export DEB_LDFLAGS_MAINT_APPEND = -latomic
 -ifneq (,$(filter ${DEB_HOST_ARCH},armel m68k mips mipsel powerpc powerpcspe sh4))
++ifneq (,$(filter ${DEB_HOST_ARCH},armhf armel m68k mips mipsel powerpc powerpcspe sh4))
+ OUR_LDFLAGS+= -Wl,--start-group -latomic
  endif
  
+ export DEB_BUILD_MAINT_OPTIONS := hardening=+all
+ export DEB_CPPFLAGS_MAINT_APPEND := ${OUR_CPPFLAGS}
+ export DEB_CXXFLAGS_MAINT_APPEND := ${OUR_CXXFLAGS}
+ export DEB_LDFLAGS_MAINT_APPEND := ${OUR_LDFLAGS}
+ 
  %:
        dh $@