diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b4de394..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/debian/control b/debian/control index 6eaaaed..d2ea80e 100644 --- a/debian/control +++ b/debian/control @@ -3,31 +3,28 @@ Section: x11 Priority: optional Maintainer: Linux Mint Build-Depends: - debhelper (>= 11.1~), + debhelper-compat (= 13), dh-sequence-python3, - gnome-pkg-tools (>= 0.13), - intltool (>= 0.40.6), libcanberra-dev, libcinnamon-desktop-dev (>= 6.0), - libgl1-mesa-dev, + libgl-dev, libglib2.0-dev (>= 2.37.3), libgtk-3-dev (>= 3.0.0), libice-dev, - libjson-glib-dev (>= 0.10), + libpango1.0-dev, libsm-dev, libsystemd-dev [linux-any], - libupower-glib-dev (>= 0.99.11), libx11-dev, libxapp-dev (>= 1.0.4), libxau-dev, libxcomposite-dev, libxext-dev, libxrender-dev, - libxt-dev, libxtst-dev, meson, xtrans-dev, -Standards-Version: 3.9.6 +Standards-Version: 4.7.0 +Homepage: https://github.com/linuxmint/cinnamon-session Package: cinnamon-session Architecture: any @@ -35,6 +32,8 @@ Depends: cinnamon-desktop-data (>= 6.0), cinnamon-session-common (= ${source:Version}), default-dbus-session-bus | dbus-session-bus, + gir1.2-gdk-3.0, + gir1.2-gio-2.0, gir1.2-glib-2.0, gir1.2-gtk-3.0, gir1.2-xapp-1.0, @@ -46,8 +45,6 @@ Depends: ${python3:Depends}, ${shlibs:Depends}, Recommends: cinnamon-l10n -Breaks: cinnamon-session-common (<< 2.2.2-5~) -Replaces: cinnamon-session-common (<< 2.2.2-5~) Provides: x-session-manager Description: Cinnamon Session Manager - Minimal runtime The Cinnamon Session Manager is in charge of starting the core components diff --git a/debian/copyright b/debian/copyright index 48dacfb..f32aabb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,21 +4,26 @@ Upstream-Contact: Linux Mint Project Source: https://github.com/linuxmint/cinnamon-session Files: * - 1998-2012, Free Software Foundation, Inc +Copyright: 1998-2012, Free Software Foundation, Inc + 2002-2003, George Lebl + 2008, Lucas Rocha 2000, Miguel de Icaza - 2006-2011, Novell, Inc + 2006-2010, Novell, Inc + 2001, Queen of England + 2005, Raffaele Sandrini 2005-2012, Red Hat, Inc 2009-2010, Vincent Untz + 2007-2008, William Jon McCann License: GPL-2+ -Files: cinnamon-session/csm-inhibit-dialog.* - cinnamon-session/csm-store.* +Files: cinnamon-session/csm-store.* cinnamon-session/mdm-log.* cinnamon-session/mdm-signal-handler.h cinnamon-session/csm-consolekit.* cinnamon-session/csm-manager.h cinnamon-session/csm-xsmp-server.h cinnamon-session/csm-system.h + doc/dbus/spec-to-docbook.xsl Copyright: 2007-2008, William Jon McCann License: GPL-2+ @@ -41,95 +46,31 @@ Copyright: 2007, Novell, Inc 2008, William Jon McCann License: GPL-2+ -Files: cinnamon-session/csm-logout-dialog.c -Copyright: 2006, Vincent Untz - 2008, Red Hat, Inc -License: GPL-2+ - -Files: tools/cinnamon-session-quit.c -Copyright: 1998, Tom Tromey - 2008, Red Hat, Inc -License: GPL-2+ - Files: cinnamon-session/mdm-signal-handler.c Copyright: 2006, Red Hat, Inc 2007, William Jon McCann License: GPL-2+ -Files: cinnamon-session/csm-logout-dialog.h -Copyright: 2006, Vincent Untz -License: GPL-2+ - -Files: egg/* -Copyright: 2007, Novell, Inc -License: LGPL-2+ - -Files: egg/eggsmclient-xsmp.c -Copyright: 1998, Carsten Schaar, and twm - 1998, The Open Group - 2007, Novell, Inc -License: LGPL-2+ - -Files: egg/eggdesktopfile.c -Copyright: 1999-2000, Red Hat Inc - 2001, George Lebl - 2007, Novell, Inc -License: LGPL-2+ - -Files: po/Makefile.in.in -Copyright: 2004-2008, Rodney Dawes - 1995-1997, Ulrich Drepper -License: Permissive - Files: debian/* Copyright: 2013-2014, Linux Mint Project - 2014-2018, Debian Cinnamon Team + 2014-2026, Debian Cinnamon Team License: GPL-2+ -License: GPL - This file is distributed under the terms of GNU General Public License (GPL) - . - On Debian systems, the complete text of the GNU General Public License can be - found in `/usr/share/common-licenses/GPL'. - 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 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'. - -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. - . - 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. - . - 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'. - -License: Permissive - This file is free software; the Free Software Foundation gives - unlimited permission to copy and/or distribute it, with or without - modifications, as long as this notice is preserved. + version 2 can be found in /usr/share/common-licenses/GPL-2. diff --git a/debian/lrc.config b/debian/lrc.config new file mode 100644 index 0000000..0e20f50 --- /dev/null +++ b/debian/lrc.config @@ -0,0 +1,29 @@ +# licenserecon +# +# This file lists files and directories to be excluded from checking, +# to avoid false positives. +# +# Lines starting with # are treated as comments. +# Blank lines are ignored. +# Lines starting with minus sign(s) are treated as command line options +# +# Additional files may be excluded on a per package basis by creating an optional file +# debian/lrc.config in the package source. +# File names may include a partial path. +# Wildcards '*' not supported +# +# These files often contain licenses for other files. +# (File foo also treated as foo.*) +about +authors +copying +copyright +dep5 +readme + +# Directories identified by trailing slash / +# Entire contents will be (recursively) excluded. +debian/patches/ + +# contain a "generic" GPL but is really GPL-2+ like other files from the same author and year +doc/dbus/spec-to-docbook.xsl diff --git a/debian/rules b/debian/rules index d35d041..e387810 100755 --- a/debian/rules +++ b/debian/rules @@ -1,19 +1,14 @@ #!/usr/bin/make -f -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ override_dh_auto_configure: dh_auto_configure -- \ - --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/cinnamon-session \ -Dfrequent_warnings=true \ -Dipv6=true \ -Dxtrans=true -# --list-missing will be default in compat 12 -override_dh_missing: - dh_missing --list-missing -