horok/gnome-control-center
1
0
Fork 0
Code Activity

Adding debian version 1:48.2-2.

Browse source 
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
This commit is contained in:
Daniel Baumann 2025-06-22 19:52:18 +02:00
parent 0a49575b51
commit cc15fb45b4
Signed by: daniel.baumann
GPG key ID: BCC918A2ABD66424
19 changed files with 4821 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4168
debian/changelog vendored Normal file
View file

File diff suppressed because it is too large Load diff

1
debian/clean vendored Normal file
View file

@ -0,0 +1 @@
tests/shared/__pycache__/

139
debian/control vendored Normal file
View file

@ -0,0 +1,139 @@
Source: gnome-control-center
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Amin Bandali <bandali@ubuntu.com>,
Jeremy Bícha <jbicha@ubuntu.com>,
Laurent Bigonville <bigon@debian.org>,
Marco Trevisan (Treviño) <marco@ubuntu.com>
Build-Depends: debhelper-compat (= 13),
desktop-file-utils,
dh-sequence-gnome (>= 0.22.2),
gnome-settings-daemon-dev (>= 48~rc),
gsettings-desktop-schemas-dev (>= 48~alpha),
gtk-doc-tools,
libaccountsservice-dev (>= 23.11.69),
libadwaita-1-dev (>= 1.7~alpha),
libcolord-dev,
libcolord-gtk4-dev (>= 0.1.24),
libcups2-dev,
libgcr-4-dev [linux-any],
libgdk-pixbuf-2.0-dev,
libgirepository1.0-dev,
libglib2.0-dev (>= 2.76.6),
libgnome-bg-4-dev,
libgnome-bluetooth-ui-3.0-dev [linux-any],
libgnome-desktop-4-dev,
libgnome-rr-4-dev,
libgnutls28-dev,
libgoa-1.0-dev (>= 3.51.0),
libgoa-backend-1.0-dev (>= 3.51.0),
libgsound-dev,
libgtk-4-dev (>= 4.15.2),
libgtop2-dev,
libgudev-1.0-dev [linux-any],
libhandy-1-dev (>= 1.2.0),
libibus-1.0-dev,
libjson-glib-dev,
libkrb5-dev,
libmalcontent-0-dev [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x hppa powerpc ppc64 x32],
libmm-glib-dev [linux-any],
libnm-dev [linux-any],
libnma-gtk4-dev (>= 1.10.2) [linux-any],
libpolkit-gobject-1-dev,
libpulse-dev,
libpwquality-dev,
libsecret-1-dev,
libsmbclient-dev,
libsoup-3.0-dev,
libudisks2-dev,
libupower-glib-dev (>= 1.90.6),
libwacom-dev [linux-any],
libx11-dev (>= 2:1.8),
libxft-dev,
libxi-dev,
libxklavier-dev,
libxml2-dev,
libxml2-utils,
locales,
meson (>= 0.57.0),
polkitd,
python3-dbusmock,
shared-mime-info,
tecla (>= 47),
tzdata <!nocheck>,
xvfb
Standards-Version: 4.7.0
Rules-Requires-Root: no
Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git
Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center
Package: gnome-control-center
Architecture: any
Depends: accountsservice (>= 23.11.69),
colord,
desktop-base,
desktop-file-utils,
gnome-control-center-data (<< ${gnome:NextVersion}),
gnome-control-center-data (>= ${source:Version}),
gnome-desktop3-data,
gnome-online-accounts (>= 3.51.0),
gnome-settings-daemon (>= 48~rc),
gsettings-desktop-schemas (>= 48~alpha),
heif-gdk-pixbuf,
heif-thumbnailer,
libjxl-gdk-pixbuf,
mutter-common (>= 47),
tecla (>= 47),
webp-pixbuf-loader,
${misc:Depends},
${shlibs:Depends}
Recommends: cracklib-runtime,
cups-pk-helper,
fwupd [linux-any],
gnome-bluetooth-sendto,
gnome-remote-desktop (>= 47),
gnome-user-docs,
gnome-user-share,
iso-codes,
libcanberra-pulse,
libnss-myhostname,
libspa-0.2-bluetooth | pulseaudio-module-bluetooth,
malcontent-gui [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x hppa powerpc ppc64 x32],
mobile-broadband-provider-info,
nm-connection-editor | network-manager-gnome (<< 1.36.0-3~),
polkitd,
power-profiles-daemon,
realmd,
rygel | rygel-tracker,
system-config-printer-common
Suggests: gnome-software | gnome-packagekit,
gstreamer1.0-plugins-good (>= 1.18.0),
x11-xserver-utils
Breaks: gnome-remote-desktop (<< 42),
gnome-shell (<< 42)
Description: utilities to configure the GNOME desktop
This package contains configuration applets for the GNOME desktop,
allowing to set accessibility configuration, desktop fonts, keyboard
and mouse properties, sound setup, desktop theme and background, user
interface properties, screen resolution, and other GNOME parameters.
.
It also contains a front end to these applets, which can also be
accessed with the GNOME panel or the Nautilus file manager.
Package: gnome-control-center-dev
Architecture: all
Multi-Arch: foreign
Section: devel
Depends: gnome-control-center-data,
${misc:Depends}
Description: utilities to configure the GNOME desktop
This package contains the file required to get the keydirs location
Package: gnome-control-center-data
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
Description: configuration applets for GNOME - data files
This package contains data files (icons, pixmaps, locales files) needed by
the configuration applets in the gnome-control-center package.

