2016-02-26T12:40:01

1 files changed, 161 insertions, 2 deletions

diff --git a/calculate.txt b/calculate.txt
index d4be056e3f64..1b08c9a44904 100644
--- a/calculate.txt
+++ b/calculate.txt
@@ -9,8 +9,167 @@
 $ pmaint sync calculate
 WARNING:pkgcore:repository at '/home/mgorny/sync/steveeJ' has unsupported profile format(s): 'profile-set'
 From git://git.calculate.ru/calculate/overlay
-   fbf9a56..38f39a2  update     -> origin/update
-Already up-to-date.
+   fbf9a56..38f39a2  master     -> origin/master
+ * [new tag]         264        -> 264
+Updating fbf9a56..38f39a2
+Fast-forward
+ .../templates/3.3/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf   | 4 ++++
+ profiles/templates/3.3/6_ac_update_sync/remerge/00-ini                | 2 +-
+ .../3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/.calculate_directory | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/01    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/02    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/03    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/04    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/05    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/06    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/09    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/10    | 0
+ .../templates/3.3/6_ac_update_sync/remerge/{100-199 => 1-100}/100     | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/11    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/12    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/13    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/15    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/17    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/20    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/21    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/22    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/23    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/24    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/26    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/27    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/29    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/30    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/31    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/34    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/35    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/36    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/41    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/42    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/43    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/44    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/45    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/46    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/47    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/48    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/50    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/51    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/52    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/53    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/55    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/57    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/58    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/59    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/60    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/63    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/65    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/66    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/67    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/68    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/70    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/71    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/72    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/73    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/74    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/76    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/77    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/78    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/79    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/80    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/83    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/85    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/86    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/88    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/89    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/90    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/91    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/92    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/93    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/94    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/95    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/96    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/97    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/98    | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/99    | 0
+ .../remerge/{100-199 => 101-200}/.calculate_directory                 | 0
+ profiles/templates/3.3/6_ac_update_sync/remerge/101-200/101           | 4 ++++
+ 79 files changed, 9 insertions(+), 1 deletion(-)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/.calculate_directory (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/01 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/02 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/03 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/04 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/05 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/06 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/09 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/10 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{100-199 => 1-100}/100 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/11 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/12 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/13 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/15 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/17 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/20 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/21 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/22 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/23 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/24 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/26 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/27 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/29 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/30 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/31 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/34 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/35 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/36 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/41 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/42 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/43 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/44 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/45 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/46 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/47 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/48 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/50 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/51 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/52 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/53 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/55 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/57 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/58 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/59 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/60 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/63 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/65 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/66 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/67 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/68 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/70 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/71 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/72 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/73 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/74 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/76 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/77 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/78 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/79 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/80 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/83 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/85 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/86 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/88 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/89 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/90 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/91 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/92 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/93 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/94 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/95 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/96 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/97 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/98 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{0-99 => 1-100}/99 (100%)
+ rename profiles/templates/3.3/6_ac_update_sync/remerge/{100-199 => 101-200}/.calculate_directory (100%)
+ create mode 100644 profiles/templates/3.3/6_ac_update_sync/remerge/101-200/101
 *** syncing calculate
 *** synced calculate
  * Sync succeeded