diff -pruN 53-1/debian/changelog 53-0ubuntu1/debian/changelog
--- 53-1/debian/changelog	2025-09-17 19:48:52.000000000 +0000
+++ 53-0ubuntu1/debian/changelog	2025-09-04 00:52:33.000000000 +0000
@@ -1,13 +1,28 @@
-gnome-shell-extension-tiling-assistant (53-1) unstable; urgency=medium
+gnome-shell-extension-tiling-assistant (53-0ubuntu1) questing; urgency=medium
 
-  [ Jeremy Bícha ]
   * New upstream release
-  * debian/watch: Convert to Version: 5
+  * d/p: Drop applied upstream
 
-  [ Alessandro Astone ]
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Thu, 04 Sep 2025 02:52:33 +0200
+
+gnome-shell-extension-tiling-assistant (52-0ubuntu2) questing; urgency=medium
+
+  * d/p: Refresh patches
+  * d/p: Add initial support for GNOME 49
+  * debian/control: Add dependency on GNOME 50
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Tue, 08 Jul 2025 02:15:50 +0200
+
+gnome-shell-extension-tiling-assistant (52-0ubuntu1) questing; urgency=medium
+
+  * New upstream release (LP: #2107755)
+  * Merge with Debian, remaining changes:
+    - Rename extension to gnome-shell-extension-ubuntu-tiling-assistant
+    - debian/control: Suggests gnome-shell-extension-prefs
+    - d/p: tilingWindowManager: Override window constraints style
   * debian/rules: Fixup gencontrol for Ubuntu
 
- -- Jeremy Bícha <jbicha@ubuntu.com>  Wed, 17 Sep 2025 15:48:52 -0400
+ -- Alessandro Astone <alessandro.astone@canonical.com>  Fri, 20 Jun 2025 14:26:48 +0200
 
 gnome-shell-extension-tiling-assistant (51-2) unstable; urgency=medium
 
@@ -16,6 +31,15 @@ gnome-shell-extension-tiling-assistant (
 
  -- Jeremy Bícha <jbicha@ubuntu.com>  Thu, 10 Apr 2025 17:12:19 -0400
 
+gnome-shell-extension-tiling-assistant (51-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian, remaining changes:
+    - Rename extension to gnome-shell-extension-ubuntu-tiling-assistant
+    - debian/control: Suggests gnome-shell-extension-prefs
+    - d/p: tilingWindowManager: Override window constraints style
+
+ -- Alessandro Astone <alessandro.astone@canonical.com>  Mon, 17 Mar 2025 11:59:32 +0100
+
 gnome-shell-extension-tiling-assistant (51-1) unstable; urgency=medium
 
   * New upstream release (Closes: #1096055)
@@ -24,6 +48,15 @@ gnome-shell-extension-tiling-assistant (
 
  -- Jeremy Bícha <jbicha@ubuntu.com>  Sun, 02 Mar 2025 05:35:56 -0500
 
+gnome-shell-extension-tiling-assistant (50-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian, remaining changes:
+    - Rename extension to gnome-shell-extension-ubuntu-tiling-assistant
+    - debian/control: Suggests gnome-shell-extension-prefs
+    - d/p: tilingWindowManager: Override window constraints style
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Wed, 12 Feb 2025 21:41:17 -0500
+
 gnome-shell-extension-tiling-assistant (50-1) experimental; urgency=medium
 
   * New upstream release
@@ -33,6 +66,15 @@ gnome-shell-extension-tiling-assistant (
 
  -- Jeremy Bícha <jbicha@ubuntu.com>  Wed, 12 Feb 2025 21:36:05 -0500
 
+gnome-shell-extension-tiling-assistant (48-1ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian, remaining changes:
+    - Rename extension to gnome-shell-extension-ubuntu-tiling-assistant
+    - debian/control: Suggests gnome-shell-extension-prefs
+    - d/p: tilingWindowManager: Override window constraints style
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Mon, 16 Sep 2024 21:34:47 -0400
+
 gnome-shell-extension-tiling-assistant (48-1) unstable; urgency=medium
 
   * New upstream release
@@ -40,6 +82,16 @@ gnome-shell-extension-tiling-assistant (
 
  -- Jeremy Bícha <jbicha@ubuntu.com>  Mon, 16 Sep 2024 21:33:29 -0400
 
+gnome-shell-extension-tiling-assistant (47-2ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian, remaining changes:
+    - Rename extension to gnome-shell-extension-ubuntu-tiling-assistant
+    - debian/control: Suggests gnome-shell-extension-prefs
+    - d/p: tilingWindowManager: Override window constraints style
+  * Drop git_panel_click.patch: applied in new release
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Mon, 05 Aug 2024 17:34:41 -0400
+
 gnome-shell-extension-tiling-assistant (47-2) unstable; urgency=medium
 
   * Add patch to mark compatible with GNOME Shell 47
@@ -54,6 +106,23 @@ gnome-shell-extension-tiling-assistant (
 
  -- Jeremy Bícha <jbicha@ubuntu.com>  Fri, 12 Jul 2024 19:45:47 -0400
 
+gnome-shell-extension-tiling-assistant (46-1ubuntu2) oracular; urgency=medium
+
+  * debian/patches/git_panel_click.patch:
+    - fix a bug where clicking on the top panel sometime triggers the
+      tiling action (lp: #2064646)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 20 Jun 2024 15:23:33 +0200
+
+gnome-shell-extension-tiling-assistant (46-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian, remaining changes:
+    - Rename extension to gnome-shell-extension-ubuntu-tiling-assistant
+    - debian/control: Suggests gnome-shell-extension-prefs
+    - d/p: tilingWindowManager: Override window constraints style
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Mon, 01 Apr 2024 11:02:38 -0400
+
 gnome-shell-extension-tiling-assistant (46-1) experimental; urgency=medium
 
   * New upstream release
@@ -61,6 +130,15 @@ gnome-shell-extension-tiling-assistant (
 
  -- Jeremy Bícha <jbicha@ubuntu.com>  Mon, 01 Apr 2024 10:59:44 -0400
 
+gnome-shell-extension-tiling-assistant (44-2ubuntu1) noble; urgency=medium
+
+  * Merge with Debian, remaining changes:
+    - Rename extension to gnome-shell-extension-ubuntu-tiling-assistant
+    - debian/control: Suggests gnome-shell-extension-prefs
+    - d/p: tilingWindowManager: Override window constraints style
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Mon, 26 Feb 2024 11:50:16 -0500
+
 gnome-shell-extension-tiling-assistant (44-2) experimental; urgency=medium
 
   * debian/salsa-ci.yml: Use experimental
@@ -70,6 +148,15 @@ gnome-shell-extension-tiling-assistant (
 
  -- Jeremy Bícha <jbicha@ubuntu.com>  Mon, 26 Feb 2024 11:33:51 -0500
 
+gnome-shell-extension-tiling-assistant (44-1ubuntu1) mantic; urgency=medium
+
+  * Merge with debian, remaining changes:
+    - Rename extension to gnome-shell-extension-ubuntu-tiling-assistant
+    - debian/control: Suggests gnome-shell-extension-prefs
+    - d/p: tilingWindowManager: Override window constraints style
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Mon, 25 Sep 2023 11:46:07 -0400
+
 gnome-shell-extension-tiling-assistant (44-1) experimental; urgency=medium
 
   * New upstream release
@@ -98,6 +185,14 @@ gnome-shell-extension-tiling-assistant (
 
  -- Fabio Augusto De Muzio Tobich <ftobich@debian.org>  Mon, 21 Aug 2023 09:07:26 -0300
 
+gnome-shell-extension-tiling-assistant (41-1+gnome45.2ubuntu1) mantic; urgency=medium
+
+  * Merge with debian, remaining changes:
+    - d/p: tilingWindowManager: Override window constraints style.
+    - debian/control: Suggests gnome-shell-extension-prefs
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Fri, 18 Aug 2023 02:09:10 +0200
+
 gnome-shell-extension-tiling-assistant (41-1+gnome45.2) experimental; urgency=medium
 
   * debian/control: Depend on GNOME shell 45 only
@@ -119,12 +214,45 @@ gnome-shell-extension-tiling-assistant (
 
  -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Fri, 18 Aug 2023 01:44:18 +0200
 
+gnome-shell-extension-tiling-assistant (39-3ubuntu2) lunar; urgency=medium
+
+  * debian/control: Only suggests gnome-shell-extension-prefs.
+    We handle the most relevant settings for ubuntu in g-c-c, no need to
+    have a configuration tool in main.
+    Related to lp:2007710
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Mon, 20 Mar 2023 14:53:14 +0100
+
+gnome-shell-extension-tiling-assistant (39-3ubuntu1) lunar; urgency=medium
+
+  * Merge with debian
+  * debian/patches: Update fixes to match upstreamed ones
+  * debian/patches: Add more fixes to support GNOME 44
+  * debian/patches: Add fixes to handle always-on-top windows
+  * debian/patches: Add logic to always restore changed user settings
+  * d/p: tilingWindowManager: Override window constraints style.
+    Use ubuntu-only function to override window edge constraints so that tiled
+    windows are correctly painted with no shadows and no rounded decorations.
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Thu, 16 Mar 2023 07:21:48 +0100
+
 gnome-shell-extension-tiling-assistant (39-3) experimental; urgency=medium
 
   * Move Fabio from Maintainers to Uploaders. There can only be one Maintainer.
 
  -- Jeremy Bicha <jbicha@ubuntu.com>  Wed, 15 Mar 2023 18:42:45 -0400
 
+gnome-shell-extension-tiling-assistant (39-2ubuntu1) lunar; urgency=medium
+
+  * Merge with debian, remaining changes:
+    - Conflict/Replace the Debian extension since it includes the same
+      gsettings schema filename
+    - debian/control: Update the package name to
+      gnome-shell-extension-ubuntu-tiling-assistant
+    - debian/{control,gbp.conf}: Use ubuntu branches references
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Tue, 07 Mar 2023 07:46:35 +0100
+
 gnome-shell-extension-tiling-assistant (39-2) experimental; urgency=medium
 
   * debian/gbp.conf: Add gnome-team default parameters
@@ -138,7 +266,22 @@ gnome-shell-extension-tiling-assistant (
   * debian: Handle update-locale.sh execution via patch
   * debian/rules: Add ubuntu-specific install actions
 
- -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Tue, 07 Mar 2023 07:08:35 +0100
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Tue, 07 Mar 2023 07:17:55 +0100
+
+gnome-shell-extension-tiling-assistant (39-1ubuntu1) lunar; urgency=medium
+
+  [ Marco Trevisan (Treviño) ]
+  * Use an Ubuntu-specific extension UUID to prevent silent updates to
+    a newer version hosted at https://extensions.gnome.org/
+  * debian/control: Update the package name to
+    gnome-shell-extension-ubuntu-tiling-assistant
+  * debian/gbp.conf: Add gnome-team default parameters
+
+  [ Jeremy Bicha ]
+  * Conflict/Replace the Debian extension since it includes the same gsettings
+    schema filename
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Fri, 10 Feb 2023 12:59:24 -0500
 
 gnome-shell-extension-tiling-assistant (39-1) unstable; urgency=medium
 
diff -pruN 53-1/debian/control 53-0ubuntu1/debian/control
--- 53-1/debian/control	2025-09-17 19:48:52.000000000 +0000
+++ 53-0ubuntu1/debian/control	2025-09-04 00:52:33.000000000 +0000
@@ -1,7 +1,8 @@
 Source: gnome-shell-extension-tiling-assistant
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: Fabio Augusto De Muzio Tobich <ftobich@debian.org>, Jeremy Bícha <jbicha@ubuntu.com>, Marco Trevisan (Treviño) <marco@ubuntu.com>
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-gnome,
@@ -9,16 +10,20 @@ Build-Depends-Indep: gettext,
                      python3
 Standards-Version: 4.7.0
 Homepage: https://extensions.gnome.org/extension/3733/tiling-assistant/
-Vcs-Browser: https://salsa.debian.org/gnome-team/shell-extensions/gnome-shell-extension-tiling-assistant
-Vcs-Git: https://salsa.debian.org/gnome-team/shell-extensions/gnome-shell-extension-tiling-assistant.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/shell-extensions/gnome-shell-extension-tiling-assistant
+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/shell-extensions/gnome-shell-extension-tiling-assistant.git
+Vcs-Browser: https://salsa.debian.org/gnome-team/shell-extensions/gnome-shell-extension-tiling-assistant/tree/ubuntu/latest
+Vcs-Git: https://salsa.debian.org/gnome-team/shell-extensions/gnome-shell-extension-tiling-assistant.git -b ubuntu/latest
 Rules-Requires-Root: no
 
-Package: gnome-shell-extension-tiling-assistant
+Package: gnome-shell-extension-ubuntu-tiling-assistant
 Architecture: all
 Depends: ${misc:Depends},
          gnome-shell (>= ${gnome:MinimumVersion}~),
          gnome-shell (<< ${gnome:MaximumVersion}~),
-Recommends: gnome-shell-extension-prefs
+Suggests: gnome-shell-extension-prefs
+Conflicts: gnome-shell-extension-tiling-assistant
+Replaces: gnome-shell-extension-tiling-assistant
 Description: extension which adds a Windows-like snap assist to GNOME Shell
  An extension which adds a Windows-like snap assist to GNOME Shell.
  .
diff -pruN 53-1/debian/gbp.conf 53-0ubuntu1/debian/gbp.conf
--- 53-1/debian/gbp.conf	2025-09-17 19:48:52.000000000 +0000
+++ 53-0ubuntu1/debian/gbp.conf	2025-09-04 00:52:33.000000000 +0000
@@ -1,6 +1,7 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/latest
+debian-branch = ubuntu/latest
+debian-tag = ubuntu/%(version)s
 upstream-branch = upstream/latest
 
 [buildpackage]
diff -pruN 53-1/debian/patches/series 53-0ubuntu1/debian/patches/series
--- 53-1/debian/patches/series	2025-09-17 19:48:52.000000000 +0000
+++ 53-0ubuntu1/debian/patches/series	2025-09-04 00:52:33.000000000 +0000
@@ -1 +1,2 @@
 010_update-locale.patch
+ubuntu/tilingWindowManager-Override-window-constraints-style.patch
diff -pruN 53-1/debian/patches/ubuntu/tilingWindowManager-Override-window-constraints-style.patch 53-0ubuntu1/debian/patches/ubuntu/tilingWindowManager-Override-window-constraints-style.patch
--- 53-1/debian/patches/ubuntu/tilingWindowManager-Override-window-constraints-style.patch	1970-01-01 00:00:00.000000000 +0000
+++ 53-0ubuntu1/debian/patches/ubuntu/tilingWindowManager-Override-window-constraints-style.patch	2025-09-04 00:52:33.000000000 +0000
@@ -0,0 +1,48 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
+Date: Thu, 16 Mar 2023 07:14:24 +0100
+Subject: tilingWindowManager: Override window constraints style
+
+Use ubuntu-only function to override window edge constraints so that tiled
+windows are correctly painted with no shadows and no rounded decorations.
+---
+ .../src/extension/tilingWindowManager.js             | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/tiling-assistant@leleat-on-github/src/extension/tilingWindowManager.js b/tiling-assistant@leleat-on-github/src/extension/tilingWindowManager.js
+index 1871180..4e33296 100644
+--- a/tiling-assistant@leleat-on-github/src/extension/tilingWindowManager.js
++++ b/tiling-assistant@leleat-on-github/src/extension/tilingWindowManager.js
+@@ -233,6 +233,20 @@ export class TilingWindowManager {
+             );
+         }
+ 
++        if (!maximize && window.override_constraints) {
++            const leftConstraint = newRect.x === workArea.x ?
++                Meta.WindowConstraint.MONITOR : Meta.WindowConstraint.WINDOW;
++            const rightConstraint = newRect.x2 === workArea.x2 ?
++                Meta.WindowConstraint.MONITOR : Meta.WindowConstraint.WINDOW;
++            const topConstraint = newRect.y === workArea.y ?
++                Meta.WindowConstraint.MONITOR : Meta.WindowConstraint.WINDOW;
++            const bottomConstraint = newRect.y2 === workArea.y2 ?
++                Meta.WindowConstraint.MONITOR : Meta.WindowConstraint.WINDOW;
++
++            window.override_constraints(topConstraint, leftConstraint,
++                rightConstraint, bottomConstraint);
++        }
++
+         // See issue #137.
+         // Under some circumstances it's possible that windows will tile to the wrong
+         // monitor. I can't reproduce it but I suspect that it's because of passing
+@@ -321,6 +335,12 @@ export class TilingWindowManager {
+             );
+         }
+ 
++        if (window.override_constraints) {
++            window.override_constraints(Meta.WindowConstraint.NONE,
++                Meta.WindowConstraint.NONE, Meta.WindowConstraint.NONE,
++                Meta.WindowConstraint.NONE);
++        }
++
+         // userOp means that the window won't clamp to the workspace. For DND
+         // we don't want to clamp to the workspace, so it's false by default.
+         const userOp = !clampToWorkspace;
diff -pruN 53-1/debian/salsa-ci.yml 53-0ubuntu1/debian/salsa-ci.yml
--- 53-1/debian/salsa-ci.yml	2025-09-17 19:48:52.000000000 +0000
+++ 53-0ubuntu1/debian/salsa-ci.yml	2025-09-04 00:52:33.000000000 +0000
@@ -5,3 +5,4 @@ include:
 variables:
   RELEASE: 'experimental'
   SALSA_CI_DISABLE_PIUPARTS: 1
+  SALSA_CI_LINTIAN_SUPPRESS_TAGS: 'bad-distribution-in-changes-file,mail-address-loops-or-bounces,epoch-changed-but-upstream-version-did-not-go-backwards'
diff -pruN 53-1/debian/watch 53-0ubuntu1/debian/watch
--- 53-1/debian/watch	2025-09-17 19:48:52.000000000 +0000
+++ 53-0ubuntu1/debian/watch	2025-09-04 00:52:33.000000000 +0000
@@ -1,4 +1,3 @@
-Version: 5
-Template: GitHub
-Owner: Leleat
-Project: Tiling-Assistant
+version=4
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/gnome-shell-extension-tiling-assistant-$1\.tar\.gz/ \
+https://github.com/Leleat/Tiling-Assistant/tags .*/v?(\d{2})\.tar\.gz