185
debian/copyright vendored Normal file
View file

@ -0,0 +1,185 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: https://download.gnome.org/sources/gnome-control-center/
Comment:
This package was debianized by Jim Pick jim@jimpick.com on
Sat, 14 Mar 1998 20:12:23 -0800.
Upstream-Name: GNOME Settings
Files: *
Copyright:
2011-2012 Abderrahim Kitouni
2004 Abdulaziz Al-Arfaj
2004-2006 Adam Weinberger
2004 Alan Cox
2013 Aleksander Morgado
2019-2021 Alexander Mikhaylenko
2021 Alexander Shopov
2007 Aleś Navicki
2007 Anas Husseini
2020 Andrei Lișiță
2003 Arafat Medini
2006-2014 Bastien Nocera
2005-2020 Canonical Ltd.
2014 Carlos Garnacho
2018 Christian Hergert
2010 Codethink Limited
2012 Colin Walters
2020 Collabora Ltd.
2011-2012 Conor Curran
(unspecified) Croatian team
2012 David Henningsson
2002 Diego Gonzalez
2006 Djihed Afifi
2016 Endless Mobile Inc.
2016 Endless, Inc.
2022 Endless OS Foundation, LLC
2020 Felipe Borges
2020 Felix Häcker
1996-2018 Free Software Foundation, Inc.
2003 Gary Curtis
2017-2021 Georges Basile Stavracas Neto
2011-2012 Giovanni Campagna
2011 Gnome Telegu Contributors
2003 Hasbullah Bin Pit
2012 Ibrahim Saed
2011 Inclusive Design Research Centre, OCAD University
2009-2013 Intel, Inc.
2010-2011 Iranian Free Software Users Group (IFSUG.org) translation team
2002 Isam Bayazidi
2006 Johannes H. Jensen
2006 Jonh Wendell
2019 Jordan Petridis
1995-1997 Josh MacDonald
2013 Kalev Lember
2006-2018 Khaled Hosny
2009 Krasimir "Bfaf" Chonov
2006-2008 Lennart Poettering
2006 Lukas Novotny
2005-2008 Marcel Holtmann
2018 Matthias Clasen
2010 Milan Bouchet-Valat
2003-2006 Miloslav Trmac
2017 Mohammed Sadiq
2011 Myanmar L10n Team
2003 Nikos Charonitakis
2003-2012 Novell, Inc.
(unspecified) Nuno Pires
1995-1997 Peter Mattis
(unspecified) Project Nayuki
2017-2022 Purism SPC
2002-2022 Red Hat, Inc.
2010-2017 Richard Hughes
2007-2011 Rosetta Contributors
2001 Roy-Magne Mo
2020 SUSE LINUX GmbH
2002 Sayed Jaffer Al-Mosawi
2003-2005 Sharif FarsiWeb, Inc.
2008 Sjoerd Simons
2009 Soren Hauberg
1995-1997 Spencer Kimball
2003 Sun Microsystems, Inc.
2005-2012 Swecha Telugu Localisation Team
2020 System76, Inc.
2003 The FarsiWeb Project Group
2021 The GNOME Control Center authors
2004-2009 The GNOME Foundation
1999-2015 The Gnome Project
2012 Thomas Bechtold
2009-2010 Tias Guns
2012 Wacom
2008 William Jon McCann
2000-2001 Ximian, Inc.
2019 Zander Brown
2004 Zuza Software Foundation
2004-2017 the timezones authors
License: GPL-2+ and GPL-3+ and LGPL-2.1+ and LGPL-2+ and Expat and CC0-1.0
Files:
panels/system/datetime/backward
Copyright:
none
License: tzdb-public-domain
License: GPL-2+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Comment:
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
License: GPL-3+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Comment:
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-3'.
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
License: LGPL-2+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
Comment:
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
License: LGPL-2.1+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
Comment:
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
License: tzdb-public-domain
This file is in the public domain, so clarified as of
2009-05-17 by Arthur David Olson.
License: CC0-1.0
On Debian systems, the complete text of the Creative Commons Zero v1.0
Universal Public Domain Dedication can be found in
</usr/share/common-licenses/CC0-1.0>.

