Philipp Kiemle · Nathan Follens · Alexander Shopov · Charles Monzat · Alexander Shopov · Jeremy Bicha
--- a/NEWS
+++ b/NEWS
+Major changes in 43.0
+=====================
+- Translation updates
+
+Major changes in 43.rc.1
+========================
+- Update default background file extension to webp
+- Translation updates
+
+Major changes in 43.rc
+======================
+- Add setting for touchpad acceleration profiles
+- Add specific schema for trackpoint pointer devices
+- Translation updates
+
+Major changes in 43.alpha
+=========================
+- Fix description of use-same-proxy setting
+- Translation updates
+
 Major changes in 42.0
 =====================
 - Translation updates

--- a/debian/changelog
+++ b/debian/changelog
+gsettings-desktop-schemas (43.0-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian. Remaining changes:
+    - Add ubuntu_lock-on-suspend.patch
+    - Add dark-theme migration script using dh-migrations
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 20 Sep 2022 14:47:49 -0400
+
+gsettings-desktop-schemas (43.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/control.in: Set Rules-Requires-Root: no
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 19 Sep 2022 10:24:18 -0400
+
+gsettings-desktop-schemas (43~rc.1-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian. Remaining changes:
+    - Add ubuntu_lock-on-suspend.patch
+    - Add dark-theme migration script using dh-migrations
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 06 Sep 2022 10:17:29 -0400
+
+gsettings-desktop-schemas (43~rc.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 06 Sep 2022 10:14:42 -0400
+
+gsettings-desktop-schemas (43~rc-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 05 Sep 2022 16:31:36 -0400
+
+gsettings-desktop-schemas (43~alpha-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+    - Fix description of use-same-proxy setting so it is not described
+      as unused
+    - Translation updates
+  * d/watch: Watch for development versions
+  * Standards-Version: 4.6.1 (no changes required)
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 17 Aug 2022 10:15:05 +0100
+
 gsettings-desktop-schemas (42.0-1ubuntu1) jammy; urgency=medium

  * Merge with Debian. Remaining changes:

--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jeremy.bicha@canonical.com>, Laurent Bigonville <bigon@debian.org>, Tim Lunn <tim@feathertop.org>
+Uploaders: Jeremy Bicha <jbicha@ubuntu.com>, Laurent Bigonville <bigon@debian.org>
 Build-depends: debhelper-compat (= 13),
               dh-sequence-gir,
               dh-sequence-gnome,
@@ -15,7 +15,8 @@ Build-depends: debhelper-compat (= 13),
               libglib2.0-dev (>= 2.31.0),
               libgirepository1.0-dev (>= 1.31.0),
               meson (>= 0.50.0)
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
+Rules-Requires-Root: no
 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

--- a/debian/control.in
+++ b/debian/control.in
@@ -11,7 +11,8 @@ Build-depends: debhelper-compat (= 13),
               libglib2.0-dev (>= 2.31.0),
               libgirepository1.0-dev (>= 1.31.0),
               meson (>= 0.50.0)
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
+Rules-Requires-Root: no
 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

--- a/debian/watch
+++ b/debian/watch
 version=4
-opts="searchmode=plain, uversionmangle=s/\.(alpha|beta|rc)/~$1/" \
+opts="searchmode=plain, uversionmangle=s/\.(alpha|beta|rc)/~$1/, downloadurlmangle=s|cache.json||" \
 https://download.gnome.org/sources/@PACKAGE@/cache.json \
-	[\d.]+/@PACKAGE@-([\d.]+)@ARCHIVE_EXT@
+	[\d.]+/@PACKAGE@-@ANY_VERSION@@ARCHIVE_EXT@
--- a/debian/watch.stable
+++ b/debian/watch.stable
+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.]+)@ARCHIVE_EXT@
--- a/headers/gdesktop-enums.h
+++ b/headers/gdesktop-enums.h
@@ -258,4 +258,11 @@ typedef enum
  G_DESKTOP_COLOR_SCHEME_PREFER_LIGHT,
 } GDesktopColorScheme;

+typedef enum
+{
+  G_DESKTOP_POINTING_STICK_SCROLL_METHOD_DEFAULT,
+  G_DESKTOP_POINTING_STICK_SCROLL_METHOD_NONE,
+  G_DESKTOP_POINTING_STICK_SCROLL_METHOD_ON_BUTTON_DOWN
+} GDesktopPointingStickScrollMethod;
+
 #endif /* __gdesktop_enums_h__ */
--- a/meson.build
+++ b/meson.build
 project(
  'gsettings-desktop-schemas', 'c',
-  version: '42.0',
+  version: '43.0',
  default_options: [
    'warning_level=2'
  ],

--- a/po/LINGUAS
+++ b/po/LINGUAS
 # please keep this list sorted alphabetically
 #
+ab
 as
 bg
 bs
@@ -26,6 +27,7 @@ id
 is
 it
 ja
+ka
 kk
 lt
 lv

--- a/po/ab.po
+++ b/po/ab.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: gsettings-desktop-schemas master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gsettings-desktop-"
 "schemas/issues\n"
-"POT-Creation-Date: 2022-03-12 18:03+0000\n"
-"PO-Revision-Date: 2022-03-15 10:26+0100\n"
+"POT-Creation-Date: 2022-03-15 22:34+0000\n"
+"PO-Revision-Date: 2022-04-08 15:17+0200\n"
 "Last-Translator: Charles Monzat <charles.monzat@free.fr>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
@@ -782,7 +782,7 @@ msgid ""
 "local (file://) URIs."
 msgstr ""
 "URI à utiliser pour l’image d’arrière-plan. Notez que le moteur prend en "
-"charge uniquement les URI locaux (file://)."
+"charge uniquement les URI locales (file://)."

 #: schemas/org.gnome.desktop.background.gschema.xml.in:23
 msgid "Picture URI (dark)"

--- a/po/fur.po
+++ b/po/fur.po
--- a/po/gl.po
+++ b/po/gl.po