Merge version 0.19.0+dfsg-4+rpi1 and 0.23.0+dfsg-1 to produce 0.23.0+dfsg-1+rpi1

diff --cc debian/changelog
index d5027bbacce1eece863002eb4a40d86e8fb64922,af799f9ed789c92004ecedf6bec0a83992cdb2ee..b002d5e508d8061864092b6d0480e095d61499aa
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,24 @@@
- pbbam (0.19.0+dfsg-4+rpi1) buster-staging; urgency=medium
++pbbam (0.23.0+dfsg-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 0.7.4+ds-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Jul 2017 13:11:07 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Feb 2019 04:03:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 19 Aug 2019 00:24:19 +0000
++
+ pbbam (0.23.0+dfsg-1) unstable; urgency=medium
+ 
+   * Afif removed himself from Uploaders
+   * Add myself to Uploaders
+   * New upstream version
+   * debhelper-compat 12
+   * Standards-Version: 4.4.0
+   * Set upstream metadata fields: Contact, Name.
+   * Rename library to libpbbam0.23.0 due to upstream choice of ABI version
+   * Remove code copy of python-cram from upstream source
+   * Build-Depends: python3-cram
+   * d/control: Use <!nocheck> instead of comment
+ 
+  -- Andreas Tille <tille@debian.org>  Sun, 04 Aug 2019 21:16:32 +0200
  
  pbbam (0.19.0+dfsg-4) unstable; urgency=medium
  

diff --cc debian/rules
index 18d6bb6bb9c687aee52dee10f8414a6871fa7aa2,61b3ef72bdd72fd19fbb63dd623e5c1c36cdb3be..cd09321f8d0b635b56aada2296571d9c6312fbe4
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -13,10 -13,10 +13,10 @@@ generated_data_dir = $(CURDIR)/gendat
          dh $@ --buildsystem=meson
  
  override_dh_auto_test: $(subst .t.in,.deb.t,$(wildcard tests/src/cram/pb*.t.in))
 -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 +ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
        dh_auto_configure -O--buildsystem=meson
        mkdir -p $(generated_data_dir)
-       python tests/scripts/generate_data.py $(CURDIR)/tests/data $(generated_data_dir)
+       python3 tests/scripts/generate_data.py $(CURDIR)/tests/data $(generated_data_dir)
        # Fix broken PATH
        synthetic_movie_all_path=`find $$PWD -name synthetic_movie_all.subreadset.xml` ; \
        sed -i -e "s?.GENERATEDDATADIR/synthetic_movie_all.subreadset.xml?$${synthetic_movie_all_path}?" tests/src/cram/pbbamify*