Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cinnamon-menus for openSUSE:Factory checked in at 2022-12-06 14:23:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-menus (Old) and /work/SRC/openSUSE:Factory/.cinnamon-menus.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-menus" Tue Dec 6 14:23:30 2022 rev:18 rq:1040427 version:5.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-menus/cinnamon-menus.changes 2021-06-04 22:43:36.235131963 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon-menus.new.1835/cinnamon-menus.changes 2022-12-06 14:23:40.937783818 +0100 @@ -1,0 +2,8 @@ +Mon Dec 5 08:49:32 UTC 2022 - Dirk Müller <dmuel...@suse.com> + +- update to 5.6.0: + * Use github instead of circleci. + * Restore and update debian/ symbols file. + * update packaging (#53) + +------------------------------------------------------------------- Old: ---- cinnamon-menus-5.0.0.tar.gz New: ---- cinnamon-menus-5.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-menus.spec ++++++ --- /var/tmp/diff_new_pack.f7sfpo/_old 2022-12-06 14:23:41.397787740 +0100 +++ /var/tmp/diff_new_pack.f7sfpo/_new 2022-12-06 14:23:41.401787773 +0100 @@ -1,7 +1,7 @@ # # spec file for package cinnamon-menus # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define soname libcinnamon-menu-3 %define sover 0 Name: cinnamon-menus -Version: 5.0.0 +Version: 5.6.0 Release: 0 Summary: A menu system for the Cinnamon Desktop License: LGPL-2.1-or-later ++++++ cinnamon-menus-5.0.0.tar.gz -> cinnamon-menus-5.6.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/.circleci/config.yml new/cinnamon-menus-5.6.0/.circleci/config.yml --- old/cinnamon-menus-5.0.0/.circleci/config.yml 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/.circleci/config.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -version: 2.0 - -shared: &shared - - steps: - - - checkout - - - run: - name: Prepare environment - command: apt-get update - - - run: - name: Build project - command: mint-build -i - - - run: - name: Prepare packages - command: | - if [ -z $CI_PULL_REQUEST ]; then - mkdir /packages - mv /root/*.deb /packages/ - git log > /packages/git.log - cd / - tar zcvf packages.tar.gz packages - fi - - - run: - name: Deploy packages to Github - command: | - if [ -z $CI_PULL_REQUEST ]; then - wget https://github.com/tcnksm/ghr/releases/download/v0.5.4/ghr_v0.5.4_linux_amd64.zip - apt-get install --yes unzip - unzip ghr_v0.5.4_linux_amd64.zip - TAG="master".$CIRCLE_JOB - ./ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME -replace $TAG /packages.tar.gz - ./ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME -recreate -b "Latest unstable packages" $TAG /packages.tar.gz - fi - -jobs: - "mint20": - <<: *shared - docker: - - image: linuxmintd/mint20-amd64 - - "lmde4": - <<: *shared - docker: - - image: linuxmintd/lmde4-amd64 - -workflows: - version: 2 - build: - jobs: - - "mint20" - - "lmde4" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/.github/workflows/build.yml new/cinnamon-menus-5.6.0/.github/workflows/build.yml --- old/cinnamon-menus-5.0.0/.github/workflows/build.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/cinnamon-menus-5.6.0/.github/workflows/build.yml 2022-11-15 12:25:02.000000000 +0100 @@ -0,0 +1,20 @@ +name: Build + +on: + push: + branches: + - master + pull_request: + branches: + - master + workflow_dispatch: + +jobs: + build: + uses: linuxmint/github-actions/.github/workflows/do-builds.yml@master + with: + commit_id: master + ############################## Comma separated list - like 'linuxmint/xapp, linuxmint/cinnamon-desktop' + dependencies: + ############################## + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/.gitignore new/cinnamon-menus-5.6.0/.gitignore --- old/cinnamon-menus-5.0.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/cinnamon-menus-5.6.0/.gitignore 2022-11-15 12:25:02.000000000 +0100 @@ -0,0 +1,10 @@ +*.debhelper.log +debian/*.debhelper +debian/*.substvars +debian/debhelper-build-stamp +debian/files +debian/gir1.2-cmenu-3.0/ +debian/libcinnamon-menu-3-0-dbg/ +debian/libcinnamon-menu-3-0/ +debian/libcinnamon-menu-3-dev/ +debian/tmp/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/changelog new/cinnamon-menus-5.6.0/debian/changelog --- old/cinnamon-menus-5.0.0/debian/changelog 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/changelog 2022-11-15 12:25:02.000000000 +0100 @@ -1,3 +1,30 @@ +cinnamon-menus (5.6.0) vera; urgency=medium + + [ Rick Calixte ] + * Fix .gitignore for builds + + [ Michael Webster ] + * Use github instead of circleci. + + -- Clement Lefebvre <r...@linuxmint.com> Tue, 15 Nov 2022 11:24:43 +0000 + +cinnamon-menus (5.4.0) vanessa; urgency=medium + + [ Clement Lefebvre ] + * CI: Update targets + + [ Michael Webster ] + * Restore and update debian/ symbols file. + + -- Clement Lefebvre <r...@linuxmint.com> Fri, 10 Jun 2022 15:04:14 +0200 + +cinnamon-menus (5.2.0) una; urgency=medium + + [ Oliver Kästner ] + * update packaging (#53) + + -- Clement Lefebvre <r...@linuxmint.com> Mon, 15 Nov 2021 13:12:04 +0000 + cinnamon-menus (5.0.0) uma; urgency=medium * 5.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/compat new/cinnamon-menus-5.6.0/debian/compat --- old/cinnamon-menus-5.0.0/debian/compat 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/control new/cinnamon-menus-5.6.0/debian/control --- old/cinnamon-menus-5.0.0/debian/control 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/control 2022-11-15 12:25:02.000000000 +0100 @@ -2,22 +2,19 @@ Section: x11 Priority: optional Maintainer: Clement Lefebvre <r...@linuxmint.com> -Build-Depends: debhelper (>= 9), - meson, - dh-python, - gnome-common, - gnome-pkg-tools, - gobject-introspection (>= 0.9.12-4~), +Build-Depends: debhelper-compat (= 12), + dh-sequence-gir, + gobject-introspection (>= 1.58.3-2), gtk-doc-tools (>= 1.4), - intltool (>= 0.40.0), - libgirepository1.0-dev (>= 0.10.7-1~), + libgirepository1.0-dev (>= 1.58.3-2), libglib2.0-dev (>= 2.30.0), - python3 (>= 3.1) -Standards-Version: 3.9.5 -X-Python3-Version: >= 3.1 + meson +Standards-Version: 4.5.0 Package: libcinnamon-menu-3-0 Architecture: any +Section: libs +Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends} Description: Cinnamon implementation of the freedesktop menu specification The package contains an implementation of the draft @@ -29,7 +26,7 @@ Package: libcinnamon-menu-3-0-dbg Section: debug -Priority: extra +Priority: optional Architecture: any Depends: libcinnamon-menu-3-0 (= ${binary:Version}), ${misc:Depends} Description: Cinnamon implementation of the freedesktop menu specification @@ -43,11 +40,11 @@ Package: libcinnamon-menu-3-dev Architecture: any Section: libdevel +Priority: optional Depends: gir1.2-cmenu-3.0 (= ${binary:Version}), libcinnamon-menu-3-0 (= ${binary:Version}), libglib2.0-dev (>= 2.30.0), ${misc:Depends} -Replaces: gir-repository-dev (<< 0.6.5-6) Description: Cinnamon implementation of the freedesktop menu specification The package contains an implementation of the draft "Desktop Menu Specification" from freedesktop.org: @@ -58,9 +55,9 @@ Package: gir1.2-cmenu-3.0 Section: introspection +Priority: optional Architecture: any -Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends} -Conflicts: gobject-introspection-repository +Depends: ${gir:Depends}, ${misc:Depends} Description: GObject introspection data for the Cinnamon menu library This package contains introspection data for Cinnamon menu, an implementation of the desktop menu specification from freedesktop.org. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/copyright new/cinnamon-menus-5.6.0/debian/copyright --- old/cinnamon-menus-5.0.0/debian/copyright 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/copyright 2022-11-15 12:25:02.000000000 +0100 @@ -41,33 +41,6 @@ 2008, Vincent Untz License: LGPL-2+ -Files: ltmain.sh -Copyright: 1996-2011, Free Software Foundation, Inc. -License: GPL-2+ or license of distributed software - GNU Libtool 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. - . - As a special exception to the GNU General Public License, - if you distribute this file as part of a program or library that - is built using GNU Libtool, you may include this file under the - same distribution terms that you use for the rest of that program. - . - GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy - can be downloaded from http://www.gnu.org/licenses/gpl.html, - or obtained by writing to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - . - On Debian systems, the complete text of the GNU General Public License - version 2 can be found in `/usr/share/common-licenses/GPL-2'. - Files: debian/* Copyright: 2014, Clement Lefebvre 2014, Maximiliano Curia <m...@debian.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/gir1.2-cmenu-3.0.install new/cinnamon-menus-5.6.0/debian/gir1.2-cmenu-3.0.install --- old/cinnamon-menus-5.0.0/debian/gir1.2-cmenu-3.0.install 1970-01-01 01:00:00.000000000 +0100 +++ new/cinnamon-menus-5.6.0/debian/gir1.2-cmenu-3.0.install 2022-11-15 12:25:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/girepository-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/gir1.2-cmenu-3.0.install.in new/cinnamon-menus-5.6.0/debian/gir1.2-cmenu-3.0.install.in --- old/cinnamon-menus-5.0.0/debian/gir1.2-cmenu-3.0.install.in 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/gir1.2-cmenu-3.0.install.in 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -TYPELIBDIR/girepository-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/libcinnamon-menu-3-0.symbols new/cinnamon-menus-5.6.0/debian/libcinnamon-menu-3-0.symbols --- old/cinnamon-menus-5.0.0/debian/libcinnamon-menu-3-0.symbols 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/libcinnamon-menu-3-0.symbols 2022-11-15 12:25:02.000000000 +0100 @@ -1,4 +1,72 @@ libcinnamon-menu-3.so.0 libcinnamon-menu-3-0 #MINVER# + _entry_directory_list_compare@Base 4.8.3 + _entry_directory_list_empty_desktop_cache@Base 4.8.3 + _entry_directory_list_get_all_desktops@Base 4.8.3 + desktop_entry_copy@Base 4.8.3 + desktop_entry_get_app_info@Base 4.8.3 + desktop_entry_get_basename@Base 4.8.3 + desktop_entry_get_comment@Base 4.8.3 + desktop_entry_get_generic_name@Base 4.8.3 + desktop_entry_get_hidden@Base 4.8.3 + desktop_entry_get_icon@Base 4.8.3 + desktop_entry_get_id@Base 4.8.3 + desktop_entry_get_name@Base 4.8.3 + desktop_entry_get_no_display@Base 4.8.3 + desktop_entry_get_path@Base 4.8.3 + desktop_entry_get_show_in@Base 4.8.3 + desktop_entry_get_type@Base 4.8.3 + desktop_entry_has_categories@Base 4.8.3 + desktop_entry_has_category@Base 4.8.3 + desktop_entry_new@Base 4.8.3 + desktop_entry_ref@Base 4.8.3 + desktop_entry_reload@Base 4.8.3 + desktop_entry_set_add_entry@Base 4.8.3 + desktop_entry_set_foreach@Base 4.8.3 + desktop_entry_set_get_count@Base 4.8.3 + desktop_entry_set_intersection@Base 4.8.3 + desktop_entry_set_lookup@Base 4.8.3 + desktop_entry_set_new@Base 4.8.3 + desktop_entry_set_ref@Base 4.8.3 + desktop_entry_set_subtract@Base 4.8.3 + desktop_entry_set_swap_contents@Base 4.8.3 + desktop_entry_set_union@Base 4.8.3 + desktop_entry_set_unref@Base 4.8.3 + desktop_entry_unref@Base 4.8.3 + entry_directory_get_flat_contents@Base 4.8.3 + entry_directory_list_add_monitors@Base 4.8.3 + entry_directory_list_append_list@Base 4.8.3 + entry_directory_list_get_directory@Base 4.8.3 + entry_directory_list_get_length@Base 4.8.3 + entry_directory_list_new@Base 4.8.3 + entry_directory_list_prepend@Base 4.8.3 + entry_directory_list_ref@Base 4.8.3 + entry_directory_list_remove_monitors@Base 4.8.3 + entry_directory_list_unref@Base 4.8.3 + entry_directory_new@Base 4.8.3 + entry_directory_ref@Base 4.8.3 + entry_directory_unref@Base 4.8.3 + gmenu_desktopappinfo_get_action_name@Base 4.8.3 + gmenu_desktopappinfo_get_boolean@Base 4.8.3 + gmenu_desktopappinfo_get_categories@Base 4.8.3 + gmenu_desktopappinfo_get_filename@Base 4.8.3 + gmenu_desktopappinfo_get_flatpak_app_id@Base 4.8.3 + gmenu_desktopappinfo_get_generic_name@Base 4.8.3 + gmenu_desktopappinfo_get_is_flatpak@Base 4.8.3 + gmenu_desktopappinfo_get_is_hidden@Base 4.8.3 + gmenu_desktopappinfo_get_keywords@Base 4.8.3 + gmenu_desktopappinfo_get_locale_string@Base 4.8.3 + gmenu_desktopappinfo_get_nodisplay@Base 4.8.3 + gmenu_desktopappinfo_get_show_in@Base 4.8.3 + gmenu_desktopappinfo_get_startup_wm_class@Base 4.8.3 + gmenu_desktopappinfo_get_string@Base 4.8.3 + gmenu_desktopappinfo_get_type@Base 4.8.3 + gmenu_desktopappinfo_has_key@Base 4.8.3 + gmenu_desktopappinfo_launch_action@Base 4.8.3 + gmenu_desktopappinfo_launch_uris_as_manager@Base 4.8.3 + gmenu_desktopappinfo_list_actions@Base 4.8.3 + gmenu_desktopappinfo_new@Base 4.8.3 + gmenu_desktopappinfo_new_from_filename@Base 4.8.3 + gmenu_desktopappinfo_new_from_keyfile@Base 4.8.3 gmenu_tree_alias_get_aliased_directory@Base 2.2.0 gmenu_tree_alias_get_aliased_entry@Base 2.2.0 gmenu_tree_alias_get_aliased_item_type@Base 2.2.0 @@ -22,6 +90,7 @@ gmenu_tree_entry_get_desktop_file_id@Base 2.2.0 gmenu_tree_entry_get_desktop_file_path@Base 2.2.0 gmenu_tree_entry_get_is_excluded@Base 2.2.0 + gmenu_tree_entry_get_is_flatpak@Base 4.8.3 gmenu_tree_entry_get_is_nodisplay_recurse@Base 2.2.0 gmenu_tree_entry_get_is_unallocated@Base 2.2.0 gmenu_tree_entry_get_parent@Base 2.2.0 @@ -54,3 +123,45 @@ gmenu_tree_separator_get_parent@Base 2.2.0 gmenu_tree_separator_get_tree@Base 2.2.0 gmenu_tree_separator_get_type@Base 2.2.0 + menu_debug_print_layout@Base 4.8.3 + menu_get_directory_monitor@Base 4.8.3 + menu_get_file_monitor@Base 4.8.3 + menu_layout_load@Base 4.8.3 + menu_layout_node_append_child@Base 4.8.3 + menu_layout_node_default_layout_get_values@Base 4.8.3 + menu_layout_node_get_children@Base 4.8.3 + menu_layout_node_get_content@Base 4.8.3 + menu_layout_node_get_content_as_path@Base 4.8.3 + menu_layout_node_get_next@Base 4.8.3 + menu_layout_node_get_parent@Base 4.8.3 + menu_layout_node_get_root@Base 4.8.3 + menu_layout_node_get_type@Base 4.8.3 + menu_layout_node_insert_after@Base 4.8.3 + menu_layout_node_insert_before@Base 4.8.3 + menu_layout_node_legacy_dir_get_prefix@Base 4.8.3 + menu_layout_node_legacy_dir_set_prefix@Base 4.8.3 + menu_layout_node_menu_get_app_dirs@Base 4.8.3 + menu_layout_node_menu_get_directory_dirs@Base 4.8.3 + menu_layout_node_menu_get_name@Base 4.8.3 + menu_layout_node_menuname_get_values@Base 4.8.3 + menu_layout_node_merge_file_get_type@Base 4.8.3 + menu_layout_node_merge_file_set_type@Base 4.8.3 + menu_layout_node_merge_get_type@Base 4.8.3 + menu_layout_node_move_get_new@Base 4.8.3 + menu_layout_node_move_get_old@Base 4.8.3 + menu_layout_node_new@Base 4.8.3 + menu_layout_node_prepend_child@Base 4.8.3 + menu_layout_node_ref@Base 4.8.3 + menu_layout_node_root_add_entries_monitor@Base 4.8.3 + menu_layout_node_root_get_basedir@Base 4.8.3 + menu_layout_node_root_get_name@Base 4.8.3 + menu_layout_node_root_remove_entries_monitor@Base 4.8.3 + menu_layout_node_set_content@Base 4.8.3 + menu_layout_node_steal@Base 4.8.3 + menu_layout_node_unlink@Base 4.8.3 + menu_layout_node_unref@Base 4.8.3 + menu_monitor_add_notify@Base 4.8.3 + menu_monitor_ref@Base 4.8.3 + menu_monitor_remove_notify@Base 4.8.3 + menu_monitor_unref@Base 4.8.3 + menu_verbose@Base 4.8.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/patches/01_default_prefix.patch new/cinnamon-menus-5.6.0/debian/patches/01_default_prefix.patch --- old/cinnamon-menus-5.0.0/debian/patches/01_default_prefix.patch 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/patches/01_default_prefix.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ ---- a/libmenu/gmenu-tree.c -+++ b/libmenu/gmenu-tree.c -@@ -391,6 +391,16 @@ - } - } - -+static char * -+prefix_menu_name (const char *orig_name) -+{ -+ char *prefix; -+ prefix = g_getenv ("XDG_MENU_PREFIX"); -+ if (prefix == NULL) -+ prefix = "gnome-"; -+ return g_strconcat (prefix, orig_name, NULL); -+} -+ - static gboolean - gmenu_tree_canonicalize_path (GMenuTree *tree, - GError **error) -@@ -416,6 +426,9 @@ - menu_file = tree->basename; - xdg_menu_prefix = g_getenv ("XDG_MENU_PREFIX"); - -+ if (xdg_menu_prefix == NULL) -+ xdg_menu_prefix = "gnome-"; -+ - if (xdg_menu_prefix != NULL) - { - gchar *prefixed_basename; -@@ -2077,13 +2090,10 @@ - found = FALSE; - menu_file = g_strconcat (menu_name, ".menu", NULL); - -- if (strcmp (menu_file, "applications.menu") == 0 && -- g_getenv ("XDG_MENU_PREFIX")) -+ if (strcmp (menu_file, "applications.menu") == 0) - { - char *prefixed_basename; -- prefixed_basename = g_strdup_printf ("%s%s", -- g_getenv ("XDG_MENU_PREFIX"), -- menu_file); -+ prefixed_basename = prefix_menu_name (menu_file); - found = load_parent_merge_file_from_basename (tree, loaded_menu_files, - layout, prefixed_basename, - canonical_basedir); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/patches/02_kill_debian_menu.patch new/cinnamon-menus-5.6.0/debian/patches/02_kill_debian_menu.patch --- old/cinnamon-menus-5.0.0/debian/patches/02_kill_debian_menu.patch 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/patches/02_kill_debian_menu.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -Index: gnome-menus-3.4.2/libmenu/desktop-entries.c -=================================================================== ---- gnome-menus-3.4.2.orig/libmenu/desktop-entries.c 2011-10-24 13:48:12.000000000 +0200 -+++ gnome-menus-3.4.2/libmenu/desktop-entries.c 2013-01-02 21:11:23.617525227 +0100 -@@ -250,6 +250,8 @@ desktop_entry_load_directory (DesktopEnt - static gboolean - desktop_entry_load (DesktopEntry *entry) - { -+ if (strstr (entry->path, "/menu-xdg/")) -+ return FALSE; - if (entry->type == DESKTOP_ENTRY_DESKTOP) - { - DesktopEntryDesktop *entry_desktop = (DesktopEntryDesktop*)entry; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/patches/03_kde-legacydirs.patch new/cinnamon-menus-5.6.0/debian/patches/03_kde-legacydirs.patch --- old/cinnamon-menus-5.0.0/debian/patches/03_kde-legacydirs.patch 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/patches/03_kde-legacydirs.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- a/layout/gnome-applications.menu -+++ b/layout/gnome-applications.menu -@@ -7,7 +7,6 @@ - <Directory>X-GNOME-Menu-Applications.directory</Directory> - - <!-- Scan legacy dirs first, as later items take priority --> -- <KDELegacyDirs/> - <LegacyDir>/etc/X11/applnk</LegacyDir> - <LegacyDir>/usr/share/gnome/apps</LegacyDir> - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/patches/08_settings-menus.patch new/cinnamon-menus-5.6.0/debian/patches/08_settings-menus.patch --- old/cinnamon-menus-5.0.0/debian/patches/08_settings-menus.patch 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/patches/08_settings-menus.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,123 +0,0 @@ -Index: gnome-menus-3.8.0/layout/gnome-applications.menu -=================================================================== ---- gnome-menus-3.8.0.orig/layout/gnome-applications.menu 2013-06-14 15:48:17.509604188 -0400 -+++ gnome-menus-3.8.0/layout/gnome-applications.menu 2013-06-14 15:57:09.689581931 -0400 -@@ -233,6 +233,118 @@ - <Not><Filename>gnome-system-monitor.desktop</Filename></Not> - </And> - </Include> -+ <Menu> -+ <Name>Preferences</Name> -+ <Directory>Settings.directory</Directory> -+ <Include> -+ <And> -+ <Category>Settings</Category> -+ <Not> -+ <Or> -+ <Category>System</Category> -+ <Category>X-GNOME-Settings-Panel</Category> -+ <Filename>alacarte.desktop</Filename> -+ <Filename>caribou.desktop</Filename> -+ <Filename>dconf-editor.desktop</Filename> -+ <Filename>fedora-im-chooser.desktop</Filename> -+ <Filename>fedora-release-notes.desktop</Filename> -+ <Filename>firewall-config.desktop</Filename> -+ <Filename>flash-player-properties.desktop</Filename> -+ <Filename>gconf-editor.desktop</Filename> -+ <Filename>gnome-abrt.desktop</Filename> -+ <Filename>fedora-abrt.desktop</Filename> -+ <Filename>gnome-orca.desktop</Filename> -+ <Filename>gnome-power-statistics.desktop</Filename> -+ <Filename>gnome-user-share-properties.desktop</Filename> -+ <Filename>ibus.desktop</Filename> -+ <Filename>ibus-daemon.desktop</Filename> -+ <Filename>ibus-setup-anthy.desktop</Filename> -+ <Filename>ibus-setup.desktop</Filename> -+ <Filename>ibus-setup-hangul.desktop</Filename> -+ <Filename>ibus-setup-libbopomofo.desktop</Filename> -+ <Filename>ibus-setup-libpinyin.desktop</Filename> -+ <Filename>ibus-setup-m17n.desktop</Filename> -+ <Filename>ibus-setup-typing-booster.desktop</Filename> -+ <Filename>im-chooser.desktop</Filename> -+ <Filename>itweb-settings.desktop</Filename> -+ <Filename>jhbuild.desktop</Filename> -+ <Filename>javaws.desktop</Filename> -+ <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename> -+ <Filename>java-1.7.0-openjdk-policytool.desktop</Filename> -+ <Filename>log4j-chainsaw.desktop</Filename> -+ <Filename>log4j-logfactor5.desktop</Filename> -+ <Filename>nm-connection-editor.desktop</Filename> -+ <Filename>orca.desktop</Filename> -+ <Filename>setroubleshoot.desktop</Filename> -+ <Filename>authconfig.desktop</Filename> -+ <Filename>system-config-date.desktop</Filename> -+ <Filename>system-config-firewall.desktop</Filename> -+ <Filename>system-config-keyboard.desktop</Filename> -+ <Filename>system-config-language.desktop</Filename> -+ <Filename>system-config-printer.desktop</Filename> -+ <Filename>system-config-users.desktop</Filename> -+ <Filename>vino-preferences.desktop</Filename> -+ </Or> -+ </Not> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Administration</Name> -+ <Directory>Settings-System.directory</Directory> -+ <Include> -+ <And> -+ <Category>Settings</Category> -+ <Category>System</Category> -+ <Not> -+ <Or> -+ <Category>X-GNOME-Settings-Panel</Category> -+ <Filename>alacarte.desktop</Filename> -+ <Filename>caribou.desktop</Filename> -+ <Filename>dconf-editor.desktop</Filename> -+ <Filename>fedora-im-chooser.desktop</Filename> -+ <Filename>fedora-release-notes.desktop</Filename> -+ <Filename>firewall-config.desktop</Filename> -+ <Filename>flash-player-properties.desktop</Filename> -+ <Filename>gconf-editor.desktop</Filename> -+ <Filename>gnome-abrt.desktop</Filename> -+ <Filename>fedora-abrt.desktop</Filename> -+ <Filename>gnome-orca.desktop</Filename> -+ <Filename>gnome-power-statistics.desktop</Filename> -+ <Filename>gnome-user-share-properties.desktop</Filename> -+ <Filename>ibus.desktop</Filename> -+ <Filename>ibus-daemon.desktop</Filename> -+ <Filename>ibus-setup-anthy.desktop</Filename> -+ <Filename>ibus-setup.desktop</Filename> -+ <Filename>ibus-setup-hangul.desktop</Filename> -+ <Filename>ibus-setup-libbopomofo.desktop</Filename> -+ <Filename>ibus-setup-libpinyin.desktop</Filename> -+ <Filename>ibus-setup-m17n.desktop</Filename> -+ <Filename>ibus-setup-typing-booster.desktop</Filename> -+ <Filename>im-chooser.desktop</Filename> -+ <Filename>itweb-settings.desktop</Filename> -+ <Filename>jhbuild.desktop</Filename> -+ <Filename>javaws.desktop</Filename> -+ <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename> -+ <Filename>java-1.7.0-openjdk-policytool.desktop</Filename> -+ <Filename>log4j-chainsaw.desktop</Filename> -+ <Filename>log4j-logfactor5.desktop</Filename> -+ <Filename>nm-connection-editor.desktop</Filename> -+ <Filename>orca.desktop</Filename> -+ <Filename>setroubleshoot.desktop</Filename> -+ <Filename>authconfig.desktop</Filename> -+ <Filename>system-config-date.desktop</Filename> -+ <Filename>system-config-firewall.desktop</Filename> -+ <Filename>system-config-keyboard.desktop</Filename> -+ <Filename>system-config-language.desktop</Filename> -+ <Filename>system-config-printer.desktop</Filename> -+ <Filename>system-config-users.desktop</Filename> -+ <Filename>vino-preferences.desktop</Filename> -+ </Or> -+ </Not> -+ </And> -+ </Include> -+ </Menu> - </Menu> <!-- End System Tools --> - - <!-- System Settings --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/patches/09_app_install_entry.patch new/cinnamon-menus-5.6.0/debian/patches/09_app_install_entry.patch --- old/cinnamon-menus-5.0.0/debian/patches/09_app_install_entry.patch 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/patches/09_app_install_entry.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -Description: Include Software Center in menus - -Index: gnome-menus-3.8.0/layout/gnome-applications.menu -=================================================================== ---- gnome-menus-3.8.0.orig/layout/gnome-applications.menu 2013-06-04 18:22:04.293014377 -0400 -+++ gnome-menus-3.8.0/layout/gnome-applications.menu 2013-06-04 18:22:04.293014377 -0400 -@@ -325,4 +325,16 @@ - <Merge type="files" /> - </Layout> - -+<Include> -+ <Filename>ubuntu-software-center.desktop</Filename> -+</Include> -+ -+<!-- Separator between menus and gnome-app-install --> -+<Layout> -+ <Merge type="menus"/> -+ <Merge type="files"/> -+ <Separator/> -+ <Filename>ubuntu-software-center.desktop</Filename> -+</Layout> -+ - </Menu> <!-- End Applications --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/patches/09_games-menu.patch new/cinnamon-menus-5.6.0/debian/patches/09_games-menu.patch --- old/cinnamon-menus-5.0.0/debian/patches/09_games-menu.patch 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/patches/09_games-menu.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,120 +0,0 @@ ---- a/layout/gnome-applications.menu -+++ b/layout/gnome-applications.menu -@@ -99,8 +99,107 @@ - <Include> - <And> - <Category>Game</Category> -- </And> -- </Include> -+ <Not><Category>ActionGame</Category></Not> -+ <Not><Category>AdventureGame</Category></Not> -+ <Not><Category>ArcadeGame</Category></Not> -+ <Not><Category>BoardGame</Category></Not> -+ <Not><Category>BlocksGame</Category></Not> -+ <Not><Category>CardGame</Category></Not> -+ <Not><Category>KidsGame</Category></Not> -+ <Not><Category>LogicGame</Category></Not> -+ <Not><Category>Simulation</Category></Not> -+ <Not><Category>SportsGame</Category></Not> -+ <Not><Category>StrategyGame</Category></Not> -+ </And> -+ </Include> -+ <DefaultLayout inline="true" inline_limit="6" inline_header="false"> -+ <Merge type="menus"/> -+ <Merge type="files"/> -+ </DefaultLayout> -+ <Menu> -+ <Name>Action</Name> -+ <Directory>ActionGames.directory</Directory> -+ <Include> -+ <Category>ActionGame</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Adventure</Name> -+ <Directory>AdventureGames.directory</Directory> -+ <Include> -+ <Category>AdventureGame</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Arcade</Name> -+ <Directory>ArcadeGames.directory</Directory> -+ <Include> -+ <Category>ArcadeGame</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Board</Name> -+ <Directory>BoardGames.directory</Directory> -+ <Include> -+ <Category>BoardGame</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Blocks</Name> -+ <Directory>BlocksGames.directory</Directory> -+ <Include> -+ <Category>BlocksGame</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Cards</Name> -+ <Directory>CardGames.directory</Directory> -+ <Include> -+ <Category>CardGame</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Kids</Name> -+ <Directory>KidsGames.directory</Directory> -+ <Include> -+ <Category>KidsGame</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Logic</Name> -+ <Directory>LogicGames.directory</Directory> -+ <Include> -+ <Category>LogicGame</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Role Playing</Name> -+ <Directory>RolePlayingGames.directory</Directory> -+ <Include> -+ <Category>RolePlaying</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Simulation</Name> -+ <Directory>SimulationGames.directory</Directory> -+ <Include> -+ <Category>Simulation</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Sports</Name> -+ <Directory>SportsGames.directory</Directory> -+ <Include> -+ <Category>SportsGame</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Strategy</Name> -+ <Directory>StrategyGames.directory</Directory> -+ <Include> -+ <Category>StrategyGame</Category> -+ </Include> -+ </Menu> - </Menu> <!-- End Games --> - - <!-- Graphics --> -@@ -223,6 +322,7 @@ - <And> - <Category>System</Category> - <Not><Category>Settings</Category></Not> -+ <Not><Category>Game</Category></Not> - <Not><Filename>baobab.desktop</Filename></Not> - <Not><Filename>gnome-system-log.desktop</Filename></Not> - <Not><Filename>gnome-system-monitor.desktop</Filename></Not> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/patches/11_science-menu.patch new/cinnamon-menus-5.6.0/debian/patches/11_science-menu.patch --- old/cinnamon-menus-5.0.0/debian/patches/11_science-menu.patch 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/patches/11_science-menu.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ ---- a/layout/gnome-applications.menu -+++ b/layout/gnome-applications.menu -@@ -88,10 +88,23 @@ - <Include> - <And> - <Category>Education</Category> -+ <Not><Category>Science</Category></Not> - </And> - </Include> - </Menu> <!-- End Education --> - -+ <!-- Science --> -+ <Menu> -+ <Name>Science</Name> -+ <Directory>GnomeScience.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Category>Science</Category> -+ </And> -+ </Include> -+ </Menu> <!-- End Science --> -+ - <!-- Games --> - <Menu> - <Name>Games</Name> ---- a/desktop-directories/Education.directory.in -+++ b/desktop-directories/Education.directory.in -@@ -1,4 +1,4 @@ - [Desktop Entry] - _Name=Education --Icon=applications-science -+Icon=applications-accessories - Type=Directory ---- a/desktop-directories/Utility.directory.in -+++ b/desktop-directories/Utility.directory.in -@@ -1,5 +1,5 @@ - [Desktop Entry] - _Name=Accessories - _Comment=Desktop accessories --Icon=applications-accessories -+Icon=applications-utilities - Type=Directory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/patches/20_show-admin-tools-for-admin-group.patch new/cinnamon-menus-5.6.0/debian/patches/20_show-admin-tools-for-admin-group.patch --- old/cinnamon-menus-5.0.0/debian/patches/20_show-admin-tools-for-admin-group.patch 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/patches/20_show-admin-tools-for-admin-group.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,218 +0,0 @@ ---- gnome-menus-2.19.6.orig/libmenu/desktop-entries.c 2007-07-30 22:06:51.000000000 +0200 -+++ gnome-menus-2.19.6/libmenu/desktop-entries.c 2007-08-03 11:38:29.000000000 +0200 -@@ -24,6 +24,7 @@ - #include <string.h> - - #include "menu-util.h" -+#include "user-is-sudoer.h" - - #define DESKTOP_ENTRY_GROUP "Desktop Entry" - #define KDE_DESKTOP_ENTRY_GROUP "KDE Desktop Entry" -@@ -33,7 +34,8 @@ - DESKTOP_ENTRY_NO_DISPLAY = 1 << 0, - DESKTOP_ENTRY_HIDDEN = 1 << 1, - DESKTOP_ENTRY_SHOW_IN_GNOME = 1 << 2, -- DESKTOP_ENTRY_TRYEXEC_FAILED = 1 << 3 -+ DESKTOP_ENTRY_TRYEXEC_FAILED = 1 << 3, -+ DESKTOP_ENTRY_ROOT_REQUIRED = 1 << 4 - }; - - struct DesktopEntry -@@ -50,7 +52,7 @@ - gboolean terminal; - - guint type : 2; -- guint flags : 4; -+ guint flags : 5; - guint refcount : 24; - }; - -@@ -75,9 +77,20 @@ - gboolean hidden; - gboolean show_in_gnome; - gboolean tryexec_failed; -+ gboolean root_required_flag; - char *tryexec; - guint flags; - int i; -+ -+ static gboolean sudoer_flag_set = FALSE; -+ static gboolean sudoer_flag = TRUE; -+ -+ /* If we don't know yet whether the user is sudoer or not, let's see */ -+ if (!sudoer_flag_set) -+ { -+ sudoer_flag = user_is_sudoer (); -+ sudoer_flag_set = TRUE; -+ } - - error = NULL; - no_display = g_key_file_get_boolean (key_file, -@@ -157,6 +170,47 @@ - g_free (tryexec); - } - -+ error = NULL; -+ root_required_flag = g_key_file_get_boolean (key_file, -+ desktop_entry_group, -+ "X-KDE-SubstituteUID", -+ &error); -+ -+ if (error) -+ { -+ root_required_flag = FALSE; -+ g_error_free (error); -+ } -+ else { -+ if (root_required_flag) { -+ char *username = NULL; -+ username = g_key_file_get_value (key_file, -+ desktop_entry_group, -+ "X-KDE-Username", -+ NULL); -+ -+ if (!username || (username && !strcmp (username, "root"))) -+ root_required_flag = TRUE; -+ else -+ root_required_flag = FALSE; -+ g_free (username); -+ } -+ else -+ root_required_flag = FALSE; -+ } -+ -+ /* -+ * If the desktop entry has the field and indeed requires root -+ * privilege and the user isn't sudoer, then the entry needs to be -+ * hidden. -+ */ -+ -+ if (root_required_flag -+ && (!sudoer_flag)) -+ { -+ no_display = TRUE; -+ } -+ - flags = 0; - if (no_display) - flags |= DESKTOP_ENTRY_NO_DISPLAY; -@@ -166,6 +220,8 @@ - flags |= DESKTOP_ENTRY_SHOW_IN_GNOME; - if (tryexec_failed) - flags |= DESKTOP_ENTRY_TRYEXEC_FAILED; -+ if (root_required_flag) -+ flags |= DESKTOP_ENTRY_ROOT_REQUIRED; - - return flags; - } -@@ -297,13 +353,14 @@ - - #undef GET_LOCALE_STRING - -- menu_verbose ("Desktop entry \"%s\" (%s, %s, %s) flags: NoDisplay=%s, Hidden=%s, ShowInGNOME=%s, TryExecFailed=%s\n", -+ menu_verbose ("Desktop entry \"%s\" (%s, %s, %s) flags: NoDisplay=%s, Hidden=%s, RootRequired: %s, ShowInGNOME=%s, TryExecFailed=%s\n", - retval->basename, - retval->name, - retval->comment ? retval->comment : "(null)", - retval->icon ? retval->icon : "(null)", - retval->flags & DESKTOP_ENTRY_NO_DISPLAY ? "(true)" : "(false)", - retval->flags & DESKTOP_ENTRY_HIDDEN ? "(true)" : "(false)", -+ retval->flags & DESKTOP_ENTRY_ROOT_REQUIRED ? "(true)" : "(false)", - retval->flags & DESKTOP_ENTRY_SHOW_IN_GNOME ? "(true)" : "(false)", - retval->flags & DESKTOP_ENTRY_TRYEXEC_FAILED ? "(true)" : "(false)"); - ---- gnome-menus-2.19.6.orig/libmenu/Makefile.am 2007-08-03 11:38:07.000000000 +0200 -+++ gnome-menus-2.19.6/libmenu/Makefile.am 2007-08-03 11:38:29.000000000 +0200 -@@ -35,6 +35,8 @@ - menu-monitor-backend.h \ - menu-util.c \ - menu-util.h \ -+ user-is-sudoer.c \ -+ user-is-sudoer.h \ - $(MONITOR_BACKEND_SOURCES) \ - $(NULL) - ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-menus-2.19.6/libmenu/user-is-sudoer.c 2007-08-03 11:38:29.000000000 +0200 -@@ -0,0 +1,58 @@ -+/* -+ * user-is-sudoer.c: -+ * -+ * Copyright (C) 2005 Manu Cornet -+ * -+ * 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. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ * -+ * Authors: -+ * Manu Cornet <m...@manucornet.net> -+ */ -+ -+#include <glib.h> -+#include <string.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <grp.h> -+#include "user-is-sudoer.h" -+ -+#define ADMIN_GROUP_NAME "admin" -+ -+gboolean -+user_is_sudoer (void) -+{ -+ const gchar *user_name; -+ int i = 0; -+ struct group *group; -+ -+ if (getuid() == 0 || g_getenv ("USER_IS_ADMIN")) -+ return TRUE; -+ -+ group = getgrnam (ADMIN_GROUP_NAME); -+ -+ if (!group) -+ return TRUE; -+ else { -+ user_name = g_get_user_name (); -+ -+ while (group->gr_mem[i]) { -+ if (!strcmp (user_name, group->gr_mem[i++])) -+ return TRUE; -+ } -+ } -+ -+ return FALSE; -+} ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-menus-2.19.6/libmenu/user-is-sudoer.h 2007-08-03 11:38:29.000000000 +0200 -@@ -0,0 +1,20 @@ -+/* -+ * 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., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include <glib.h> -+ -+gboolean user_is_sudoer (void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/patches/50_add-gcc-apps.patch new/cinnamon-menus-5.6.0/debian/patches/50_add-gcc-apps.patch --- old/cinnamon-menus-5.0.0/debian/patches/50_add-gcc-apps.patch 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/patches/50_add-gcc-apps.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -Index: gnome-menus-3.7.90/desktop-directories/X-GNOME-SystemSettings.directory.in -=================================================================== ---- gnome-menus-3.7.90.orig/desktop-directories/X-GNOME-SystemSettings.directory.in 2013-02-15 20:48:56.000000000 -0500 -+++ gnome-menus-3.7.90/desktop-directories/X-GNOME-SystemSettings.directory.in 2013-03-03 01:12:40.241503804 -0500 -@@ -2,4 +2,3 @@ - Name=System Settings - Icon=gnome-settings - Type=Directory --NoDisplay=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/patches/70_ubuntu-directories.patch new/cinnamon-menus-5.6.0/debian/patches/70_ubuntu-directories.patch --- old/cinnamon-menus-5.0.0/debian/patches/70_ubuntu-directories.patch 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/patches/70_ubuntu-directories.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -Index: gnome-menus-3.7.90/po/POTFILES.in -=================================================================== ---- gnome-menus-3.7.90.orig/po/POTFILES.in 2013-02-19 18:39:14.000000000 -0500 -+++ gnome-menus-3.7.90/po/POTFILES.in 2013-03-03 00:59:16.629486723 -0500 -@@ -15,3 +15,19 @@ - desktop-directories/X-GNOME-Sundry.directory.in - desktop-directories/X-GNOME-Utilities.directory.in - desktop-directories/X-GNOME-WebApplications.directory.in -+debian/desktop-files/ActionGames.directory.in -+debian/desktop-files/AdventureGames.directory.in -+debian/desktop-files/ArcadeGames.directory.in -+debian/desktop-files/BlocksGames.directory.in -+debian/desktop-files/BoardGames.directory.in -+debian/desktop-files/CardGames.directory.in -+debian/desktop-files/Debian.directory.in -+debian/desktop-files/GnomeScience.directory.in -+debian/desktop-files/KidsGames.directory.in -+debian/desktop-files/LogicGames.directory.in -+debian/desktop-files/RolePlayingGames.directory.in -+debian/desktop-files/Settings-System.directory.in -+debian/desktop-files/Settings.directory.in -+debian/desktop-files/SimulationGames.directory.in -+debian/desktop-files/SportsGames.directory.in -+debian/desktop-files/StrategyGames.directory.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/patches/git_restore_calculator.patch new/cinnamon-menus-5.6.0/debian/patches/git_restore_calculator.patch --- old/cinnamon-menus-5.0.0/debian/patches/git_restore_calculator.patch 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/patches/git_restore_calculator.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001 -From: Kalev Lember <kalevlem...@gmail.com> -Date: Thu, 28 Mar 2013 21:54:34 +0000 -Subject: Adapt for gnome-calculator -> gcalctool desktop file rename - -gnome-calculator.desktop was renamed back to gcalctool.desktop, at the -very last minute before the 3.8.0 release. - -https://bugzilla.gnome.org/show_bug.cgi?id=696816 ---- -diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu -index 84d13ed..503f9ca 100644 ---- a/layout/gnome-applications.menu -+++ b/layout/gnome-applications.menu -@@ -38,7 +38,6 @@ - <Not><Filename>file-roller.desktop</Filename></Not> - <Not><Filename>gnome-file-roller.desktop</Filename></Not> - <Not><Filename>deja-dup-preferences.desktop</Filename></Not> -- <Not><Filename>gnome-calculator.desktop</Filename></Not> - <Not><Filename>gcalctool.desktop</Filename></Not> - <Not><Filename>gucharmap.desktop</Filename></Not> - <Not><Filename>gnome-gucharmap.desktop</Filename></Not> -@@ -251,7 +250,7 @@ - <Directory>X-GNOME-Utilities.directory</Directory> - <Include> - <Filename>file-roller.desktop</Filename> -- <Filename>gnome-calculator.desktop</Filename> -+ <Filename>gcalctool.desktop</Filename> - <Filename>gnome-font-viewer.desktop</Filename> - <Filename>gucharmap.desktop</Filename> - <Filename>seahorse.desktop</Filename> -@@ -287,7 +286,6 @@ - <Not><Filename>gnome-eog.desktop</Filename></Not> - <Not><Filename>gnome-file-roller.desktop</Filename></Not> - <Not><Filename>gnome-gucharmap.desktop</Filename></Not> -- <Not><Filename>gcalctool.desktop</Filename></Not> - </And> - </Include> - </Menu> <!-- End Other --> - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/patches/series new/cinnamon-menus-5.6.0/debian/patches/series --- old/cinnamon-menus-5.0.0/debian/patches/series 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -01_default_prefix.patch -02_kill_debian_menu.patch -03_kde-legacydirs.patch -08_settings-menus.patch -09_app_install_entry.patch -09_games-menu.patch -11_science-menu.patch -50_add-gcc-apps.patch -70_ubuntu-directories.patch -git_restore_calculator.patch -ubuntu_gcc_translations.patch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/patches/ubuntu_gcc_translations.patch new/cinnamon-menus-5.6.0/debian/patches/ubuntu_gcc_translations.patch --- old/cinnamon-menus-5.0.0/debian/patches/ubuntu_gcc_translations.patch 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/patches/ubuntu_gcc_translations.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,101 +0,0 @@ -# Description: revert dropping of gnome-control-center categories, they got -# deprecated in g-c-c 3.8 but we are still using 3.6. We can drop those -# changes once we do the update. -# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-menus/+bug/1232534 -Index: gnome-menus-3.8.0/desktop-directories/Hardware.directory.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-menus-3.8.0/desktop-directories/Hardware.directory.in 2013-10-09 15:21:15.269679845 +0200 -@@ -0,0 +1,5 @@ -+[Desktop Entry] -+_Name=Hardware -+_Comment=Settings for several hardware devices -+Icon=preferences-desktop-peripherals -+Type=Directory -Index: gnome-menus-3.8.0/desktop-directories/Makefile.am -=================================================================== ---- gnome-menus-3.8.0.orig/desktop-directories/Makefile.am 2013-10-09 15:21:15.277679844 +0200 -+++ gnome-menus-3.8.0/desktop-directories/Makefile.am 2013-10-09 15:21:15.269679845 +0200 -@@ -1,5 +1,11 @@ - directorydir = $(datadir)/desktop-directories - -+# Should be moved to gnome-control-center: -+directory_in_controlcenterfiles = \ -+ Hardware.directory.in \ -+ Personal.directory.in \ -+ System.directory.in -+ - directory_in_files = \ - AudioVideo.directory.in \ - Development.directory.in \ -@@ -16,7 +22,8 @@ - X-GNOME-Sundry.directory.in \ - X-GNOME-Utilities.directory.in \ - X-GNOME-WebApplications.directory.in \ -- X-GNOME-SystemSettings.directory.in -+ X-GNOME-SystemSettings.directory.in \ -+ $(directory_in_controlcenterfiles) - - directory_DATA = $(directory_in_files:.directory.in=.directory) - -Index: gnome-menus-3.8.0/desktop-directories/Makefile.in -=================================================================== ---- gnome-menus-3.8.0.orig/desktop-directories/Makefile.in 2013-10-09 15:21:15.277679844 +0200 -+++ gnome-menus-3.8.0/desktop-directories/Makefile.in 2013-10-09 15:21:15.273679844 +0200 -@@ -277,6 +277,13 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - directorydir = $(datadir)/desktop-directories -+ -+# Should be moved to gnome-control-center: -+directory_in_controlcenterfiles = \ -+ Hardware.directory.in \ -+ Personal.directory.in \ -+ System.directory.in -+ - directory_in_files = \ - AudioVideo.directory.in \ - Development.directory.in \ -@@ -293,7 +300,8 @@ - X-GNOME-Sundry.directory.in \ - X-GNOME-Utilities.directory.in \ - X-GNOME-WebApplications.directory.in \ -- X-GNOME-SystemSettings.directory.in -+ X-GNOME-SystemSettings.directory.in \ -+ $(directory_in_controlcenterfiles) - - directory_DATA = $(directory_in_files:.directory.in=.directory) - EXTRA_DIST = $(directory_in_files) -Index: gnome-menus-3.8.0/desktop-directories/Personal.directory.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-menus-3.8.0/desktop-directories/Personal.directory.in 2013-10-09 15:21:15.273679844 +0200 -@@ -0,0 +1,6 @@ -+[Desktop Entry] -+# Translators: this is Personal as in "Personal settings" -+_Name=Personal -+_Comment=Personal settings -+Icon=preferences-desktop-personal -+Type=Directory -Index: gnome-menus-3.8.0/desktop-directories/System.directory.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-menus-3.8.0/desktop-directories/System.directory.in 2013-10-09 15:21:15.273679844 +0200 -@@ -0,0 +1,5 @@ -+[Desktop Entry] -+_Name=System -+_Comment=System settings -+Icon=preferences-system -+Type=Directory -Index: gnome-menus-3.8.0/po/POTFILES.in -=================================================================== ---- gnome-menus-3.8.0.orig/po/POTFILES.in 2013-10-09 15:21:15.277679844 +0200 -+++ gnome-menus-3.8.0/po/POTFILES.in 2013-10-09 15:21:15.273679844 +0200 -@@ -31,3 +31,7 @@ - debian/desktop-files/SimulationGames.directory.in - debian/desktop-files/SportsGames.directory.in - debian/desktop-files/StrategyGames.directory.in -+desktop-directories/Hardware.directory.in -+desktop-directories/Personal.directory.in -+desktop-directories/System.directory.in -+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/debian/rules new/cinnamon-menus-5.6.0/debian/rules --- old/cinnamon-menus-5.0.0/debian/rules 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/debian/rules 2022-11-15 12:25:02.000000000 +0100 @@ -2,31 +2,14 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -TYPELIBDIR=$(shell pkg-config gobject-introspection-1.0 --variable libdir | sed -e 's/.//') %: - dh $@ --parallel --with=python3 + dh $@ --with gir override_dh_strip: dh_strip --dbg-package=libcinnamon-menu-3-0-dbg -override_dh_install: - sed 's@TYPELIBDIR@${TYPELIBDIR}@' debian/gir1.2-cmenu-3.0.install.in > debian/gir1.2-cmenu-3.0.install - dh_install --list-missing - override_dh_auto_configure: - meson debian/build \ - --prefix=/usr \ - --buildtype=plain \ + dh_auto_configure -- \ -D deprecated_warnings=false \ -D enable_docs=true - -override_dh_auto_clean: - -dh_auto_clean - -override_dh_auto_install: - DESTDIR=${CURDIR}/debian/tmp \ - ninja -C debian/build install - -override_dh_auto_build: - ninja -C debian/build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-5.0.0/meson.build new/cinnamon-menus-5.6.0/meson.build --- old/cinnamon-menus-5.0.0/meson.build 2021-05-27 16:04:56.000000000 +0200 +++ new/cinnamon-menus-5.6.0/meson.build 2022-11-15 12:25:02.000000000 +0100 @@ -1,4 +1,4 @@ -project('cinnamon-menus', 'c', version : '5.0.0', meson_version: '>=0.40.0') +project('cinnamon-menus', 'c', version : '5.6.0', meson_version: '>=0.40.0') gnome = import('gnome')
