diff -pruN 3.46.0-1/debian/changelog 1:3.46.0-1ubuntu1/debian/changelog
--- 3.46.0-1/debian/changelog	2022-10-04 08:10:39.000000000 +0000
+++ 1:3.46.0-1ubuntu1/debian/changelog	2022-10-04 21:35:20.000000000 +0000
@@ -1,3 +1,21 @@
+gnome-panel (1:3.46.0-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Wed, 05 Oct 2022 00:35:20 +0300
+
 gnome-panel (3.46.0-1) unstable; urgency=medium
 
   [ Simon McVittie ]
@@ -22,6 +40,36 @@ gnome-panel (3.44.0-4) unstable; urgency
 
  -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 05 Sep 2022 17:34:17 -0400
 
+gnome-panel (1:3.44.0-3ubuntu3) kinetic; urgency=medium
+
+  * Rebuild against latest evolution-data-server
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 25 Aug 2022 17:09:43 -0400
+
+gnome-panel (1:3.44.0-3ubuntu2) kinetic; urgency=medium
+
+  * Rebuild against latest gnome-desktop
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 28 Jul 2022 07:22:24 -0400
+
+gnome-panel (1:3.44.0-3ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sun, 03 Jul 2022 23:56:08 +0300
+
 gnome-panel (3.44.0-3) unstable; urgency=medium
 
   * Bump gnome-control-center recommended version to 42.
@@ -38,6 +86,31 @@ gnome-panel (3.44.0-2) unstable; urgency
 
  -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 14 Apr 2022 11:18:45 -0400
 
+gnome-panel (1:3.44.0-1ubuntu2) kinetic; urgency=medium
+
+  * Backport upstream patch to use correct filename when editing custom
+    launcher (LP: #1975822).
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sun, 29 May 2022 21:27:00 +0300
+
+gnome-panel (1:3.44.0-1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sun, 20 Mar 2022 16:25:17 +0300
+
 gnome-panel (3.44.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -45,6 +118,24 @@ gnome-panel (3.44.0-1) unstable; urgency
 
  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 19 Mar 2022 16:53:33 +0300
 
+gnome-panel (1:3.43.1-1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sun, 13 Mar 2022 16:43:18 +0300
+
 gnome-panel (3.43.1-1) experimental; urgency=medium
 
   * New upstream release.
@@ -54,6 +145,26 @@ gnome-panel (3.43.1-1) experimental; urg
 
  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 13 Mar 2022 01:12:37 +0300
 
+gnome-panel (1:3.42.0-1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+  * New release fixes regression that caused applets to be pushed out of
+    the panel (LP: #1947553).
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sun, 24 Oct 2021 13:42:10 +0300
+
 gnome-panel (3.42.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -63,12 +174,48 @@ gnome-panel (3.42.0-1) unstable; urgency
 
  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 23 Oct 2021 21:16:09 +0300
 
+gnome-panel (1:3.41.2-2ubuntu1) impish; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sun, 30 May 2021 13:53:52 +0300
+
 gnome-panel (3.41.2-2) experimental; urgency=medium
 
   * Backport upstream patch to fix crash with libgweather 40.0.
 
  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 29 May 2021 21:37:37 +0300
 
+gnome-panel (1:3.41.2-1ubuntu1) impish; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Thu, 27 May 2021 20:16:03 +0300
+
 gnome-panel (3.41.2-1) experimental; urgency=medium
 
   * New upstream release.
@@ -88,6 +235,26 @@ gnome-panel (3.41.1-2) experimental; urg
 
  -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Tue, 25 May 2021 12:56:44 +0200
 
+gnome-panel (1:3.41.1-1ubuntu1) impish; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+  * Refresh 40_unset_menuproxy.patch.
+  * Minor updates for debian/ubuntu.layout to match upstream layout.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Thu, 06 May 2021 11:22:34 +0300
+
 gnome-panel (3.41.1-1) experimental; urgency=medium
 
   * New upstream release.
@@ -96,6 +263,24 @@ gnome-panel (3.41.1-1) experimental; urg
 
  -- Dmitry Shachnev <mitya57@debian.org>  Wed, 05 May 2021 23:27:47 +0300
 
+gnome-panel (1:3.40.0-1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Thu, 25 Mar 2021 22:00:54 +0300
+
 gnome-panel (3.40.0-1) experimental; urgency=medium
 
   * New upstream release.
@@ -104,6 +289,31 @@ gnome-panel (3.40.0-1) experimental; urg
 
  -- Dmitry Shachnev <mitya57@debian.org>  Thu, 25 Mar 2021 20:36:31 +0300
 
+gnome-panel (1:3.38.0-1ubuntu2) hirsute; urgency=medium
+
+  * Rebuild with the new libedataserver soname
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 26 Feb 2021 08:21:13 +0100
+
+gnome-panel (1:3.38.0-1ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+  * Adjust Breaks for Ubuntu versions.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Thu, 15 Oct 2020 15:58:16 +0300
+
 gnome-panel (3.38.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -116,6 +326,25 @@ gnome-panel (3.38.0-1) unstable; urgency
 
  -- Dmitry Shachnev <mitya57@debian.org>  Thu, 15 Oct 2020 15:23:39 +0300
 
+gnome-panel (1:3.37.1-1ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+  * Drop the panel-launch.c part of 40_unset_menuproxy.patch.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 22 Aug 2020 10:34:34 +0300
+
 gnome-panel (3.37.1-1) experimental; urgency=medium
 
   * New upstream release.
@@ -140,6 +369,55 @@ gnome-panel (3.37.1-1) experimental; urg
 
  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 18 May 2020 18:22:02 +0300
 
+gnome-panel (1:3.36.2-1ubuntu2~build1) groovy; urgency=medium
+
+  * Rebuild with the new libedataserver soname
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 18 Aug 2020 10:54:15 -0400
+
+gnome-panel (1:3.36.2-1ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+  * gp_menu_utils_launch_uri now mounts volumes if needed (LP: #1876281).
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Mon, 13 Jul 2020 13:33:34 +0300
+
+gnome-panel (3.36.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Dmitry Shachnev <mitya57@debian.org>  Sun, 12 Jul 2020 14:46:41 +0300
+
+gnome-panel (1:3.36.1-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Mon, 30 Mar 2020 15:37:05 +0300
+
 gnome-panel (3.36.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -148,6 +426,33 @@ gnome-panel (3.36.1-1) unstable; urgency
 
  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 30 Mar 2020 13:58:38 +0300
 
+gnome-panel (1:3.36.0-1ubuntu2) focal; urgency=medium
+
+  * Recommend indicator-applet instead of indicator-applet-complete
+    (which is now a transitional package).
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Mon, 23 Mar 2020 13:14:25 +0300
+
+gnome-panel (1:3.36.0-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet-complete.
+      + Adjust Breaks for Ubuntu versioning.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+  * Refresh 40_unset_menuproxy.patch.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Mon, 09 Mar 2020 10:48:44 +0300
+
 gnome-panel (3.36.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -157,6 +462,32 @@ gnome-panel (3.36.0-1) unstable; urgency
 
  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 08 Mar 2020 20:44:50 +0300
 
+gnome-panel (1:3.35.2-1ubuntu2) focal; urgency=medium
+
+  * No-change rebuild against libgnome-desktop-3-19
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 28 Feb 2020 04:33:14 +0000
+
+gnome-panel (1:3.35.2-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet-complete.
+      + Adjust Breaks for Ubuntu versioning.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/ubuntu.layout, debian/gnome-panel-data.*:
+      + Add the layout file for Ubuntu.
+      + Make it default using a gsettings-override file.
+  * Refresh 40_unset_menuproxy.patch.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 04 Jan 2020 12:44:39 +0300
+
 gnome-panel (3.35.2-1) experimental; urgency=medium
 
   * New upstream release.
@@ -167,6 +498,25 @@ gnome-panel (3.35.2-1) experimental; urg
 
  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 04 Jan 2020 11:47:58 +0300
 
+gnome-panel (1:3.35.1-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet-complete.
+      + Adjust Breaks for Ubuntu versioning.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+  * Ship our layout in /usr/share/gnome-panel/layouts/ubuntu.layout.
+    - debian/gnome-panel-data.gsettings-override: Make it the default.
+    - Drop debian/patches/41_classic_layout.patch, no longer needed.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Tue, 24 Dec 2019 16:29:19 +0300
+
 gnome-panel (3.35.1-1) experimental; urgency=medium
 
   * New upstream release.
@@ -193,6 +543,30 @@ gnome-panel (3.34.0-2) unstable; urgency
 
  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 01 Oct 2019 12:02:08 +0300
 
+gnome-panel (1:3.34.0-1ubuntu2) focal; urgency=medium
+
+  * No-change rebuild for libgweather-3-16.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Thu, 31 Oct 2019 10:25:37 +0300
+
+gnome-panel (1:3.34.0-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet-complete.
+      + Adjust Breaks for Ubuntu versioning.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/patches/41_classic_layout.patch:
+      + Replace clock and notification area with indicators.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Tue, 10 Sep 2019 17:23:29 +0300
+
 gnome-panel (3.34.0-1) experimental; urgency=medium
 
   * New upstream release.
@@ -202,6 +576,24 @@ gnome-panel (3.34.0-1) experimental; urg
 
  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 10 Sep 2019 16:00:07 +0300
 
+gnome-panel (1:3.33.1-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet-complete.
+      + Adjust Breaks for Ubuntu versioning.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/patches/41_classic_layout.patch:
+      + Replace clock and notification area with indicators.
+
+ -- Iain Lane <iain.lane@canonical.com>  Wed, 14 Aug 2019 09:19:23 +0100
+
 gnome-panel (3.33.1-1) experimental; urgency=medium
 
   * debian/watch: Find unstable versions
@@ -210,6 +602,25 @@ gnome-panel (3.33.1-1) experimental; urg
 
  -- Iain Lane <laney@debian.org>  Tue, 13 Aug 2019 13:25:23 +0100
 
+gnome-panel (1:3.32.0-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet-complete.
+      + Adjust Breaks for Ubuntu versioning.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/patches/41_classic_layout.patch:
+      + Replace clock and notification area with indicators.
+  * Refresh 40_unset_menuproxy.patch.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Mon, 06 May 2019 19:48:54 +0300
+
 gnome-panel (3.32.0-1) experimental; urgency=medium
 
   [ Simon McVittie ]
@@ -232,6 +643,39 @@ gnome-panel (3.30.0-2) unstable; urgency
 
  -- Jeremy Bicha <jbicha@debian.org>  Tue, 25 Dec 2018 08:14:50 -0500
 
+gnome-panel (1:3.30.0-1ubuntu3) disco; urgency=medium
+
+  * No-change rebuild against latest evolution-data-server
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 07 Feb 2019 06:28:03 -0500
+
+gnome-panel (1:3.30.0-1ubuntu2) cosmic; urgency=medium
+
+  * No-change rebuild for gjs/s390x removal
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 14 Oct 2018 10:39:35 -0400
+
+gnome-panel (1:3.30.0-1ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet-complete.
+      + Adjust Breaks for Ubuntu versioning.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/patches/41_classic_layout.patch:
+      + Replace clock and notification area with indicators.
+  * The new release fixes oversized clock applet (LP: #1737836).
+  * Drop fallback_css.diff, applied in the new release.
+  * Refresh debian/patches/40_unset_menuproxy.patch.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Mon, 10 Sep 2018 11:13:14 +0300
+
 gnome-panel (3.30.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -244,6 +688,26 @@ gnome-panel (3.30.0-1) unstable; urgency
 
  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 10 Sep 2018 09:55:41 +0300
 
+gnome-panel (1:3.28.0-1ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet-complete.
+      + Adjust Breaks for Ubuntu versioning.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/patches/41_classic_layout.patch:
+      + Replace clock and notification area with indicators.
+  * debian/gbp.conf: Update for Ubuntu.
+  * Backport upstream patch which adds fallback css for GpImageMenuItem.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Thu, 17 May 2018 16:16:19 +0300
+
 gnome-panel (3.28.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -288,6 +752,50 @@ gnome-panel (3.26.0-2) unstable; urgency
 
  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 23 Dec 2017 22:35:09 +0300
 
+gnome-panel (1:3.26.0-1ubuntu5) bionic; urgency=medium
+
+  * No change rebuild for evolution-data-server transition
+
+ -- Tim Lunn <tim@feathertop.org>  Sun, 04 Mar 2018 12:01:48 +1100
+
+gnome-panel (1:3.26.0-1ubuntu4) bionic; urgency=medium
+
+  * No-change rebuild against latest gnome-desktop3
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 15 Feb 2018 23:06:46 -0500
+
+gnome-panel (1:3.26.0-1ubuntu3) bionic; urgency=medium
+
+  * Add gweather-3-27.patch: Cherry-pick patch to build against
+    latest libgweather
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 15 Feb 2018 11:45:24 -0500
+
+gnome-panel (1:3.26.0-1ubuntu2) bionic; urgency=medium
+
+  * No-change rebuild for libical soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 09 Dec 2017 11:41:30 +0000
+
+gnome-panel (1:3.26.0-1ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - debian/changelog:
+      + Use an epoch in version number.
+    - debian/control.in:
+      + Recommend indicator-applet-complete.
+      + Adjust Breaks for Ubuntu versioning.
+      + Update suggestion: gnome-user-guide → gnome-user-docs.
+      + Use Ubuntu VCS fields.
+    - debian/rules:
+      + Explicitly build without -Bsymbolic-functions flag.
+    - debian/patches/40_unset_menuproxy.patch:
+      + Make sure panel and applets do not pick up menu proxies.
+    - debian/patches/41_classic_layout.patch:
+      + Replace clock and notification area with indicators.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 25 Nov 2017 15:50:41 +0300
+
 gnome-panel (3.26.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -303,6 +811,27 @@ gnome-panel (3.24.1-2) unstable; urgency
 
  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 09 Jul 2017 16:22:13 +0300
 
+gnome-panel (1:3.24.1-1ubuntu2) artful; urgency=medium
+
+  * Build without -Bsymbolic-functions flag (works around LP: #1689680).
+  * Update suggestion: gnome-user-guide → gnome-user-docs (LP: #1691867).
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 10 Jun 2017 19:12:29 +0300
+
+gnome-panel (1:3.24.1-1ubuntu1) artful; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - Use an epoch in version number.
+    - Recommend indicator-applet-complete.
+    - Adjust Breaks for Ubuntu versioning.
+    - Add Ubuntu-specific patches:
+      + 40_unset_menuproxy.patch
+      + 41_classic_layout.patch
+    - Use Ubuntu VCS fields.
+  * Rebase debian/patches/40_unset_menuproxy.patch.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Mon, 24 Apr 2017 18:37:36 +0300
+
 gnome-panel (3.24.1-1) experimental; urgency=medium
 
   * New upstream bugfix release.
@@ -327,6 +856,20 @@ gnome-panel (3.24.0-1) experimental; urg
 
  -- Dmitry Shachnev <mitya57@debian.org>  Thu, 23 Mar 2017 12:42:00 +0300
 
+gnome-panel (1:3.22.0-2ubuntu1) zesty; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - Use an epoch in version number.
+    - Recommend indicator-applet-complete.
+    - Adjust Breaks for Ubuntu versioning.
+    - Add Ubuntu-specific patches:
+      + 40_unset_menuproxy.patch
+      + 41_classic_layout.patch
+  * Rebase 40_unset_menuproxy.patch for the new release.
+  * Update Vcs fields for the new Ubuntu Git repository.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Fri, 02 Dec 2016 14:05:33 +0300
+
 gnome-panel (3.22.0-2) experimental; urgency=medium
 
   * Build-depend on automake 1.13, as required by configure.ac.
@@ -349,6 +892,35 @@ gnome-panel (3.22.0-1) experimental; urg
 
  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 11 Oct 2016 16:35:41 +0300
 
+gnome-panel (1:3.20.1-1ubuntu3) zesty; urgency=medium
+
+  * Recommend gnome-control-center instead of unity-control-center,
+    following the desktop name change in gnome-session-flashback.
+  * Make gnome-panel depend on nautilus-data (for org.gnome.nautilus.desktop
+    gsettings schema).
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Fri, 04 Nov 2016 11:58:35 +0300
+
+gnome-panel (1:3.20.1-1ubuntu2) yakkety; urgency=medium
+
+  * No-change rebuild against latest evolution-data-server
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Fri, 19 Aug 2016 22:59:40 -0400
+
+gnome-panel (1:3.20.1-1ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - Use an epoch in version number.
+    - Recommend indicator-applet-complete.
+    - Recommend unity-control-center instead of gnome-control-center.
+    - Adjust Breaks for Ubuntu versioning.
+    - Add Ubuntu-specific patches:
+      + 40_unset_menuproxy.patch
+      + 41_classic_layout.patch
+  * Refresh 40_unset_menuproxy.patch.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 13 Aug 2016 21:16:48 +0300
+
 gnome-panel (3.20.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
@@ -357,6 +929,19 @@ gnome-panel (3.20.1-1) unstable; urgency
 
  -- Dmitry Shachnev <mitya57@debian.org>  Fri, 12 Aug 2016 19:48:49 +0300
 
+gnome-panel (1:3.20.0-1ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - Use an epoch in version number.
+    - Recommend indicator-applet-complete.
+    - Recommend unity-control-center instead of gnome-control-center.
+    - Adjust Breaks for Ubuntu versioning.
+    - Add Ubuntu-specific patches:
+      + 40_unset_menuproxy.patch
+      + 41_classic_layout.patch
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Mon, 08 Aug 2016 20:16:15 +0300
+
 gnome-panel (3.20.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -371,6 +956,25 @@ gnome-panel (3.20.0-1) unstable; urgency
 
  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 24 Apr 2016 14:13:58 +0300
 
+gnome-panel (1:3.18.2-1ubuntu2) yakkety; urgency=medium
+
+  * No-change rebuild for libical soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 25 May 2016 13:08:40 +0000
+
+gnome-panel (1:3.18.2-1ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian unstable, remaining changes:
+    - Use an epoch in version number.
+    - Recommend indicator-applet-complete.
+    - Recommend unity-control-center instead of gnome-control-center.
+    - Adjust Breaks for Ubuntu versioning.
+    - Add Ubuntu-specific patches:
+      + 40_unset_menuproxy.patch
+      + 41_classic_layout.patch
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Thu, 18 Feb 2016 10:38:32 +0300
+
 gnome-panel (3.18.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -pruN 3.46.0-1/debian/control 1:3.46.0-1ubuntu1/debian/control
--- 3.46.0-1/debian/control	2022-10-04 08:10:39.000000000 +0000
+++ 1:3.46.0-1ubuntu1/debian/control	2022-10-04 21:35:20.000000000 +0000
@@ -5,7 +5,8 @@
 Source: gnome-panel
 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: Dmitry Shachnev <mitya57@debian.org>, Jeremy Bicha <jbicha@ubuntu.com>
 Build-Depends: debhelper-compat (= 13),
                evolution-data-server-dev (>= 3.45),
@@ -35,8 +36,8 @@ Build-Depends: debhelper-compat (= 13),
                yelp-tools
 Build-Depends-Indep: libglib2.0-doc <!nodoc>, libgtk-3-doc <!nodoc>
 Standards-Version: 4.6.1
-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-panel
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-panel.git
+Vcs-Git: https://git.launchpad.net/~ubuntu-gnome-flashback/gnome-panel
+Vcs-Browser: https://git.launchpad.net/~ubuntu-gnome-flashback/gnome-panel
 Homepage: https://wiki.gnome.org/Projects/GnomePanel
 
 Package: gnome-panel
@@ -51,7 +52,8 @@ Recommends: alacarte,
             gnome-applets,
             gnome-control-center (>= 1:42.0),
             gnome-session-flashback (>= 3.14.0),
-            gvfs
+            gvfs,
+            indicator-applet
 Suggests: evolution-common (>= 3.4.3),
           gnome-terminal | x-terminal-emulator,
           gnome-user-docs,
diff -pruN 3.46.0-1/debian/control.in 1:3.46.0-1ubuntu1/debian/control.in
--- 3.46.0-1/debian/control.in	2022-10-04 08:10:39.000000000 +0000
+++ 1:3.46.0-1ubuntu1/debian/control.in	2022-10-04 21:35:20.000000000 +0000
@@ -1,7 +1,8 @@
 Source: gnome-panel
 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: @GNOME_TEAM@
 Build-Depends: debhelper-compat (= 13),
                evolution-data-server-dev (>= 3.45),
@@ -31,8 +32,8 @@ Build-Depends: debhelper-compat (= 13),
                yelp-tools
 Build-Depends-Indep: libglib2.0-doc <!nodoc>, libgtk-3-doc <!nodoc>
 Standards-Version: 4.6.1
-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-panel
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-panel.git
+Vcs-Git: https://git.launchpad.net/~ubuntu-gnome-flashback/gnome-panel
+Vcs-Browser: https://git.launchpad.net/~ubuntu-gnome-flashback/gnome-panel
 Homepage: https://wiki.gnome.org/Projects/GnomePanel
 
 Package: gnome-panel
@@ -47,7 +48,8 @@ Recommends: alacarte,
             gnome-applets,
             gnome-control-center (>= 1:42.0),
             gnome-session-flashback (>= 3.14.0),
-            gvfs
+            gvfs,
+            indicator-applet
 Suggests: evolution-common (>= 3.4.3),
           gnome-terminal | x-terminal-emulator,
           gnome-user-docs,
diff -pruN 3.46.0-1/debian/gbp.conf 1:3.46.0-1ubuntu1/debian/gbp.conf
--- 3.46.0-1/debian/gbp.conf	2022-10-04 08:10:39.000000000 +0000
+++ 1:3.46.0-1ubuntu1/debian/gbp.conf	2022-10-04 21:35:20.000000000 +0000
@@ -1,5 +1,7 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/master
+debian-branch = ubuntu
+debian-tag = ubuntu/%(version)s
+debian-tag-msg = %(pkg)s Ubuntu release %(version)s
 upstream-branch = upstream/latest
 upstream-vcs-tag = %(version)s
diff -pruN 3.46.0-1/debian/gnome-panel-data.gsettings-override 1:3.46.0-1ubuntu1/debian/gnome-panel-data.gsettings-override
--- 3.46.0-1/debian/gnome-panel-data.gsettings-override	1970-01-01 00:00:00.000000000 +0000
+++ 1:3.46.0-1ubuntu1/debian/gnome-panel-data.gsettings-override	2022-10-04 21:35:20.000000000 +0000
@@ -0,0 +1,2 @@
+[org.gnome.gnome-panel.general]
+default-layout='ubuntu'
diff -pruN 3.46.0-1/debian/gnome-panel-data.install 1:3.46.0-1ubuntu1/debian/gnome-panel-data.install
--- 3.46.0-1/debian/gnome-panel-data.install	2022-10-04 08:10:39.000000000 +0000
+++ 1:3.46.0-1ubuntu1/debian/gnome-panel-data.install	2022-10-04 21:35:20.000000000 +0000
@@ -1,4 +1,5 @@
 debian/source_gnome-panel.py usr/share/apport/package-hooks
+debian/ubuntu.layout usr/share/gnome-panel/layouts
 usr/share/glib-2.0
 usr/share/gnome-panel
 usr/share/help
diff -pruN 3.46.0-1/debian/patches/40_unset_menuproxy.patch 1:3.46.0-1ubuntu1/debian/patches/40_unset_menuproxy.patch
--- 3.46.0-1/debian/patches/40_unset_menuproxy.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1:3.46.0-1ubuntu1/debian/patches/40_unset_menuproxy.patch	2022-10-04 21:35:20.000000000 +0000
@@ -0,0 +1,18 @@
+Description: make sure gnome-panel and the applets don't pick up menu proxies
+Author: Ted Gould <ted@ubuntu.com>
+Author: Dmitry Shachnev <mitya57@ubuntu.com>
+Author: Alberts Muktupāvels <alberts.muktupavels@gmail.com>
+Forwarded: not-needed
+Last-Update: 2020-08-22
+
+--- a/gnome-panel/gp-main.c
++++ b/gnome-panel/gp-main.c
+@@ -178,6 +178,8 @@ main (int argc, char *argv[])
+   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+   textdomain (GETTEXT_PACKAGE);
+ 
++  g_setenv ("UBUNTU_MENUPROXY", "0", TRUE);
++
+   gtk_init (&argc, &argv);
+ 
+   if (!parse_arguments (&argc, &argv))
diff -pruN 3.46.0-1/debian/patches/series 1:3.46.0-1ubuntu1/debian/patches/series
--- 3.46.0-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 1:3.46.0-1ubuntu1/debian/patches/series	2022-10-04 21:35:20.000000000 +0000
@@ -0,0 +1 @@
+40_unset_menuproxy.patch
diff -pruN 3.46.0-1/debian/rules 1:3.46.0-1ubuntu1/debian/rules
--- 3.46.0-1/debian/rules	2022-10-04 08:10:39.000000000 +0000
+++ 1:3.46.0-1ubuntu1/debian/rules	2022-10-04 21:35:20.000000000 +0000
@@ -4,6 +4,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardeni
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed  # overrides upstream --no-as-needed
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
+export DEB_LDFLAGS_MAINT_STRIP := -Wl,-Bsymbolic-functions
+
 DOPACKAGES=$(shell dh_listpackages)
 
 %:
diff -pruN 3.46.0-1/debian/ubuntu.layout 1:3.46.0-1ubuntu1/debian/ubuntu.layout
--- 3.46.0-1/debian/ubuntu.layout	1970-01-01 00:00:00.000000000 +0000
+++ 1:3.46.0-1ubuntu1/debian/ubuntu.layout	2022-10-04 21:35:20.000000000 +0000
@@ -0,0 +1,36 @@
+[Toplevel top-panel]
+expand=true
+orientation=top
+size=24
+
+[Toplevel bottom-panel]
+expand=true
+orientation=bottom
+size=24
+
+[Object menu-bar]
+object-iid=org.gnome.gnome-panel.menu::menu-bar
+toplevel-id=top-panel
+pack-index=0
+
+[Object indicators]
+object-iid=IndicatorAppletCompleteFactory::IndicatorAppletComplete
+toplevel-id=top-panel
+pack-type=end
+pack-index=0
+
+[Object show-desktop]
+object-iid=org.gnome.gnome-panel.wncklet::show-desktop
+toplevel-id=bottom-panel
+pack-index=0
+
+[Object window-list]
+object-iid=org.gnome.gnome-panel.wncklet::window-list
+toplevel-id=bottom-panel
+pack-index=1
+
+[Object workspace-switcher]
+object-iid=org.gnome.gnome-panel.wncklet::workspace-switcher
+toplevel-id=bottom-panel
+pack-type=end
+pack-index=0