17
debian/gbp.conf vendored Normal file
View file

@ -0,0 +1,17 @@
[DEFAULT]
pristine-tar = True
debian-branch = debian/latest
upstream-branch = upstream/latest
[buildpackage]
sign-tags = True
[dch]
multimaint-merge = True
[import-orig]
postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
upstream-vcs-tag = %(version%~%.)s
[pq]
patch-numbers = False

8
debian/gnome-control-center-data.install vendored Normal file
View file

@ -0,0 +1,8 @@
usr/share/gettext/its
usr/share/glib-2.0
usr/share/gnome-control-center
usr/share/icons
usr/share/locale
usr/share/pixmaps/faces
usr/share/polkit-1
usr/share/sounds

1
debian/gnome-control-center-dev.install vendored Normal file
View file

@ -0,0 +1 @@
usr/share/pkgconfig

2
debian/gnome-control-center.docs vendored Normal file
View file

@ -0,0 +1,2 @@
NEWS
README.md

8
debian/gnome-control-center.install vendored Normal file
View file

@ -0,0 +1,8 @@
usr/bin
usr/libexec
usr/share/applications
usr/share/bash-completion
usr/share/dbus-1
usr/share/gnome-shell
usr/share/man
usr/share/metainfo

3
debian/gnome-control-center.lintian-overrides vendored Normal file
View file

@ -0,0 +1,3 @@
# Intentionally GNOME-specific, the clue's in the name
desktop-entry-limited-to-environments [usr/share/applications/gnome-*.desktop]
desktop-entry-limited-to-environments [usr/share/applications/org.gnome*.desktop]

37
debian/patches/debian/Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch vendored Normal file
View file

@ -0,0 +1,37 @@
From: Andrea Azzarone <andrea.azzarone@canonical.com>
Date: Tue, 31 Jul 2018 04:44:11 +0100
Subject: Debian's adduser doesn't allow uppercase letters by default.
Forwarded: not-needed, Debian-specific
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910141
---
panels/system/users/cc-add-user-dialog.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/panels/system/users/cc-add-user-dialog.c b/panels/system/users/cc-add-user-dialog.c
index c0f17ea..7703341 100644
--- a/panels/system/users/cc-add-user-dialog.c
+++ b/panels/system/users/cc-add-user-dialog.c
@@ -164,6 +164,7 @@ create_user_done (ActUserManager *manager,
static void
create_user (CcAddUserDialog *self)
{
+ g_autofree char *debian_username = NULL;
ActUserManager *manager;
const gchar *username;
const gchar *name;
@@ -175,11 +176,12 @@ create_user (CcAddUserDialog *self)
username = gtk_editable_get_text (GTK_EDITABLE (self->username_row));
account_type = gtk_switch_get_active (self->account_type_switch) ? ACT_USER_ACCOUNT_TYPE_ADMINISTRATOR : ACT_USER_ACCOUNT_TYPE_STANDARD;
- g_debug ("Creating local user: %s", username);
+ debian_username = g_ascii_strdown (username, -1);
+ g_debug ("Creating local user: %s", debian_username);
manager = act_user_manager_get_default ();
act_user_manager_create_user_async (manager,
- username,
+ debian_username,
name,
account_type,
self->cancellable,

88
debian/patches/debian/Expose-touchpad-settings-if-synaptics-is-in-use.patch vendored Normal file
View file

@ -0,0 +1,88 @@
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Fri, 16 Mar 2018 13:53:10 -0400
Subject: Expose touchpad settings if synaptics is in use
Upstream is aggressively pushing for libinput over synaptics. However that
creates a factually incorrect situation where gnome-control-center thinks
there is no touchpad unless you're using the xserver-xorg-input-libinput.
This patch adds support for both drivers, removing the code that would
hide the touchpad settings when xserver-xorg-input-synaptics is in use.
This patch is only useful in the GNOME on Xorg session.
In GNOME on Wayland, libinput is used anyway.
This patch requires a companion patch in mutter which GNOME has rejected.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/37
---
panels/mouse/cc-mouse-caps-helper.c | 7 +++++++
panels/mouse/cc-mouse-panel.c | 16 +++++++++-------
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/panels/mouse/cc-mouse-caps-helper.c b/panels/mouse/cc-mouse-caps-helper.c
index 6658f41..12aafdb 100644
--- a/panels/mouse/cc-mouse-caps-helper.c
+++ b/panels/mouse/cc-mouse-caps-helper.c
@@ -38,6 +38,13 @@ touchpad_check_capabilities_x11 (gboolean *have_two_finger_scrolling,
unsigned long nitems, bytes_after;
unsigned char *data;
+ if (cc_synaptics_check ()) {
+ *have_two_finger_scrolling = TRUE;
+ *have_edge_scrolling = TRUE;
+ *have_tap_to_click = TRUE;
+ return TRUE;
+ }
+
gdisplay = gdk_display_get_default ();
display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
prop_scroll_methods = XInternAtom (display, "libinput Scroll Methods Available", False);
diff --git a/panels/mouse/cc-mouse-panel.c b/panels/mouse/cc-mouse-panel.c
index 0704c57..fd5f73a 100644
--- a/panels/mouse/cc-mouse-panel.c
+++ b/panels/mouse/cc-mouse-panel.c
@@ -62,7 +62,6 @@ struct _CcMousePanel
gboolean have_mouse;
gboolean have_touchpad;
gboolean have_touchscreen;
- gboolean have_synaptics;
GtkGesture *left_gesture;
GtkGesture *right_gesture;
@@ -77,7 +76,7 @@ setup_touchpad_options (CcMousePanel *self)
gboolean have_edge_scrolling;
gboolean have_tap_to_click;
- if (self->have_synaptics || !self->have_touchpad) {
+ if (!self->have_touchpad) {
adw_view_stack_page_set_visible (self->touchpad_stack_page, FALSE);
gtk_stack_set_visible_child_name (self->title_stack, "title");
return;
@@ -331,7 +330,10 @@ setup_dialog (CcMousePanel *self)
static void
device_changed (CcMousePanel *self)
{
- self->have_touchpad = touchpad_is_present ();
+ self->have_touchpad = touchpad_is_present () || cc_synaptics_check ();
+ /* ^^^^^^^^^^^^^^^^^^^^^
+ * Workaround https://gitlab.gnome.org/GNOME/gtk/issues/97
+ */
setup_touchpad_options (self);
@@ -398,11 +400,11 @@ cc_mouse_panel_init (CcMousePanel *self)
G_CALLBACK (device_changed), self, G_CONNECT_SWAPPED);
self->have_mouse = mouse_is_present ();
- self->have_touchpad = touchpad_is_present ();
+ self->have_touchpad = touchpad_is_present () || cc_synaptics_check ();
+ /* ^^^^^^^^^^^^^^^^^^^^^
+ * Workaround https://gitlab.gnome.org/GNOME/gtk/issues/97
+ */
self->have_touchscreen = touchscreen_is_present ();
- self->have_synaptics = cc_synaptics_check ();
- if (self->have_synaptics)
- g_warning ("Detected synaptics X driver, please migrate to libinput");
setup_dialog (self);
}

25
debian/patches/debian/Ignore-result-of-test-network-panel.patch vendored Normal file
View file

@ -0,0 +1,25 @@
From: Simon McVittie <smcv@debian.org>
Date: Fri, 15 Apr 2022 11:38:23 +0100
Subject: Ignore result of test-network-panel
This is a workaround for the test intermittently failing, especially
on slower architectures. Continue to run it with the result ignored,
so that we can see how often it fails in practice.
Bug: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1768
Forwarded: not-needed, Debian-specific workaround
---
tests/network/test-network-panel.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/network/test-network-panel.py b/tests/network/test-network-panel.py
index 1098bab..dac0894 100644
--- a/tests/network/test-network-panel.py
+++ b/tests/network/test-network-panel.py
@@ -41,4 +41,5 @@ class PanelTestCase(X11SessionTestCase, GTest):
if __name__ == '__main__':
# avoid writing to stderr
- unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2))
+ # TODO: result is ignored: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1768
+ unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2), exit=False)

89
debian/patches/kbd-lvl3.patch vendored Normal file
View file

@ -0,0 +1,89 @@
From: Nathan Pratta Teodosio <nathan.teodosio@canonical.com>
Date: Mon, 2 Sep 2024 14:20:08 +0200
Subject: [PATCH] Add none and layout's default alternate keys (lv3).
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
The window only offers actual keys for the 3rd level, by default, right alt.
A user might nonetheless want right alt to be just an alt, not a lv3 key.
And so for all other modifiers. So offer the "none" option.
Likewise the user might prefer just not to mess with the keyboard layout —
some layouts do have unusual keys as 3rd level switchers —, so offer the
"layout's default" option.
Closes #918.
Forwarded: https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/2811
---
panels/keyboard/cc-keyboard-panel.c | 7 ++++++-
panels/keyboard/cc-xkb-modifier-page.c | 10 ++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/panels/keyboard/cc-keyboard-panel.c b/panels/keyboard/cc-keyboard-panel.c
index d87e9e7..870b9e4 100644
--- a/panels/keyboard/cc-keyboard-panel.c
+++ b/panels/keyboard/cc-keyboard-panel.c
@@ -63,6 +63,11 @@ static const CcXkbModifier LV3_MODIFIER = {
N_("Alternate Characters Key"),
N_("The alternate characters key can be used to enter additional characters. These are sometimes printed as a third-option on your keyboard."),
(CcXkbOption[]){
+ /* Set xkb_option to the prefix, namely "lvl3:", to signify removal of any
+ * lvl3: option from the xkb-options Gsetting.
+ */
+ { NC_("keyboard key", "Default"), "lv3:" },
+ { NC_("keyboard key", "None"), "lv3:ralt_alt" },
{ NC_("keyboard key", "Left Alt"), "lv3:lalt_switch" },
{ NC_("keyboard key", "Right Alt"), "lv3:ralt_switch" },
{ NC_("keyboard key", "Left Super"), "lv3:lwin_switch" },
@@ -71,7 +76,7 @@ static const CcXkbModifier LV3_MODIFIER = {
{ NC_("keyboard key", "Right Ctrl"), "lv3:switch" },
{ NULL, NULL }
},
- "lv3:ralt_switch",
+ "lv3:",
};
static const CcXkbModifier COMPOSE_MODIFIER = {
diff --git a/panels/keyboard/cc-xkb-modifier-page.c b/panels/keyboard/cc-xkb-modifier-page.c
index ddbf72b..d2a566d 100644
--- a/panels/keyboard/cc-xkb-modifier-page.c
+++ b/panels/keyboard/cc-xkb-modifier-page.c
@@ -117,21 +117,23 @@ set_xkb_option (CcXkbModifierPage *self,
{
g_autoptr(GPtrArray) array = NULL;
g_auto(GStrv) options = NULL;
- gboolean found;
+ gboolean found, is_prefix;
guint i;
/* Either replace the existing "<modifier>:" option in the string
- * array, or add the option at the end
+ * array, or add the option at the end, or, in case the argument is exactly
+ * <modifier>:, remove any instance of <modifier>:
*/
array = g_ptr_array_new ();
options = g_settings_get_strv (self->input_source_settings, "xkb-options");
found = FALSE;
+ is_prefix = g_strcmp0(self->modifier->prefix, xkb_option) == 0;
for (i = 0; options != NULL && options[i] != NULL; i++)
{
if (g_str_has_prefix (options[i], self->modifier->prefix))
{
- if (!found && xkb_option != NULL)
+ if (!found && xkb_option != NULL && !is_prefix)
g_ptr_array_add (array, xkb_option);
found = TRUE;
}
@@ -141,7 +143,7 @@ set_xkb_option (CcXkbModifierPage *self,
}
}
- if (!found && xkb_option != NULL)
+ if (!found && xkb_option != NULL && !is_prefix)
g_ptr_array_add (array, xkb_option);
g_ptr_array_add (array, NULL);

4
debian/patches/series vendored Normal file
View file

@ -0,0 +1,4 @@
kbd-lvl3.patch
debian/Expose-touchpad-settings-if-synaptics-is-in-use.patch
debian/Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch
debian/Ignore-result-of-test-network-panel.patch

37
debian/rules vendored Executable file
View file

@ -0,0 +1,37 @@
#!/usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_CPPFLAGS_MAINT_APPEND = -DSSHD_SERVICE=\"ssh.service\"
export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs
# Not in Ubuntu main yet https://launchpad.net/bugs/1892456
ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes)
DISTRIBUTOR_LOGO := /usr/share/pixmaps/ubuntu-logo-text.png
DISTRIBUTOR_LOGO_DARK := /usr/share/pixmaps/ubuntu-logo-text-dark.png
else
DISTRIBUTOR_LOGO := /usr/share/icons/vendor/scalable/emblems/emblem-vendor.svg
DISTRIBUTOR_LOGO_DARK := /usr/share/icons/vendor/scalable/emblems/emblem-vendor.svg
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x hppa powerpc ppc64 x32))
MALCONTENT := -Dmalcontent=true
else
MALCONTENT := -Dmalcontent=false
endif
endif
%:
dh $@
override_dh_auto_configure:
dh_auto_configure -- \
-Dlocation-services=enabled \
-Dprivileged_group=sudo \
-Ddocumentation=true \
-Ddistributor_logo=$(DISTRIBUTOR_LOGO) \
-Ddark_mode_distributor_logo=$(DISTRIBUTOR_LOGO_DARK) \
$(MALCONTENT)
# Ubuntu-specific
override_dh_translations:
dh_translations --domain=gnome-control-center-2.0
override_dh_gnome_clean:

1
debian/source/format vendored Normal file
View file

@ -0,0 +1 @@
3.0 (quilt)

4
debian/upstream/metadata vendored Normal file
View file

@ -0,0 +1,4 @@
Bug-Database: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues
Bug-Submit: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/new
Repository: https://gitlab.gnome.org/GNOME/gnome-control-center.git
Repository-Browse: https://gitlab.gnome.org/GNOME/gnome-control-center

4
debian/watch vendored Normal file
View file

@ -0,0 +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@