From 25e3b3022a808d1dc18173991006e69179225479 Mon Sep 17 00:00:00 2001 From: Fabio Fantoni Date: Fri, 12 Jun 2026 19:47:16 +0200 Subject: [PATCH 1/9] debian/copyright: Sync with the Debian packaging The Debian package maintains an up-to-date per-file DEP-5 copyright analysis, while our copy had drifted (missing newer files like st-password-entry, stale stanzas for files that no longer exist, outdated copyright years). Replace the file with the Debian version. Differences kept from our side: the Files: debian/* stanza stays as before (Linux Mint Project, GPL-2+ instead of the Debian packaging team), and the proxygsettings.py stanza removed in 23f1d9ed9 stays removed, together with its now-unused GPL-3_SSLException license paragraph. Assisted-by: Claude Code (Fable 5) --- debian/copyright | 136 ++++++++++++++++------------------------------- 1 file changed, 46 insertions(+), 90 deletions(-) diff --git a/debian/copyright b/debian/copyright index b0e30acf48..bf1b4ab73e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,6 +13,7 @@ Copyright: 1989-1991, Free Software Foundation, Inc 1999-2001, Eazel, Inc 2001, George Lebl 2000, Helix Code, Inc + 2008, Iain Holmes 2006-2008, OpenedHand Ltd 2007-2011, Red Hat, Inc 2002, Sun Microsystems Inc @@ -88,11 +89,14 @@ Files: src/cinnamon-window-tracker.c src/st/st-icon.h src/st/st-label.c src/st/st-label.h + src/st/st-password-entry.c + src/st/st-password-entry.h src/st/st-private.c src/st/st-private.h src/st/st-scroll-bar.c src/st/st-scroll-bar.h src/st/st-scroll-view-fade.c + src/st/st-scroll-view-fade.glsl src/st/st-scroll-view-fade.h src/st/st-scroll-view.c src/st/st-scroll-view.h @@ -161,9 +165,12 @@ Copyright: 2010, Adel Gadllah 2009, Steve Frécinaux License: LGPL-2.1+ -Files: files/usr/share/cinnamon/cinnamon-menu-editor/cme/MainWindow.py +Files: src/cinnamon-secure-text-buffer.c + src/cinnamon-secure-text-buffer.h + files/usr/share/cinnamon/cinnamon-menu-editor/cme/MainWindow.py files/usr/share/cinnamon/cinnamon-menu-editor/cme/MenuEditor.py files/usr/share/cinnamon/cinnamon-menu-editor/cme/util.py + src/data-to-c.pl src/st/st-box-layout.c src/st/st-viewport.c src/tray/* @@ -173,10 +180,11 @@ Copyright: 2009, Abderrahim Kitouni 2010, Florian Muellner 2009, Intel Corporation 2006, OpenedHand - 2008-2010, Red Hat, Inc + 2008-2012, Red Hat, Inc 2006, Travis Watkins 2006, Travis Watkins, Heinrich Wendel 2003-2006, Vincent Untz + 2009, Stefan Walter License: LGPL-2+ Files: files/usr/share/cinnamon/cinnamon-settings/bin/capi.py @@ -189,46 +197,18 @@ Copyright: 2010, Red Hat, Inc 2008, litl, LLC License: Expat -Files: files/usr/share/cinnamon/cinnamon-settings/bin/tweenEquations.py -Copyright: 2001, Robert Penner - 2008, litl, LLC -License: BSD-3-clause - Files: debian/* Copyright: Linux Mint Project License: GPL-2+ -License: BSD-3-clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - . - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the author nor the names of contributors may be used - to endorse or promote products derived from this software without specific - prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - License: Expat + SPDX license expression "MIT": https://spdx.org/licenses/MIT.html + . 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 + 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 @@ -238,32 +218,35 @@ License: Expat 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. + 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: GPL-2+ - This package is free software; you can redistribute it and/or modify + SPDX "GPL-2.0-or-later": https://spdx.org/licenses/GPL-2.0-or-later.html + . + 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 package is distributed in the hope that it will be useful, + 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 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with this program. If not, see . . On Debian systems, the complete text of the GNU General Public License - version 2 can be found in `/usr/share/common-licenses/GPL-2'. + version 2 can be found in /usr/share/common-licenses/GPL-2. License: GPL-3+ + SPDX "GPL-3.0-or-later": https://spdx.org/licenses/GPL-3.0-or-later.html + . 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 + 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, @@ -272,57 +255,29 @@ License: GPL-3+ GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program. If not, see http://www.gnu.org/licenses/ - . - On Debian systems, the complete text of the GNU General Public License - version 3 can be found in `/usr/share/common-licenses/GPL-3. - -License: GPL-3_SSLException - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License version 3, as published - by the Free Software Foundation. - . - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranties of - MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License along - with this program. If not, see . - . - In addition, as a special exception, the copyright holders give - permission to link the code of portions of this program with the - OpenSSL library under certain conditions as described in each - individual source file, and distribute linked combinations - including the two. - You must obey the GNU General Public License in all respects - for all of the code used other than OpenSSL. If you modify - file(s) with this exception, you may extend this exception to your - version of the file(s), but you are not obligated to do so. If you - do not wish to do so, delete this exception statement from your - version. If you delete this exception statement from all source - files in the program, then also delete it here. + along with this program. If not, see . . - On Debian systems, the complete text of the GNU General Public License - version 3 can be found in `/usr/share/common-licenses/GPL-3. + On Debian systems, the complete text of the GNU General Public + License version 3 can be found in /usr/share/common-licenses/GPL-3. License: LGPL-2+ + SPDX "LGPL-2.0-or-later": https://spdx.org/licenses/LGPL-2.0-or-later.html + . 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 + the terms of the GNU Library 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. + FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for + more details. . - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street - Suite 500, Boston, MA 02110-1335, USA. + You should have received a copy of the GNU Library General Public License + along with this program. If not, see . . - On Debian systems, the complete text of the GNU Lesser General Public License - version 2 can be found in `/usr/share/common-licenses/LGPL-2'. + On Debian systems, the complete text of the GNU Library General Public License + version 2 can be found in /usr/share/common-licenses/LGPL-2. License: LGPL-2.1 This library is free software; you can redistribute it and/or @@ -334,14 +289,15 @@ License: LGPL-2.1 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. . - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . . On Debian systems, the complete text of the GNU Lesser General Public License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. License: LGPL-2.1+ + SPDX "LGPL-2.1-or-later": https://spdx.org/licenses/LGPL-2.1-or-later.html + . This program 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 @@ -356,4 +312,4 @@ License: LGPL-2.1+ along with this program. If not, see . . On Debian systems, the complete text of the GNU Lesser General Public License - version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. + version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1. From 8afc0df298e77fb36c8659ee81caf36773358e1f Mon Sep 17 00:00:00 2001 From: Fabio Fantoni Date: Fri, 12 Jun 2026 19:55:18 +0200 Subject: [PATCH 2/9] debian/control: Build-depend on libgl-dev instead of transitional libgl1-mesa-dev libgl1-mesa-dev is nowadays just a transitional package; libgl-dev is the real one shipping the GL development files (gl.pc, requested by meson via dependency('gl')). Verified available on Mint 22 (libgl-dev 1.7.0). The Debian packaging made the same change in 2023. Assisted-by: Claude Code (Fable 5) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 5724014190..5b9ac638c7 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: libdbus-1-dev, libgcr-3-dev, libgirepository1.0-dev (>= 1.29.15), - libgl1-mesa-dev, + libgl-dev, libglib2.0-dev (>= 2.52), libgstreamer1.0-dev, libgtk-3-dev (>= 3.9.12), From 547609cc6cd4ef15d6fd5fcfe57004c7fa208bf8 Mon Sep 17 00:00:00 2001 From: Fabio Fantoni Date: Fri, 12 Jun 2026 19:58:06 +0200 Subject: [PATCH 3/9] debian/control: Remove unused build dependencies librsvg2-dev, libgudev-1.0-dev and gir1.2-json-1.0 are not referenced anywhere: no meson dependency() requests them and there are no matching includes or imports in the sources. They are leftovers from old GNOME Shell-derived code dropped long ago; the Debian packaging already removed them in 2015. Verified on Mint 22: build dependency installation and meson configure both succeed without them. Assisted-by: Claude Code (Fable 5) --- debian/control | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/control b/debian/control index 5b9ac638c7..065960eee8 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Build-Depends: debhelper-compat (= 12), dh-python, dpkg-dev (>= 1.16.1~), - gir1.2-json-1.0, gobject-introspection (>= 1.29.15), gtk-doc-tools, libcinnamon-desktop-dev (>= 5.3), @@ -19,7 +18,6 @@ Build-Depends: libglib2.0-dev (>= 2.52), libgstreamer1.0-dev, libgtk-3-dev (>= 3.9.12), - libgudev-1.0-dev, libjson-glib-dev (>= 0.13.2), libmuffin-dev (>= 5.3), libnm-dev (>= 1.6) [linux-any], @@ -27,7 +25,6 @@ Build-Depends: libpam0g-dev, libpolkit-agent-1-dev (>= 0.100), libpulse-dev, - librsvg2-dev, libsecret-1-dev, libstartup-notification0-dev (>= 0.11), libxapp-dev (>= 2.6.0), From 5ecb6617a0a495f49a6f9564e658bc14a66cf334 Mon Sep 17 00:00:00 2001 From: Fabio Fantoni Date: Fri, 12 Jun 2026 19:59:29 +0200 Subject: [PATCH 4/9] debian/control: Drop versioned dpkg-dev build dependency dpkg-dev (>= 1.16.1~) dates back to the hardening flags work; every supported base ships a far newer dpkg-dev, and the build-essential toolchain guarantees it anyway. The Debian packaging dropped it in 2021 for the same reason. Assisted-by: Claude Code (Fable 5) --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 065960eee8..1ddd269377 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Linux Mint Build-Depends: debhelper-compat (= 12), dh-python, - dpkg-dev (>= 1.16.1~), gobject-introspection (>= 1.29.15), gtk-doc-tools, libcinnamon-desktop-dev (>= 5.3), From eee237a8e2d0734b041a1280b707409620c472ee Mon Sep 17 00:00:00 2001 From: Fabio Fantoni Date: Fri, 12 Jun 2026 20:03:24 +0200 Subject: [PATCH 5/9] debian/control: Fix dead Homepage URL projects.linuxmint.com no longer resolves at all, so the Homepage field pointed to a dead link. Point it to the GitHub repository, like the Debian packaging and our own debian/copyright Source field already do. Assisted-by: Claude Code (Fable 5) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 1ddd269377..81f1cd5040 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,7 @@ Build-Depends: pysassc, python3:any, Standards-Version: 3.9.5 -Homepage: https://projects.linuxmint.com/cinnamon/ +Homepage: https://github.com/linuxmint/cinnamon Package: cinnamon Architecture: any From 4f3eba0821d92c48722bef2967aec446fb033e1f Mon Sep 17 00:00:00 2001 From: Fabio Fantoni Date: Fri, 12 Jun 2026 20:18:55 +0200 Subject: [PATCH 6/9] debian/control: Remove devhelp from cinnamon-doc Depends devhelp will be removed from Debian and replaced by GNOME's manuals app. But this dependency is unnecessary anyway. Assisted-by: Claude Code (Fable 5) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 81f1cd5040..62f58d4f1b 100644 --- a/debian/control +++ b/debian/control @@ -169,7 +169,7 @@ Package: cinnamon-doc Section: doc Architecture: all Multi-Arch: foreign -Depends: devhelp, ${misc:Depends} +Depends: ${misc:Depends} Description: Cinnamon documentation Cinnamon is a modern Linux desktop which provides advanced innovative features and a traditional user experience. It's easy to use, powerful From 2368e808db379e1c60580e534a67a9314ed7601a Mon Sep 17 00:00:00 2001 From: Fabio Fantoni Date: Fri, 12 Jun 2026 20:22:44 +0200 Subject: [PATCH 7/9] debian: Use dh-sequence-gir and dh-sequence-python3 Activate the gir and python3 debhelper sequences through the dh-sequence-* virtual build dependencies instead of --with in debian/rules. dh-sequence-python3 is provided by dh-python (which it replaces in Build-Depends) and dh-sequence-gir by gobject-introspection, which is already there. Same change as the Debian packaging did in 2021. Verified on Mint 22 that both addons still activate (dh_girepository and dh_python3 are in the dh sequence). Assisted-by: Claude Code (Fable 5) --- debian/control | 3 ++- debian/rules | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 62f58d4f1b..096c1ab07a 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,8 @@ Priority: optional Maintainer: Linux Mint Build-Depends: debhelper-compat (= 12), - dh-python, + dh-sequence-gir, + dh-sequence-python3, gobject-introspection (>= 1.29.15), gtk-doc-tools, libcinnamon-desktop-dev (>= 5.3), diff --git a/debian/rules b/debian/rules index af66079feb..fb5e852765 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with gir,python3 + dh $@ override_dh_auto_configure: dh_auto_configure -- \ From ce69b6a30fea91cca3a73162838ab4652ec21709 Mon Sep 17 00:00:00 2001 From: Fabio Fantoni Date: Fri, 12 Jun 2026 20:31:01 +0200 Subject: [PATCH 8/9] debian/control: Remove dependency alternatives that no longer exist gir1.2-networkmanager-1.0 (the pre-libnm NetworkManager gir) and gnome-themes-standard (transitional package for gnome-themes-extra) are not available anymore on any supported base, so the alternatives are dead. The Debian packaging removed both in 2021. Assisted-by: Claude Code (Fable 5) --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 096c1ab07a..f6ed26796d 100644 --- a/debian/control +++ b/debian/control @@ -65,7 +65,7 @@ Depends: gir1.2-ical-3.0, gir1.2-keybinder-3.0, gir1.2-meta-muffin-0.0 (>= 5.3), - gir1.2-nm-1.0 [linux-any] | gir1.2-networkmanager-1.0 [linux-any], + gir1.2-nm-1.0 [linux-any], gir1.2-nma-1.0 [linux-any], gir1.2-notify-0.7, gir1.2-polkit-1.0, @@ -113,7 +113,7 @@ Depends: ${shlibs:Depends}, Recommends: gnome-terminal | x-terminal-emulator, - gnome-themes-extra | gnome-themes-standard, + gnome-themes-extra, gnome-online-accounts-gtk, touchegg, ibus, From 9b92973fc70063970fcbe22425da8b5faf22a993 Mon Sep 17 00:00:00 2001 From: Fabio Fantoni Date: Fri, 12 Jun 2026 20:32:34 +0200 Subject: [PATCH 9/9] debian/control: Remove never-filled ${icon-theme:Depends} substvar Nothing in the build fills this substitution variable (it comes from dh_gnome in gnome-pkg-tools, which we don't use), so it always expands to nothing and dpkg-gencontrol warns about it. The Debian packaging removed it back in 2012. Assisted-by: Claude Code (Fable 5) --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index f6ed26796d..8af6622111 100644 --- a/debian/control +++ b/debian/control @@ -107,7 +107,6 @@ Depends: xdg-desktop-portal-gtk, xdg-desktop-portal-xapp, ${gir:Depends}, - ${icon-theme:Depends}, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends},