{'description': {'en': 'Calculate Overlay'}, 'homepage': 'http://www.calculate-linux.org', 'name': 'calculate', 'owner': [{'email': 'at@calculate.ru', 'type': 'person'}], 'quality': 'experimental', 'source': [{'type': 'git', 'uri': 'git://git.calculate-linux.org/calculate/calculate-overlay.git'}], 'status': 'unofficial'} $ pmaint sync calculate warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: git config pull.rebase false # merge (the default strategy) git config pull.rebase true # rebase git config pull.ff only # fast-forward only You can replace "git config" with "git config --global" to set a default preference for all repositories. You can also pass --rebase, --no-rebase, or --ff-only on the command line to override the configured default per invocation. From git://git.calculate-linux.org/calculate/calculate-overlay 0dcd602c3..f6e004fb1 master -> origin/master e06e94e27..a40701a18 develop -> origin/develop 0dcd602c3..f6e004fb1 master64 -> origin/master64 e06e94e27..a40701a18 update -> origin/update * [new tag] 2266 -> 2266 Updating 0dcd602c3..f6e004fb1 Fast-forward profiles/default/package.keywords/depends | 2 +- profiles/default/package.use/required-by | 3 ++ .../Depends/calculate-utils.desktop | 2 +- .../2_ac_install_merge/Depends/dm-themes-calculate | 2 +- .../templates/3.6/2_ac_install_merge/Depends/lxdm | 1 - .../Depends/lxdm-themes-calculate | 1 - .../app-text/evince/evince.desktop | 5 +- .../evince/org.gnome.Evince.desktop} | 3 +- .../gnome-base/nautilus/.calculate_directory | 1 - .../gnome-base/nautilus/nautilus-autostart.desktop | 4 -- .../gnome-base/nautilus/nautilus.desktop | 4 -- .../gnome-extra/.calculate_directory | 1 - .../gnome-extra/cinnamon/.calculate_directory | 1 - .../cinnamon/cinnamon-onscreen-keyboard.desktop | 3 -- .../kde-apps/kde-l10n/.calculate_directory | 1 - .../3.6/2_ac_install_merge/kde-apps/kde-l10n/fix | 5 -- .../kde-apps/kde4-l10n/.calculate_directory | 1 - .../kde-apps/kde4-l10n/fix-15.12.3-r1 | 5 -- .../kde-apps/kde4-l10n/fix-4.14.3-r1 | 5 -- .../kde-apps/kdepim-l10n/.calculate_directory | 1 - .../2_ac_install_merge/kde-apps/kdepim-l10n/fix | 5 -- .../kde-base/.calculate_directory | 1 - .../kdebase-desktoptheme/.calculate_directory | 2 - .../kde-base/kdebase-desktoptheme/Calculate/colors | 1 - .../kdebase-desktoptheme/Calculate/dialogs | 1 - .../kde-base/kdebase-desktoptheme/Calculate/icons | 1 - .../Calculate/metadata.desktop | 10 ---- .../kde-base/kdebase-desktoptheme/Calculate/opaque | 1 - .../kdebase-desktoptheme/Calculate/widgets | 1 - .../kde-base/kdelibs/.calculate_directory | 2 - .../2_ac_install_merge/kde-base/kdelibs/kdeglobals | 13 ----- .../kde-base/kdeplasma-addons/.calculate_directory | 2 - .../kde-base/kdeplasma-addons/Calculate/lancelot | 1 - .../kde-base/konqueror/.calculate_directory | 2 - .../kde-base/konqueror/Home.desktop.remove | 1 - .../kde-base/marble/.calculate_directory | 1 - .../kde-base/marble/marble-touch.desktop | 4 -- .../remove-start-here/.calculate_directory | 2 +- .../kde-misc/.calculate_directory | 1 - .../kde-plasma/ksshaskpass/.calculate_directory | 2 - .../2_ac_install_merge/kde-plasma/kwin/cubecap.png | 2 +- .../kde-plasma/systemsettings/.calculate_directory | 1 - .../kde-plasma/systemsettings/CategoriesPage.qml | 3 -- .../kde-plasma/systemsettings/SubCategoryPage.qml | 3 -- .../lxde-base/.calculate_directory | 1 - .../lxde-base/lxdm/.calculate_directory | 1 - .../3.6/2_ac_install_merge/lxde-base/lxdm/90lxdm | 3 -- .../2_ac_install_merge/lxde-base/lxdm/lxdm.conf | 61 ---------------------- .../lxde-base/lxdm/lxdm/.calculate_directory | 1 - .../lxde-base/lxdm/lxdm/PostLogout | 9 ---- .../3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre | 13 ----- .../lxde-base/lxdm/lxdm/Pre.remove | 1 - .../lxde-base/lxdm/lxdm/PreLogin | 9 ---- .../lxde-base/lxdm/lxdm/PreReboot | 23 -------- .../lxde-base/lxdm/lxdm/PreShutdown | 23 -------- .../3.6/2_ac_install_merge/lxde-base/lxdm/pam-lxdm | 12 ----- .../{trojita.desktop => org.kde.trojita.desktop} | 0 .../x11-base/xorg-server/boot/xdm | 2 +- .../x11-base/xorg-server/boot/xdm.del | 2 +- .../1-merge/lxde-base/.calculate_directory | 1 - .../1-merge/lxde-base/lxdm/.calculate_directory | 1 - .../1-merge/lxde-base/lxdm/lxdm.conf | 13 ----- .../1-merge/x11-base/xorg-server/conf.d/xdm | 16 ++---- .../3_ac_install_live/Depends/dm-themes-calculate | 2 +- .../templates/3.6/3_ac_install_live/Depends/lxdm | 1 - .../2-user/zzz_Final/.dmrc.xfce | 4 -- .../templates/3.6/6_ac_install_configure/video | 2 +- .../templates/3.6/6_ac_update_sync/remerge/0-ini | 2 +- .../3.6/6_ac_update_sync/remerge/2020/20201125 | 4 ++ 69 files changed, 24 insertions(+), 297 deletions(-) delete mode 100644 profiles/templates/3.6/2_ac_install_merge/Depends/lxdm delete mode 100644 profiles/templates/3.6/2_ac_install_merge/Depends/lxdm-themes-calculate rename profiles/templates/3.6/2_ac_install_merge/{kde-plasma/ksshaskpass/org.kde.ksshaskpass.desktop => app-text/evince/org.gnome.Evince.desktop} (64%) delete mode 100644 profiles/templates/3.6/2_ac_install_merge/gnome-base/nautilus/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/gnome-base/nautilus/nautilus-autostart.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/gnome-base/nautilus/nautilus.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/gnome-extra/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/gnome-extra/cinnamon/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/gnome-extra/cinnamon/cinnamon-onscreen-keyboard.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-apps/kde-l10n/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-apps/kde-l10n/fix delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-apps/kde4-l10n/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-apps/kde4-l10n/fix-15.12.3-r1 delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-apps/kde4-l10n/fix-4.14.3-r1 delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-apps/kdepim-l10n/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-apps/kdepim-l10n/fix delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/colors delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/dialogs delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/icons delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/metadata.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/opaque delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/widgets delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/kdelibs/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/kdelibs/kdeglobals delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/kdeplasma-addons/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/kdeplasma-addons/Calculate/lancelot delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/konqueror/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/konqueror/Home.desktop.remove delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/marble/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-base/marble/marble-touch.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-misc/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-plasma/ksshaskpass/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-plasma/systemsettings/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-plasma/systemsettings/CategoriesPage.qml delete mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-plasma/systemsettings/SubCategoryPage.qml delete mode 100644 profiles/templates/3.6/2_ac_install_merge/lxde-base/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/90lxdm delete mode 100644 profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm.conf delete mode 100644 profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/.calculate_directory delete mode 100755 profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout delete mode 100755 profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre delete mode 100644 profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove delete mode 100755 profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin delete mode 100755 profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot delete mode 100755 profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown delete mode 100644 profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/pam-lxdm rename profiles/templates/3.6/2_ac_install_merge/mail-client/trojita/{trojita.desktop => org.kde.trojita.desktop} (100%) delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxde-base/.calculate_directory delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxde-base/lxdm/.calculate_directory delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxde-base/lxdm/lxdm.conf delete mode 100644 profiles/templates/3.6/3_ac_install_live/Depends/lxdm delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/.dmrc.xfce create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2020/20201125 *** syncing calculate *** synced calculate * Sync succeeded $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD $ pmaint regen --use-local-desc --pkg-desc-index -t 1 calculate * Cache regenerated successfully