summaryrefslogtreecommitdiff
blob: aa18a4064b3cecd6b02b64e2d8295a7ed1ac29df (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
{'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.ru/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.ru/calculate/overlay
   7056678a3..968a8c320  master     -> origin/master
   7056678a3..968a8c320  master64   -> origin/master64
 * [new tag]             2202       -> 2202
Updating 7056678a3..968a8c320
Fast-forward
 eclass/calculate-utils-r10.eclass                  |  12 +-
 profiles/ini.env                                   |   3 +
 .../net-vpn/wireguard-tools/wireguard              |   9 +
 .../calculate-utils/org.calculate.Core.service     |  16 ++
 .../calculate-utils/ini.example/3-example.profile  |  45 ++++-
 .../lightdm-gtk-greeter/lightdm-gtk-greeter.conf   |   3 +
 .../1-merge/x11-misc/lightdm/lightdm.conf          |  14 +-
 .../1-merge/x11-misc/lightdm/lightdm.conf.old      |  55 ++++++
 .../1-merge/x11-misc/sddm/sddm.conf                |   5 +
 .../2-user/gnome-extra/Cinnamon-3.0/cinnamon       |   4 +
 .../2-user/gnome-extra/Cinnamon-3.0/panels         |   8 +-
 .../2-user/kde-apps/KDE-5/.config/dolphinrc        |  12 +-
 .../2-user/kde-apps/KDE-5/.config/kcmfonts         |   3 +
 .../2-user/kde-apps/KDE-5/.config/kdeglobals       |  10 +
 .../plasma-org.kde.plasma.desktop-appletsrc        |  20 +-
 .../2-user/kde-apps/KDE-5/.config/plasmashellrc    | 206 ++++++++++++++-------
 .../LXQt-0.10/.config/autostart/setdpi.desktop     |   6 +
 .../LXQt-0.10/.config/autostart/setdpi.sh          |   7 +
 .../lxqt-base/LXQt-0.10/.config/lxqt/panel.conf    |  45 +++--
 .../2-user/lxqt-base/LXQt-0.10/fonts.conf          |  42 +++++
 .../2-user/mate-base/MATE-1.8/mate                 |   5 +
 .../2-user/mate-base/MATE-1.8/panel                |   8 +
 .../pcmanfm-qt-0.13.0/default/settings.conf        |   4 +
 .../xfconf/xfce-perchannel-xml/xfce4-desktop.xml   |   4 +
 .../xfconf/xfce-perchannel-xml/xfce4-panel.xml     |   8 +
 .../xfce4/xfconf/xfce-perchannel-xml/xsettings.xml |   8 +
 .../templates/3.6/6_ac_update_sync/remerge/0-ini   |   2 +-
 .../3.6/6_ac_update_sync/remerge/2020/20200910     |   4 +
 sys-apps/calculate-utils/Manifest                  |   4 +
 .../calculate-utils/calculate-utils-3.6.8.8.ebuild |  25 +++
 30 files changed, 492 insertions(+), 105 deletions(-)
 create mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/org.calculate.Core.service
 create mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm/lightdm.conf.old
 create mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kcmfonts
 create mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/autostart/setdpi.desktop
 create mode 100755 profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/autostart/setdpi.sh
 create mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/fonts.conf
 create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2020/20200910
 create mode 100644 sys-apps/calculate-utils/calculate-utils-3.6.8.8.ebuild
*** 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