Merge branch 'master' into skipCleanup

2026-04-20 19:38:39 +00:00 · 2017-09-27 00:14:24 +03:00
parent 31f4af5722 0f14143141
commit b4deedda01
8 changed files with 66 additions and 16 deletions
--- a/system/t04_mirror/SearchMirror4Test_gold
+++ b/system/t04_mirror/SearchMirror4Test_gold
@@ -85,6 +85,7 @@ tar_1.26+dfsg-0.1_amd64
 tar_1.26+dfsg-0.1_i386
 ttf-bitstream-vera_1.10-8_all
 ttf-dejavu-core_2.33-3_all
+ttf-freefont_20120503-1_all
 ucf_3.0025+nmu3_all
 x11-common_1:7.7+3~deb7u1_all
 xfonts-encodings_1:1.0.4-1_all
--- a/system/t05_snapshot/PullSnapshot15Test_gold
+++ b/system/t05_snapshot/PullSnapshot15Test_gold
@@ -2,6 +2,7 @@

    [snap1]: Snapshot from mirror [wheezy-main]: http://mirror.yandex.ru/debian/ wheezy
    [snap2]: Snapshot from mirror [wheezy-backports]: http://mirror.yandex.ru/debian/ wheezy-backports
+Already satisfied dependency: init-system-helpers (>= 1.18~) [i386] with [init-system-helpers_1.18~bpo70+1_all]
 Building indexes...
 Dependencies would be pulled into snapshot:
 Injecting package: init-system-helpers_1.18~bpo70+1_all
--- a/system/t05_snapshot/SearchSnapshot4Test_gold
+++ b/system/t05_snapshot/SearchSnapshot4Test_gold
@@ -85,6 +85,7 @@ tar_1.26+dfsg-0.1_amd64
 tar_1.26+dfsg-0.1_i386
 ttf-bitstream-vera_1.10-8_all
 ttf-dejavu-core_2.33-3_all
+ttf-freefont_20120503-1_all
 ucf_3.0025+nmu3_all
 x11-common_1:7.7+3~deb7u1_all
 xfonts-encodings_1:1.0.4-1_all
--- a/system/t09_repo/SearchRepo4Test_gold
+++ b/system/t09_repo/SearchRepo4Test_gold
@@ -85,6 +85,7 @@ tar_1.26+dfsg-0.1_amd64
 tar_1.26+dfsg-0.1_i386
 ttf-bitstream-vera_1.10-8_all
 ttf-dejavu-core_2.33-3_all
+ttf-freefont_20120503-1_all
 ucf_3.0025+nmu3_all
 x11-common_1:7.7+3~deb7u1_all
 xfonts-encodings_1:1.0.4-1_all