Manual merge of version 4.0.4-5.1+rpi1 and 6.1.3-4 to produce 6.1.3-4+rpi1

diff --cc debian/changelog
index 34fa147e2c9c7a6e45cb4acbffcb960c4791d425,9db9808b368071919c1a9b784744c1f41dc0d449..3d552daf7f2556385669cd341a59742e92e890f2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,64 +1,76 @@@
- zimlib (4.0.4-5.1+rpi1) bullseye-staging; urgency=medium
++zimlib (6.1.3-4+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4.0.4-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 18 Jan 2019 22:43:45 +0000]
 +  * Update symbols file for Raspbian.
 +
 +  [changes brought forward from 4.0.4-5+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 07 Jun 2020 17:28:23 +0000]
 +  * Update symbols for new ICU.
 +  * Disable testsuite.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 25 Jun 2020 09:25:47 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 09 Jul 2020 15:10:31 +0000
 +
- zimlib (4.0.4-5.1) unstable; urgency=medium
+ zimlib (6.1.3-4) unstable; urgency=medium
  
-   * Non-maintainer upload.
-   * debian/libzim4.symbols: Mark more template instantiations as optional and
-     update for changes due to icu 67. (Closes: #960243)
+   * Upload to unstable.
  
-  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 07 Jun 2020 22:26:22 +0200
+  -- Kunal Mehta <legoktm@debian.org>  Thu, 02 Jul 2020 14:15:08 -0700
+ 
+ zimlib (6.1.3-3) experimental; urgency=medium
+ 
+   * Update symbols for libicu67
+   * Remove Vasudev Kamath from uploaders, per request
+ 
+  -- Kunal Mehta <legoktm@debian.org>  Thu, 11 Jun 2020 01:51:48 -0700
+ 
+ zimlib (6.1.3-2) experimental; urgency=medium
+ 
+   * Have libzim-dev require libzstd-dev
+   * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+     Repository-Browse.
+   * Update standards version to 4.5.0, no changes needed.
+   * Update symbols for alpha amd64 arm64 armel armhf hppa i386
+     ia64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x
+     sh4 sparc64 x32
+ 
+  -- Kunal Mehta <legoktm@debian.org>  Wed, 03 Jun 2020 02:49:21 -0700
+ 
+ zimlib (6.1.3-1) experimental; urgency=medium
+ 
+   * New upstream version 6.1.3
+   * d/control: Update Homepage link to use HTTPS
+ 
+  -- Kunal Mehta <legoktm@debian.org>  Wed, 20 May 2020 13:51:33 -0700
+ 
+ zimlib (6.0.2-2) experimental; urgency=medium
+ 
+   * Update symbols for armel armhf hppa i386 ia64 mips64el
+     mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
+ 
+  -- Kunal Mehta <legoktm@debian.org>  Wed, 25 Dec 2019 14:34:56 -0800
+ 
+ zimlib (6.0.2-1) experimental; urgency=medium
+ 
+   * New upstream version 6.0.2
+   * Standards-Version: 4.4.1, no changes needed
+ 
+  -- Kunal Mehta <legoktm@debian.org>  Sun, 24 Nov 2019 21:45:25 -0800
+ 
+ zimlib (5.0.0-2) experimental; urgency=medium
+ 
+   * Update gitlab-ci.yml for salsa-ci changes
+   * Update symbols file for armel armhf hppa i386 ia64 m68k mips mips64el
+     mipsel powerpc ppc64 ppc64el s390x sh4 sparc64 x32.
+ 
+  -- Kunal Mehta <legoktm@debian.org>  Fri, 26 Jul 2019 17:40:10 -0400
+ 
+ zimlib (5.0.0-1) experimental; urgency=medium
+ 
+   * New upstream version 5.0.0
+   * Enable hardening flags
+   * Standards-Version: 4.4.0, no changes needed
+ 
+  -- Kunal Mehta <legoktm@debian.org>  Tue, 09 Jul 2019 13:28:20 -0400
  
  zimlib (4.0.4-5) unstable; urgency=medium
  

diff --cc debian/rules
index 78e7264aabd52e404b5e37021554d171518a30e6,060bbc49feca9606cb7e94ab880459d56615c196..bf6142b0f3d80e393878f59a0a48049c3f15ddc1
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -1,10 -1,7 +1,14 @@@
  #!/usr/bin/make -f
+ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
  
+ # Skip some extremely memory-intensive tests
+ export SKIP_BIG_MEMORY_TEST=1
  %:
        dh $@ --with pkgkde_symbolshelper --buildsystem=meson
-       #SKIP_BIG_MEMORY_TEST=1 dh_auto_test -O--buildsystem=meson
 +
 +override_dh_auto_test:
++      echo testsuite disabled
 +
 +override_dh_auto_clean:
 +      rm -rf test/pytest/__pycache__
++      dh_auto_clean