Manual merge of version 0.69.0-2+rpi1 and 0.73.1-3 to produce 0.73.1-3+rpi1

diff --cc debian/changelog
index f5ec6832e5458935122b3dd7a48d77901932cc88,e47233e5db921d12cb66a7b485736ba80482f668..d2823fe1ecfebbede1846f8a71f61e9b2ed6c3dc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,68 +1,75 @@@
- libdnf (0.69.0-2+rpi1) bookworm-staging; urgency=medium
++libdnf (0.73.1-3+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 0.55.2-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 23 Apr 2022 15:26:04 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 05 Feb 2023 19:13:43 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 20 Jun 2024 02:23:35 +0000
++
+ libdnf (0.73.1-3) unstable; urgency=medium
+ 
+   * Remove workaround for dh_python3 regression, fixed in latest upload
+   * Drop patch to use rpmdb in home, no longer needed
+ 
+  -- Luca Boccassi <bluca@debian.org>  Mon, 06 May 2024 20:29:03 +0100
+ 
+ libdnf (0.73.1-2) unstable; urgency=medium
+ 
+   * Add workaround for dh_python3 regression that wrongly renames cpython
+     module
+ 
+  -- Luca Boccassi <bluca@debian.org>  Sat, 20 Apr 2024 20:17:09 +0100
+ 
+ libdnf (0.73.1-1) unstable; urgency=medium
+ 
+   * Switch to git-buildpackage workflow
+   * Update upstream source from tag 'upstream/0.73.1'
+   * Drop 0006-Add-rpmdb-in-home-directory-to-checksum-and-DNF-cont.patch,
+     no longer needed
+   * Refresh patches for new version
+   * Bump dependency on librepo-dev to 1.15.0
+   * Bump dependency on rpm to 4.15.0
+   * Bump dependency on modulemd to 2.11.2
+   * python3-libdnf: install python metadata too
+   * Drop dh_missing from d/rules, it's default in compat 13
+   * Drop dependency on python3-nose, deprecated (Closes: #1018395)
+   * Drop transitional libdnf1 package (Closes: #1038262)
+   * python3-hawkey-doc: add dependencies on libjs-jquery and libjs-
+     underscore (Closes: #988770)
+   * Add d/clean to remove leftover doc files (Closes: #1045949)
+   * 0013-python-tests-fix-locale-issues.patch: do not create
+     python/hawkey/tests/tests/__init__.py
+   * Use a patch instead of manually mangling source file (Closes: #1045949)
+   * Switch to pkgconf
+   * Set Rules-Requires-Root: no
+   * Switch to dh-sequence-python3
+   * Enable ELF metadata stamping
+   * Bump Standards-Version to 4.7.0
+   * Move manpage to -dev package
+   * Fix typo in 0013-python-tests-fix-locale-issues.patch
+   * Drop Lintian override for python3-hawkey, no longer needed
+ 
+  -- Luca Boccassi <bluca@debian.org>  Mon, 15 Apr 2024 01:03:35 +0100
+ 
+ libdnf (0.69.0-2.3) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Rename libraries for 64-bit time_t transition.
+ 
+  -- Steve Langasek <vorlon@debian.org>  Wed, 31 Jan 2024 22:13:42 +0000
+ 
+ libdnf (0.69.0-2.2) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Use mkdir -p in override_dh_auto_test to fix FTBFS on buildds
+ 
+  -- Luca Boccassi <bluca@debian.org>  Fri, 03 Nov 2023 19:22:17 +0000
+ 
+ libdnf (0.69.0-2.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Move python3 modules from /usr/lib/local/ (Closes: #1052915)
+ 
+  -- Luca Boccassi <bluca@debian.org>  Sun, 29 Oct 2023 15:57:28 +0000
  
  libdnf (0.69.0-2) unstable; urgency=medium
  

diff --cc debian/rules
index 9c97cb33c384cabc986e4c938a47a1da7cf078b3,7b0cc8a200dcd65610d5c7932ac3c4b64035c653..6b7be0353f171e619ed3346b93f59c58dba0eb68
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -49,12 -47,9 +47,9 @@@ override_dh_auto_clean
        dh_auto_clean --builddirectory=build
  
  override_dh_auto_test:
-       #mkdir '$(CURDIR)/debian/tests-home'
 -      mkdir -p '$(CURDIR)/debian/tests-home'
 -      LC_ALL=C HOME='$(CURDIR)/debian/tests-home' dh_auto_test --builddirectory=build -- ARGS='-V'
++      #mkdir -p '$(CURDIR)/debian/tests-home'
 +      #LC_ALL=C HOME='$(CURDIR)/debian/tests-home' dh_auto_test --builddirectory=build -- ARGS='-V'
  
- override_dh_missing:
-       dh_missing --fail-missing
- 
  override_dh_installchangelogs:
        # Do not try to install a history directory within docs.
        dh_installchangelogs -Xhistory