Manual merge of version 4.12.3+ds-1+rpi1 and 4.12.4+ds-3 to produce 4.12.4+ds-3+rpi1

diff --cc debian/changelog
index 09c2e3e2984ac0b5c6b8e7d991a9998f09353df9,0ac03a90f1b1a39d0f78f141b8a816ab0aec7de4..11c88a2b7e6b7d2c58804009819faddda5776c9c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,54 +1,68 @@@
- gtk4 (4.12.3+ds-1+rpi1) trixie-staging; urgency=medium
++gtk4 (4.12.4+ds-3+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 4.4.0+ds1-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 07 Sep 2021 10:26:09 +0000]
 +  * Disable a couple of faliing tests in Raspbian.
 +  * Fix clean target.
 +
 +  [changes introduced in 4.8.3+ds-1+rpi1 by Peter Michael Green]
 +  * Disable a couple more failing tests.
 +
 +  [changes introudce in 4.8.3+ds-2+rpi1 by Peter Michael Green]
 +  * Disable linear-gradient-transition-to-other test.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 26 Oct 2023 15:45:40 +0000
++ -- Peter Michael Green <plugwash@debian.org>  Tue, 19 Dec 2023 10:11:49 +0000
++
+ gtk4 (4.12.4+ds-3) unstable; urgency=medium
+ 
+   * d/control: Remove pandoc build-dependency.
+     It isn't needed any more, and pandoc is currently uninstallable in
+     unstable (#1057309, #1053686).
+ 
+  -- Simon McVittie <smcv@debian.org>  Sat, 09 Dec 2023 01:33:26 +0000
+ 
+ gtk4 (4.12.4+ds-2) unstable; urgency=medium
+ 
+   [ Jeremy Bícha ]
+   * Reinstate Build-Depends on dh-sequence-gnome.
+     This is used by Ubuntu to pull in dh_translations.
+ 
+   [ Simon McVittie ]
+   * d/p/gsk-Always-use-RGBA-on-big-endian-architectures.patch:
+     Add proposed patch to fix test failure on big-endian CPUs
+     (Closes: #1057782)
+ 
+  -- Simon McVittie <smcv@debian.org>  Fri, 08 Dec 2023 17:36:22 +0000
+ 
+ gtk4 (4.12.4+ds-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jeremy Bícha <jbicha@ubuntu.com>  Mon, 27 Nov 2023 10:58:51 -0500
+ 
+ gtk4 (4.12.3+ds-3) unstable; urgency=medium
+ 
+   * d/control: Build-depend on relevant gir1.2-*-dev virtual packages.
+     This will help with eventually converting some or all of them into real
+     packages, to allow GIR XML to be omitted when cross-compiling or
+     bootstrapping.
+   * d/control: Add ${gir:Depends} to -dev package.
+     This will add dependencies on gir1.2-pango-1.0-dev and so on.
+   * d/control: Use ${gir:Provides} to generate virtual package names
+ 
+  -- Simon McVittie <smcv@debian.org>  Fri, 17 Nov 2023 11:06:27 +0000
+ 
+ gtk4 (4.12.3+ds-2) unstable; urgency=medium
+ 
+   * d/rules: Stop generating d/control.in from d/control.
+     The variable substitutions obscured more than they really helped.
+   * d/rules: Substitute GTK_BINVER_DEP as a substvar rather than using sed
+   * lbgtk-4-dev: Add Provides for included GIR XML files.
+     Representing these by systematic names gir1.2-*-dev, and perhaps
+     eventually separating them into their own binary package, will help
+     to enable cross-compilation with GObject-Introspection removed by
+     a build profile. (Helps: #1030223)
+ 
+  -- Simon McVittie <smcv@debian.org>  Thu, 02 Nov 2023 14:47:44 +0000
  
  gtk4 (4.12.3+ds-1) unstable; urgency=medium
  

diff --cc debian/patches/series
Simple merge

diff --cc debian/rules
index b6429e0d1da7f3254d1111ed5cf4ddfeb0949912,39334b161367ea269f73594fe765eab899261066..270fabc9e9fd48c460267f3a32050cf7526df386
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -151,11 -144,6 +144,9 @@@ configure_flags_udeb = 
        dh $@ --with gir --buildsystem=meson $(dh_options)
  
  override_dh_clean: debian/control
-       # gross kludge to force control generation with the %.in target
-       touch debian/control.in
 +      # cleanup python crap
 +      rm -rf subprojects/gi-docgen/gidocgen/gir/__pycache__
 +      rm -rf subprojects/gi-docgen/gidocgen/__pycache__
        rm -f $(call dh_subst_files,$(all_binaries))
        rm -rf debian/build debian/install
        # Rebuild the CSS from source. Note that gtk.css is hand-written,