summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'calculate.txt')
-rw-r--r--calculate.txt29
1 files changed, 1 insertions, 28 deletions
diff --git a/calculate.txt b/calculate.txt
index 96429e46f459..8a93d9b56368 100644
--- a/calculate.txt
+++ b/calculate.txt
@@ -7,34 +7,7 @@
'uri': 'git://git.calculate.ru/calculate/overlay.git'}],
'status': 'unofficial'}
$ pmaint sync calculate
-From git://git.calculate.ru/calculate/overlay
- 9f492ef1e..d8ab12c36 master -> origin/master
- 9f492ef1e..d8ab12c36 master64 -> origin/master64
- * [new tag] 2069 -> 2069
-Updating 9f492ef1e..d8ab12c36
-Fast-forward
- profiles/default/package.keywords/depends | 1 -
- .../sys-apps/calculate-utils/.calculate_directory | 1 -
- .../calculate-utils/boot/.calculate_directory | 1 +
- .../sys-apps/calculate-utils/boot/zram | 1 +
- .../conf.d.lxc/.calculate_directory | 1 +
- .../calculate-utils/{conf.d => conf.d.lxc}/client | 0
- .../calculate-utils/conf.d/.calculate_directory | 2 +-
- .../sys-apps/calculate-utils/conf.d/zram | 18 +++++++
- .../calculate-utils/init.d/.calculate_directory | 1 +
- .../sys-apps/calculate-utils/init.d/zram | 57 ++++++++++++++++++++++
- .../templates/3.6/6_ac_update_sync/remerge/0-ini | 2 +-
- .../remerge/2020/{20200521 => 20200525} | 0
- 12 files changed, 81 insertions(+), 4 deletions(-)
- delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
- create mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/boot/.calculate_directory
- create mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/boot/zram
- create mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/conf.d.lxc/.calculate_directory
- rename profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/{conf.d => conf.d.lxc}/client (100%)
- create mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/conf.d/zram
- create mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/init.d/.calculate_directory
- create mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/init.d/zram
- rename profiles/templates/3.6/6_ac_update_sync/remerge/2020/{20200521 => 20200525} (100%)
+Already up to date.
*** syncing calculate
*** synced calculate
* Sync succeeded