diff -pruN 42.0-1/debian/changelog 42.0-1ubuntu1/debian/changelog --- 42.0-1/debian/changelog 2022-03-21 16:47:29.000000000 +0000 +++ 42.0-1ubuntu1/debian/changelog 2022-03-22 18:52:32.000000000 +0000 @@ -1,15 +1,43 @@ +gsettings-desktop-schemas (42.0-1ubuntu1) jammy; urgency=medium + + * Merge with Debian. Remaining changes: + - Add ubuntu_lock-on-suspend.patch + - Add dark-theme migration script using dh-migrations + + -- Jeremy Bicha Tue, 22 Mar 2022 14:52:32 -0400 + gsettings-desktop-schemas (42.0-1) unstable; urgency=medium * New upstream release -- Jeremy Bicha Mon, 21 Mar 2022 12:47:29 -0400 +gsettings-desktop-schemas (42~rc-1ubuntu3) jammy; urgency=medium + + * Add dark-theme migration script using dh-migrations (LP: #1965189) + + -- Jeremy Bicha Thu, 17 Mar 2022 09:49:43 -0400 + +gsettings-desktop-schemas (42~rc-1ubuntu1) jammy; urgency=medium + + * Merge with Debian. Remaining change: + - Add ubuntu_lock-on-suspend.patch + + -- Jeremy Bicha Tue, 08 Mar 2022 13:34:58 -0500 + gsettings-desktop-schemas (42~rc-1) unstable; urgency=medium * New upstream release -- Jeremy Bicha Tue, 08 Mar 2022 13:32:00 -0500 +gsettings-desktop-schemas (42~beta-1ubuntu1) jammy; urgency=medium + + * Merge with Debian. Remaining change: + - Add ubuntu_lock-on-suspend.patch + + -- Jeremy Bicha Mon, 14 Feb 2022 11:06:05 -0500 + gsettings-desktop-schemas (42~beta-1) unstable; urgency=medium * New upstream release @@ -17,6 +45,13 @@ gsettings-desktop-schemas (42~beta-1) un -- Jeremy Bicha Mon, 14 Feb 2022 11:03:55 -0500 +gsettings-desktop-schemas (42~alpha-1ubuntu1) jammy; urgency=medium + + * Merge with Debian. Remaining change: + - Add ubuntu_lock-on-suspend.patch + + -- Jeremy Bicha Tue, 01 Feb 2022 08:53:48 -0500 + gsettings-desktop-schemas (42~alpha-1) unstable; urgency=medium * New upstream release @@ -25,6 +60,16 @@ gsettings-desktop-schemas (42~alpha-1) u -- Jeremy Bicha Tue, 01 Feb 2022 08:49:44 -0500 +gsettings-desktop-schemas (41.0-2ubuntu1) jammy; urgency=medium + + * Merge with Debian. Remaining changes: + - Add ubuntu_lock-on-suspend.patch + - Drop obsolete Restore-peripheral-display-keys.patch + * Dropped changes: + - debian/control.in: Drop extra Breaks not needed since 20.04 LTS + + -- Jeremy Bicha Sat, 23 Oct 2021 19:38:37 -0400 + gsettings-desktop-schemas (41.0-2) unstable; urgency=medium [ Julian Andres Klode ] @@ -56,6 +101,35 @@ gsettings-desktop-schemas (40.0-2) unsta -- Simon McVittie Sat, 11 Sep 2021 20:34:34 +0100 +gsettings-desktop-schemas (40.0-1ubuntu1) impish; urgency=medium + + * Merge with debian, containing new upstream release + * d/p/git_revert_background_key_removal.patch: Drop, nautilus doesn't use it. + This key was required when nautilus used to paint a background but this + is not the case for some releases now, so we can just drop this change + (that was dropped from 3.8). + * d/p/git_revert_menu_icon_key_removal.patch: Drop, it's now obsolete. + No gnome app support this (also gnome-tweak code touching this is now + commented out) nor gtk itself, so there's no point to carry on this + patch that was added at the time of gnome 3.8. + * d/p/git_revert_notifications_key_removal.patch: Drop, obsolete. + It used to be needed by unity-control-center, this is not the case + currently, as unity moved to its own schemas. + * d/p/git_revert_scroll_method_removal.patch: Drop, part of u-s-d. + These settings are now part of u-s-d gsettings and enums, so remove it + from gnome gsettings schemas. + * debian/control: Add Breaks on u-c-c and u-s-d old versions. + Such versions where depending on keys that we removed now, so let's + break them. + * d/p/Restore-peripheral-display-keys.patch: Drop, it's obsolete and adapt + Breaks accordingly on projects that used to depend on this key. + * debian/patches: Refresh + * Remaining changes with debian: + - Add key for lock on suspend: + + ubuntu_lock-on-suspend.patch + + -- Marco Trevisan (Treviño) Fri, 11 Jun 2021 00:18:47 +0200 + gsettings-desktop-schemas (40.0-1) experimental; urgency=medium * New upstream release: @@ -76,6 +150,19 @@ gsettings-desktop-schemas (3.38.0-2) uns -- Simon McVittie Fri, 25 Sep 2020 10:08:30 +0100 +gsettings-desktop-schemas (3.38.0-1ubuntu1) groovy; urgency=medium + + * Merge with debian, remaining changes: + - Add patches to revert dropped settings still used by Unity: + + git_revert_background_key_removal.patch + + git_revert_menu_icon_key_removal.patch + + git_revert_notifications_key_removal.patch + + git_revert_scroll_method_removal.patch + - Add key for lock on suspend: + + ubuntu_lock-on-suspend.patch + + -- Marco Trevisan (Treviño) Thu, 17 Sep 2020 15:12:20 +0200 + gsettings-desktop-schemas (3.38.0-1) experimental; urgency=medium * Team upload @@ -100,6 +187,20 @@ gsettings-desktop-schemas (3.38.0-1) exp -- Simon McVittie Mon, 14 Sep 2020 11:07:30 +0100 +gsettings-desktop-schemas (3.37.2-1ubuntu1) groovy; urgency=medium + + * Merge with debian, remaining changes: + - Add patches to revert dropped settings still used by Unity: + + git_revert_background_key_removal.patch + + git_revert_menu_icon_key_removal.patch + + git_revert_notifications_key_removal.patch + + git_revert_scroll_method_removal.patch + - Add key for lock on suspend: + + ubuntu_lock-on-suspend.patch + * debian/patches: Refreshed + + -- Marco Trevisan (Treviño) Wed, 26 Aug 2020 14:23:03 +0200 + gsettings-desktop-schemas (3.37.2-1) experimental; urgency=medium * New upstream release: @@ -112,6 +213,19 @@ gsettings-desktop-schemas (3.37.2-1) exp -- Marco Trevisan (Treviño) Wed, 26 Aug 2020 14:19:28 +0200 +gsettings-desktop-schemas (3.37.1-1ubuntu1) groovy; urgency=medium + + * Merge with debian, remaining changes: + - Add patches to revert dropped settings still used by Unity: + + git_revert_background_key_removal.patch + + git_revert_menu_icon_key_removal.patch + + git_revert_notifications_key_removal.patch + + git_revert_scroll_method_removal.patch + - Add key for lock on suspend: + + ubuntu_lock-on-suspend.patch + + -- Sebastien Bacher Fri, 07 Aug 2020 16:23:50 +0200 + gsettings-desktop-schemas (3.37.1-1) experimental; urgency=medium * New upstream release @@ -137,6 +251,12 @@ gsettings-desktop-schemas (3.35.91-1) ex -- Iain Lane Thu, 27 Feb 2020 11:21:38 +0000 +gsettings-desktop-schemas (3.35.91-0ubuntu1) focal; urgency=medium + + * New upstream release + + -- Robert Ancell Thu, 20 Feb 2020 09:18:15 +1300 + gsettings-desktop-schemas (3.34.0-2) unstable; urgency=medium * Team upload. @@ -144,6 +264,19 @@ gsettings-desktop-schemas (3.34.0-2) uns -- Andreas Henriksson Mon, 30 Sep 2019 13:08:27 +0200 +gsettings-desktop-schemas (3.34.0-1ubuntu1) eoan; urgency=medium + + * Merge with Debian. Remaining changes: + - Add patches to revert dropped settings still used by Unity: + + git_revert_background_key_removal.patch + + git_revert_notifications_key_removal.patch + + git_revert_menu_icon_key_removal.patch + + legacy-scroll-key.patch + - Add ubuntu_lock-on-suspend.patch: + + Add key for lock on suspend + + -- Iain Lane Tue, 10 Sep 2019 14:18:03 +0100 + gsettings-desktop-schemas (3.34.0-1) experimental; urgency=medium * Team upload @@ -159,6 +292,19 @@ gsettings-desktop-schemas (3.33.90-1) ex -- Tim Lunn Tue, 13 Aug 2019 22:15:09 +1000 +gsettings-desktop-schemas (3.33.1-1ubuntu1) eoan; urgency=medium + + * Merge with Debian. Remaining changes: + - Add patches to revert dropped settings still used by Unity: + + git_revert_background_key_removal.patch + + git_revert_notifications_key_removal.patch + + git_revert_menu_icon_key_removal.patch + + legacy-scroll-key.patch + - Add ubuntu_lock-on-suspend.patch: + + Add key for lock on suspend + + -- Iain Lane Thu, 18 Jul 2019 17:13:24 +0100 + gsettings-desktop-schemas (3.33.1-1) experimental; urgency=medium * New upstream release @@ -176,6 +322,19 @@ gsettings-desktop-schemas (3.32.0-1) exp -- Iain Lane Wed, 13 Mar 2019 09:47:21 +0000 +gsettings-desktop-schemas (3.31.91-1ubuntu1) disco; urgency=medium + + * Sync with Debian. Remaining changes: + - Add patches to revert dropped settings still used by Unity: + + git_revert_background_key_removal.patch + + git_revert_notifications_key_removal.patch + + git_revert_menu_icon_key_removal.patch + + legacy-scroll-key.patch + - Add ubuntu_lock-on-suspend.patch: + + Add key for lock on suspend + + -- Jeremy Bicha Wed, 06 Mar 2019 02:25:58 -0500 + gsettings-desktop-schemas (3.31.91-1) experimental; urgency=medium * New upstream release @@ -190,6 +349,34 @@ gsettings-desktop-schemas (3.31.91-1) ex -- Jeremy Bicha Wed, 06 Mar 2019 02:13:02 -0500 +gsettings-desktop-schemas (3.31.0.2-2ubuntu3) disco; urgency=medium + + * Add Restore-peripherals-display-keys.patch: + - Add 2 dummy keys for renamed gsettings keys to give us more + time to fix their users (LP: #1812143) + * Revert "Add Breaks: mutter << 3.31.4" + + -- Jeremy Bicha Thu, 24 Jan 2019 12:43:44 -0500 + +gsettings-desktop-schemas (3.31.0.2-2ubuntu2) disco; urgency=medium + + * Add Breaks: mutter << 3.31.4 (LP: #1812143) + + -- Jeremy Bicha Tue, 22 Jan 2019 11:57:32 -0500 + +gsettings-desktop-schemas (3.31.0.2-2ubuntu1) disco; urgency=medium + + * Sync with Debian. Remaining changes: + - Add patches to revert dropped settings still used by Unity: + + git_revert_background_key_removal.patch + + git_revert_notifications_key_removal.patch + + git_revert_menu_icon_key_removal.patch + + legacy-scroll-key.patch + - Add ubuntu_lock-on-suspend.patch: + + Add key for lock on suspend + + -- Jeremy Bicha Wed, 16 Jan 2019 11:59:14 -0500 + gsettings-desktop-schemas (3.31.0.2-2) experimental; urgency=medium * Update meson-Use-configure_file-to-create-pkgconfig.patch: @@ -210,6 +397,22 @@ gsettings-desktop-schemas (3.31.0.2-1) e -- Jeremy Bicha Wed, 16 Jan 2019 06:49:18 -0500 +gsettings-desktop-schemas (3.28.1-1ubuntu1) cosmic; urgency=medium + + * Sync with Debian. Remaining changes: + - Add git_revert_background_key_removal.patch: + + Don't remove background key. + - Add git_revert_notifications_key_removal.patch: + + Don't drop this, it's still used by u-c-c. + - Add git_revert_menu_icon_key_removal.patch: + + These are still needed in 3.8. + - Add ubuntu_lock-on-suspend.patch: + + Add key for lock on suspend. + - Add legacy-scroll-key.patch: + + Keep old scroll method key + + -- Jeremy Bicha Sat, 22 Sep 2018 21:19:25 -0400 + gsettings-desktop-schemas (3.28.1-1) unstable; urgency=medium * New upstream release @@ -217,6 +420,22 @@ gsettings-desktop-schemas (3.28.1-1) uns -- Jeremy Bicha Sat, 22 Sep 2018 21:07:57 -0400 +gsettings-desktop-schemas (3.28.0-1ubuntu1) bionic; urgency=medium + + * Sync with Debian. Remaining changes: + - Add git_revert_background_key_removal.patch: + + Don't remove background key. + - Add git_revert_notifications_key_removal.patch: + + Don't drop this, it's still used by u-c-c. + - Add git_revert_menu_icon_key_removal.patch: + + These are still needed in 3.8. + - Add ubuntu_lock-on-suspend.patch: + + Add key for lock on suspend. + - Add legacy-scroll-key.patch: + + Keep old scroll method key + + -- Jeremy Bicha Fri, 13 Apr 2018 14:37:59 -0400 + gsettings-desktop-schemas (3.28.0-1) unstable; urgency=medium * New upstream release @@ -229,6 +448,22 @@ gsettings-desktop-schemas (3.27.92-1) un -- Tim Lunn Wed, 07 Mar 2018 20:27:27 +1100 +gsettings-desktop-schemas (3.27.90-1ubuntu1) bionic; urgency=medium + + * Sync with Debian. Remaining changes: + - Add git_revert_background_key_removal.patch: + + Don't remove background key. + - Add git_revert_notifications_key_removal.patch: + + Don't drop this, it's still used by u-c-c. + - Add git_revert_menu_icon_key_removal.patch: + + These are still needed in 3.8. + - Add ubuntu_lock-on-suspend.patch: + + Add key for lock on suspend. + - Add legacy-scroll-key.patch: + + Keep old scroll method key + + -- Jeremy Bicha Tue, 13 Feb 2018 10:43:18 -0500 + gsettings-desktop-schemas (3.27.90-1) unstable; urgency=medium * New upstream release diff -pruN 42.0-1/debian/control 42.0-1ubuntu1/debian/control --- 42.0-1/debian/control 2022-03-21 16:47:29.000000000 +0000 +++ 42.0-1ubuntu1/debian/control 2022-03-22 18:52:32.000000000 +0000 @@ -5,17 +5,21 @@ Source: gsettings-desktop-schemas Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Iain Lane , Jeremy Bicha , Laurent Bigonville , Tim Lunn +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Iain Lane , Jeremy Bicha , Laurent Bigonville , Tim Lunn Build-depends: debhelper-compat (= 13), dh-sequence-gir, dh-sequence-gnome, + dh-sequence-migrations, libglib2.0-dev (>= 2.31.0), libgirepository1.0-dev (>= 1.31.0), meson (>= 0.50.0) Standards-Version: 4.6.0 -Vcs-Browser: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas -Vcs-Git: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas.git +Vcs-Browser: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas/tree/ubuntu/master +Vcs-Git: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas.git -b ubuntu/master Homepage: https://www.gnome.org/ Package: gsettings-desktop-schemas diff -pruN 42.0-1/debian/control.in 42.0-1ubuntu1/debian/control.in --- 42.0-1/debian/control.in 2022-03-21 16:47:29.000000000 +0000 +++ 42.0-1ubuntu1/debian/control.in 2022-03-22 18:52:32.000000000 +0000 @@ -1,17 +1,21 @@ Source: gsettings-desktop-schemas Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-depends: debhelper-compat (= 13), dh-sequence-gir, dh-sequence-gnome, + dh-sequence-migrations, libglib2.0-dev (>= 2.31.0), libgirepository1.0-dev (>= 1.31.0), meson (>= 0.50.0) Standards-Version: 4.6.0 -Vcs-Browser: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas -Vcs-Git: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas.git +Vcs-Browser: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas/tree/ubuntu/master +Vcs-Git: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas.git -b ubuntu/master Homepage: https://www.gnome.org/ Package: gsettings-desktop-schemas diff -pruN 42.0-1/debian/dark-theme-migration.sh 42.0-1ubuntu1/debian/dark-theme-migration.sh --- 42.0-1/debian/dark-theme-migration.sh 1970-01-01 00:00:00.000000000 +0000 +++ 42.0-1ubuntu1/debian/dark-theme-migration.sh 2022-03-22 18:52:32.000000000 +0000 @@ -0,0 +1,15 @@ +#!/bin/sh + +# If the theme is "-dark", set the GNOME 42 dark preference +case $(gsettings get org.gnome.desktop.interface gtk-theme) in + *-dark\') + gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" + ;; +esac + +# And set the new high-contrast preference +case $(gsettings get org.gnome.desktop.interface gtk-theme) in + \'*HighContrast*) + gsettings set org.gnome.desktop.a11y.interface high-contrast true + ;; +esac diff -pruN 42.0-1/debian/gbp.conf 42.0-1ubuntu1/debian/gbp.conf --- 42.0-1/debian/gbp.conf 2022-03-21 16:47:29.000000000 +0000 +++ 42.0-1ubuntu1/debian/gbp.conf 2022-03-22 18:52:32.000000000 +0000 @@ -1,6 +1,7 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch = ubuntu/master +debian-tag = ubuntu/%(version)s upstream-branch = upstream/latest [buildpackage] diff -pruN 42.0-1/debian/gsettings-desktop-schemas.migrations 42.0-1ubuntu1/debian/gsettings-desktop-schemas.migrations --- 42.0-1/debian/gsettings-desktop-schemas.migrations 1970-01-01 00:00:00.000000000 +0000 +++ 42.0-1ubuntu1/debian/gsettings-desktop-schemas.migrations 2022-03-22 18:52:32.000000000 +0000 @@ -0,0 +1 @@ +debian/dark-theme-migration.sh diff -pruN 42.0-1/debian/patches/series 42.0-1ubuntu1/debian/patches/series --- 42.0-1/debian/patches/series 2022-03-21 16:47:29.000000000 +0000 +++ 42.0-1ubuntu1/debian/patches/series 2022-03-22 18:52:32.000000000 +0000 @@ -0,0 +1 @@ +ubuntu_lock-on-suspend.patch diff -pruN 42.0-1/debian/patches/ubuntu_lock-on-suspend.patch 42.0-1ubuntu1/debian/patches/ubuntu_lock-on-suspend.patch --- 42.0-1/debian/patches/ubuntu_lock-on-suspend.patch 1970-01-01 00:00:00.000000000 +0000 +++ 42.0-1ubuntu1/debian/patches/ubuntu_lock-on-suspend.patch 2022-03-22 18:52:32.000000000 +0000 @@ -0,0 +1,26 @@ +From: Marc Deslauriers +Date: Fri, 9 Mar 2012 15:42:58 +0100 +Subject: Add a new preference to lock the screen when the system suspends. + +Forwarded: No, likely a Ubuntu-specific preference +Bug-Ubuntu: https://bugs.launchpad.net/bugs/938076 +--- + schemas/org.gnome.desktop.screensaver.gschema.xml.in | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/schemas/org.gnome.desktop.screensaver.gschema.xml.in b/schemas/org.gnome.desktop.screensaver.gschema.xml.in +index 5c2db2a..5c4d40e 100644 +--- a/schemas/org.gnome.desktop.screensaver.gschema.xml.in ++++ b/schemas/org.gnome.desktop.screensaver.gschema.xml.in +@@ -26,6 +26,11 @@ + Show full name in the lock screen + Whether the user’s full name is shown in the lock screen or not. This only affects the screen shield, the name is always shown in the unlock dialog. + ++ ++ true ++ Lock on suspend ++ Set this to TRUE to lock the screen when the system suspends. ++ + + false + Allow embedding a keyboard into the window