debdiff *.dsc | filterdiff -p1 -x'po/*.po'

diff -Nru gnome-control-center-48.3/debian/changelog gnome-control-center-48.4/debian/changelog
--- gnome-control-center-48.3/debian/changelog	2025-07-03 22:20:23.000000000 +0100
+++ gnome-control-center-48.4/debian/changelog	2025-08-18 15:36:10.000000000 +0100
@@ -1,3 +1,26 @@
+gnome-control-center (1:48.4-1~deb13u1) trixie; urgency=medium
+
+  * Team upload
+  * d/control, d/gbp.conf: Set packaging branch for trixie stable updates
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 18 Aug 2025 15:36:10 +0100
+
+gnome-control-center (1:48.4-1) unstable; urgency=medium
+
+  * Team upload
+  * d/control, d/gbp.conf, d/watch: Limit to 48.x versions.
+    We'll stick to 48.x in testing/unstable for now, to get better
+    testing for 48.x updates in trixie later.
+  * New upstream stable release
+    - In the Power panel, move the General section to the top, avoiding a UI
+      reflow when the notice recommending automatic suspend is shown
+      or hidden (gnome-control-center#3373 upstream)
+    - Disable Pango markup when displaying errors from gnome-online-accounts,
+      fixing display of some error messages that contain URLs
+    - Translation updates
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 08 Aug 2025 10:18:47 +0100
+
 gnome-control-center (1:48.3-3) unstable; urgency=medium
 
   * Release to unstable
diff -Nru gnome-control-center-48.3/debian/control gnome-control-center-48.4/debian/control
--- gnome-control-center-48.3/debian/control	2025-07-03 22:20:23.000000000 +0100
+++ gnome-control-center-48.4/debian/control	2025-08-18 15:36:10.000000000 +0100
@@ -65,7 +65,7 @@
                xvfb
 Standards-Version: 4.7.0
 Rules-Requires-Root: no
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git -b debian/trixie
 Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center
 
 Package: gnome-control-center
diff -Nru gnome-control-center-48.3/debian/gbp.conf gnome-control-center-48.4/debian/gbp.conf
--- gnome-control-center-48.3/debian/gbp.conf	2025-07-03 22:20:23.000000000 +0100
+++ gnome-control-center-48.4/debian/gbp.conf	2025-08-18 15:36:10.000000000 +0100
@@ -1,7 +1,7 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/latest
-upstream-branch = upstream/latest
+debian-branch = debian/trixie
+upstream-branch = upstream/48.x
 
 [buildpackage]
 sign-tags = True
diff -Nru gnome-control-center-48.3/debian/watch gnome-control-center-48.4/debian/watch
--- gnome-control-center-48.3/debian/watch	2025-07-03 22:20:23.000000000 +0100
+++ gnome-control-center-48.4/debian/watch	2025-08-18 15:36:10.000000000 +0100
@@ -1,4 +1,4 @@
 version=4
 opts="searchmode=plain, uversionmangle=s/\.(alpha|beta|rc)/~$1/, downloadurlmangle=s|cache.json||" \
 https://download.gnome.org/sources/@PACKAGE@/cache.json \
-	[\d.]+/@PACKAGE@-([\d.]+\.?(?:beta|rc)?[\d.]*)@ARCHIVE_EXT@
+	48/@PACKAGE@-([\d.]+\.?(?:beta|rc)?[\d.]*)@ARCHIVE_EXT@
diff -Nru gnome-control-center-48.3/meson.build gnome-control-center-48.4/meson.build
--- gnome-control-center-48.3/meson.build	2025-06-26 11:03:14.000000000 +0100
+++ gnome-control-center-48.4/meson.build	2025-08-03 09:17:03.000000000 +0100
@@ -1,6 +1,6 @@
 project(
   'gnome-control-center', 'c',
-        version : '48.3',
+        version : '48.4',
         license : 'GPL2+',
   meson_version : '>= 0.58.0'
 )
diff -Nru gnome-control-center-48.3/NEWS gnome-control-center-48.4/NEWS
--- gnome-control-center-48.3/NEWS	2025-06-26 11:03:14.000000000 +0100
+++ gnome-control-center-48.4/NEWS	2025-08-03 09:17:03.000000000 +0100
@@ -1,4 +1,16 @@
 ============
+Version 48.4
+============
+
+= Various translation updates
+
+Online Accounts
+- Disable markup in toasts for displaying URLs properly
+
+Power
+- Move geenral section above "Power Saving"
+
+============
 Version 48.3
 ============
 
diff -Nru gnome-control-center-48.3/panels/online-accounts/cc-online-accounts-panel.c gnome-control-center-48.4/panels/online-accounts/cc-online-accounts-panel.c
--- gnome-control-center-48.3/panels/online-accounts/cc-online-accounts-panel.c	2025-06-26 11:03:14.000000000 +0100
+++ gnome-control-center-48.4/panels/online-accounts/cc-online-accounts-panel.c	2025-08-03 09:17:03.000000000 +0100
@@ -165,8 +165,12 @@
       if (!g_error_matches (error, GOA_ERROR, GOA_ERROR_DIALOG_DISMISSED) &&
           !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
         {
+          AdwToast *toast = NULL;
+
+          toast = adw_toast_new (error->message);
+          adw_toast_set_use_markup (toast, FALSE);
           adw_toast_overlay_add_toast (ADW_TOAST_OVERLAY (self->toast_overlay),
-                                       adw_toast_new (error->message));
+                                       toast);
         }
 
       return;
diff -Nru gnome-control-center-48.3/panels/power/cc-power-panel.c gnome-control-center-48.4/panels/power/cc-power-panel.c
--- gnome-control-center-48.3/panels/power/cc-power-panel.c	2025-06-26 11:03:14.000000000 +0100
+++ gnome-control-center-48.4/panels/power/cc-power-panel.c	2025-08-03 09:17:03.000000000 +0100
@@ -1183,13 +1183,11 @@
   adw_preferences_page_remove (self->power_saving_page, self->suspend_on_ac_group);
   adw_preferences_page_remove (self->power_saving_page, self->suspend_notice_group);
 
-  adw_preferences_page_remove (self->general_page, self->general_section);
   adw_preferences_page_add (self->general_page, self->power_saving_group);
   adw_preferences_page_add (self->general_page, self->blank_screen_group);
   adw_preferences_page_add (self->general_page, self->suspend_on_battery_group);
   adw_preferences_page_add (self->general_page, self->suspend_on_ac_group);
   adw_preferences_page_add (self->general_page, self->suspend_notice_group);
-  adw_preferences_page_add (self->general_page, self->general_section);
 
   /* Reset title and hide view switcher by hiding stack page */
   gtk_stack_set_visible_child_name (self->title_stack, "title");
diff -Nru gnome-control-center-48.3/shell/appdata/org.gnome.Settings.appdata.xml.in.in gnome-control-center-48.4/shell/appdata/org.gnome.Settings.appdata.xml.in.in
--- gnome-control-center-48.3/shell/appdata/org.gnome.Settings.appdata.xml.in.in	2025-06-26 11:03:14.000000000 +0100
+++ gnome-control-center-48.4/shell/appdata/org.gnome.Settings.appdata.xml.in.in	2025-08-03 09:17:03.000000000 +0100
@@ -50,6 +50,14 @@
   </kudos>
 
   <releases>
+    <release version="48.4" date="2025-08-03">
+      <description>
+        <ul>
+          <li>Fix links in Online Accounts toast notifications</li>
+          <li>Various additional fixes and translation updates</li>
+        </ul>
+      </description>
+    </release>
     <release version="48.3" date="2025-06-26">
       <description>
         <ul>
