Update changelog

diff --git a/debian/changelog b/debian/changelog
index 8b9d7cb2c880a93146a7ab83055595cc34dd069f..1c89fb49c98b42995f448193ba6dfb2e05b257ad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+gtk4 (4.12.0+ds-3) UNRELEASED; urgency=medium
+
+  * Merge packaging from unstable
+    - No further changes, except in the changelog
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 22 Aug 2023 19:23:55 +0100
+
+gtk4 (4.10.5+ds-5) unstable; urgency=medium
+
+  * d/rules: Ignore two reftests that fail on i386 only.
+    In these tests, the reference rendering of "Hello world" is as one line,
+    but on i386 (possibly due to different rounding) it is word-wrapped onto
+    two lines.
+    I previously thought this was a regression between 4.10 and 4.12, but
+    it seems that instead, it was triggered by some other component being
+    upgraded, possibly fontconfig 2.14.2 or pango 1.51.0.
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 22 Aug 2023 17:20:14 +0100
+
 gtk4 (4.12.0+ds-2) experimental; urgency=medium
 
   * d/rules: Skip build-time tests that are known to fail or be unreliable.
@@ -50,18 +69,6 @@ gtk4 (4.12.0+ds-1) experimental; urgency=medium
 
  -- Jeremy Bícha <jbicha@ubuntu.com>  Tue, 08 Aug 2023 17:31:01 -0400
 
-gtk4 (4.10.5+ds-5) unstable; urgency=medium
-
-  * d/rules: Ignore two reftests that fail on i386 only.
-    In these tests, the reference rendering of "Hello world" is as one line,
-    but on i386 (possibly due to different rounding) it is word-wrapped onto
-    two lines.
-    I previously thought this was a regression between 4.10 and 4.12, but
-    it seems that instead, it was triggered by some other component being
-    upgraded, possibly fontconfig 2.14.2 or pango 1.51.0.
-
- -- Simon McVittie <smcv@debian.org>  Tue, 22 Aug 2023 17:20:14 +0100
-
 gtk4 (4.10.5+ds-3) unstable; urgency=medium
 
   * Temporarily disable sysprof integration altogether, to get the package