From: Ian Jackson Date: Fri, 27 Jul 2018 14:24:22 +0000 (+0100) Subject: wip prep wreck X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=6bcd92cf2703b5a92bc77fce721d317b29f7b989;p=talk-2018-dc18-gdr.git wip prep wreck --- diff --git a/Makefile b/Makefile index f2f8a1b..cef5221 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,9 @@ SLIDES+= dm-1 SLIDES+= dm-2 SLIDES+= dm-3 -SLIDES+= dm-4 +SLIDES+= dm-5 SLIDES+= dm-6 -SLIDES+= dm-wreck # made from 5 +SLIDES+= dm-wreck # made from 4 #SLIDES+= manpage # layers @@ -17,7 +17,7 @@ SLIDES+= dm-wreck # made from 5 # 1 [1] # 2 [2] # 3 [3] -# 4 [4] +# 5 [4] # 6 [5] @@ -38,7 +38,7 @@ dm-%.ps: dm.fig dm-wreck.ps: dm.fig iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1 - LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:59,150:159 <$@.1 $o + LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:49,140:149 <$@.1 $o %.eps: %.fig iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1 diff --git a/dm.fig b/dm.fig index ee56a78..ce2e1d2 100644 --- a/dm.fig +++ b/dm.fig @@ -7,33 +7,31 @@ A4 Single -2 1200 2 -6 4590 -1755 5310 -1395 -2 3 0 2 0 7 40 -1 -1 0.000 0 0 7 0 0 6 - 4635 -1575 4725 -1440 5265 -1440 5265 -1710 4725 -1710 4635 -1575 -4 0 0 40 -1 14 12 0.0000 4 120 480 4725 -1530 v1.2\001 --6 6 3330 -3870 3870 -3330 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3600 -3600 225 225 3600 -3600 3825 -3600 4 0 0 30 -1 14 20 0.0000 4 210 195 3465 -3510 1\001 4 0 0 30 -1 14 20 0.0000 4 90 195 3555 -3510 '\001 -6 -1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 6390 -5400 225 225 6390 -5400 6615 -5400 -1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 6120 -4500 225 225 6120 -4500 6345 -4500 -1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 5850 -3600 225 225 5850 -3600 6075 -3600 +6 4620 -1725 5280 -1425 +2 3 0 2 0 7 41 -1 -1 0.000 0 0 7 0 0 6 + 4635 -1575 4725 -1440 5265 -1440 5265 -1710 4725 -1710 4635 -1575 +4 0 0 41 -1 14 12 0.0000 4 120 480 4725 -1530 v1.2\001 +-6 +1 3 0 2 0 7 51 -1 20 0.000 1 0.0000 6390 -5400 225 225 6390 -5400 6615 -5400 +1 3 0 2 0 7 51 -1 20 0.000 1 0.0000 6120 -4500 225 225 6120 -4500 6345 -4500 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3870 -4500 225 225 3870 -4500 4095 -4500 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 4140 -5400 225 225 4140 -5400 4365 -5400 -1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 4365 -1575 225 225 4365 -1575 4590 -1575 1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 360 -2700 225 225 360 -2700 585 -2700 1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 1260 -2700 225 225 1260 -2700 1485 -2700 1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 1530 -3600 225 225 1530 -3600 1755 -3600 1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 1800 -4500 225 225 1800 -4500 2025 -4500 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3330 -2700 225 225 3330 -2700 3555 -2700 1 3 0 2 0 7 21 -1 20 0.000 1 0.0000 2070 -5400 225 225 2070 -5400 2295 -5400 +1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 4365 -1575 225 225 4365 -1575 4590 -1575 +1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 5850 -3600 225 225 5850 -3600 6075 -3600 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 7470 -3150 225 225 7470 -3150 7695 -3150 2 1 0 2 0 7 32 -1 -1 0.000 0 0 7 0 0 3 1305 -2700 3330 -2700 4140 -5400 -2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 2 - 4410 -1800 4664 -2691 2 1 0 2 0 7 22 -1 20 0.000 0 0 -1 0 0 2 1800 -4500 2070 -5400 2 1 0 2 0 7 12 -1 -1 0.000 0 0 -1 0 0 3 @@ -46,22 +44,12 @@ Single 7335 -7200 7425 -7065 8910 -7065 8910 -7335 7425 -7335 7335 -7200 2 1 1 2 0 7 62 -1 -1 6.000 0 0 7 0 0 2 630 -7290 -585 -7290 -2 2 0 2 0 7 140 -1 -1 0.000 0 0 7 0 0 5 - 6705 -5310 7515 -5310 7515 -5490 6705 -5490 6705 -5310 2 2 0 2 0 7 130 -1 -1 0.000 0 0 7 0 0 5 4455 -5310 5265 -5310 5265 -5490 4455 -5490 4455 -5310 2 2 0 2 0 7 120 -1 -1 0.000 0 0 7 0 0 5 2385 -5310 3195 -5310 3195 -5490 2385 -5490 2385 -5310 2 2 0 2 0 7 110 -1 -1 0.000 0 0 7 0 0 5 2115 -4410 2925 -4410 2925 -4590 2115 -4590 2115 -4410 -2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 3 - 3375 -2700 5580 -2700 6390 -5400 -2 3 0 2 0 7 41 -1 20 0.000 0 0 0 0 0 7 - 4680 -2475 4875 -2587 4875 -2813 4680 -2925 4485 -2812 4485 -2587 - 4680 -2475 -2 3 0 2 0 7 41 -1 20 0.000 0 0 0 0 0 7 - 5580 -2475 5775 -2587 5775 -2813 5580 -2925 5385 -2812 5385 -2587 - 5580 -2475 2 3 0 2 0 7 61 -1 20 0.000 0 0 7 0 0 7 6960 -7087 7155 -7199 7155 -7425 6960 -7537 6765 -7424 6765 -7199 6960 -7087 @@ -70,24 +58,36 @@ Single 6735 -6300 2 1 0 2 0 7 62 -1 -1 0.000 0 0 7 0 0 3 630 -7290 6975 -7290 6390 -5400 +2 3 0 2 0 7 41 -1 20 0.000 0 0 0 0 0 7 + 4680 -2475 4875 -2587 4875 -2813 4680 -2925 4485 -2812 4485 -2587 + 4680 -2475 +2 3 0 2 0 7 41 -1 20 0.000 0 0 0 0 0 7 + 5580 -2475 5775 -2587 5775 -2813 5580 -2925 5385 -2812 5385 -2587 + 5580 -2475 2 3 0 2 0 7 41 -1 20 0.000 0 0 0 0 0 7 7485 -3578 7680 -3690 7680 -3916 7485 -4028 7290 -3915 7290 -3690 7485 -3578 -3 2 0 2 0 7 42 -1 -1 0.000 0 0 0 3 - 3510 -1260 2925 -1620 2430 -1215 - 0.000 -1.000 0.000 -3 2 0 2 0 7 42 -1 20 0.000 0 0 0 3 +2 1 0 2 0 7 52 -1 -1 0.000 0 0 7 0 0 2 + 5850 -3600 6435 -5445 +2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 3 + 3363 -2704 5580 -2700 5850 -3600 +2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 2 + 4410 -1800 4664 -2691 +2 2 0 2 0 7 150 -1 -1 0.000 0 0 7 0 0 5 + 6705 -5310 7515 -5310 7515 -5490 6705 -5490 6705 -5310 +3 2 0 2 0 7 41 -1 20 0.000 0 0 0 3 4725 -1215 4005 -1665 3510 -1260 0.000 -1.000 0.000 -3 2 0 2 0 7 42 -1 -1 0.000 0 0 0 3 +3 2 0 2 0 7 41 -1 -1 0.000 0 0 0 3 + 3510 -1260 2925 -1620 2430 -1215 + 0.000 -1.000 0.000 +3 2 0 2 0 7 41 -1 -1 0.000 0 0 0 3 2430 -1215 1845 -1575 1350 -1170 0.000 -1.000 0.000 -4 0 0 40 -1 14 20 0.0000 4 210 195 6255 -5310 2\001 -4 0 0 40 -1 14 20 0.0000 4 210 195 5715 -3510 1\001 -4 0 0 40 -1 14 20 0.0000 4 90 195 6390 -5310 "\001 -4 0 0 40 -1 14 20 0.0000 4 210 195 5985 -4410 3\001 -4 0 0 40 -1 14 20 0.0000 4 90 195 6120 -4410 "\001 -4 0 0 40 -1 14 20 0.0000 4 90 195 5850 -3510 "\001 +4 0 0 50 -1 14 20 0.0000 4 210 195 6255 -5310 2\001 +4 0 0 50 -1 14 20 0.0000 4 90 195 6390 -5310 "\001 +4 0 0 50 -1 14 20 0.0000 4 210 195 5985 -4410 3\001 +4 0 0 50 -1 14 20 0.0000 4 90 195 6120 -4410 "\001 4 0 0 30 -1 14 20 0.0000 4 210 195 4005 -5310 2\001 4 0 0 30 -1 14 20 0.0000 4 90 195 4140 -5310 '\001 4 0 0 30 -1 14 20 0.0000 4 210 195 3735 -4410 3\001 @@ -99,17 +99,13 @@ Single 4 0 0 10 -1 14 20 0.0000 4 210 195 1440 -3510 1\001 4 0 0 10 -1 16 20 0.0000 4 240 1650 -135 -2160 Breakwater\001 4 0 0 30 -1 14 20 0.0000 4 195 195 3195 -2610 C\001 -4 0 0 40 -1 14 20 0.0000 4 210 195 5490 -2610 d\001 -4 0 0 40 -1 16 20 0.0000 4 315 2895 1665 -810 Upstream git history\001 4 0 0 62 -1 14 12 0.0000 4 120 720 7335 -7425 master\001 4 0 0 62 -1 14 12 0.0000 4 150 1440 7425 -7155 debian/1.2-1\001 4 0 0 60 -1 14 20 0.0000 4 255 195 6885 -7200 /\001 -4 0 0 140 -1 14 12 0.0000 4 120 720 6750 -5355 master\001 4 0 0 130 -1 14 12 0.0000 4 120 720 4500 -5355 master\001 4 0 0 120 -1 14 12 0.0000 4 120 720 2430 -5355 master\001 4 0 0 110 -1 14 12 0.0000 4 120 720 2160 -4455 master\001 4 0 0 20 -1 14 20 0.0000 4 210 390 1890 -5310 C3\001 -4 0 0 41 -1 16 20 0.0000 4 240 1035 4185 -3150 Anchor\001 4 0 0 61 -1 12 12 0.0000 4 180 1080 5490 -6390 d/patches\001 4 0 0 62 -1 0 12 0.0000 4 0 45 5130 -7335 \001 4 0 0 62 -1 16 20 0.0000 4 315 2790 1215 -7425 Interchange branch\001 @@ -122,8 +118,6 @@ Single 4 0 0 20 -1 0 15 0.0000 4 165 615 1215 -5490 mixed\001 4 0 0 32 -1 0 15 0.0000 4 210 900 4185 -4545 upstream\001 4 0 0 32 -1 0 15 0.0000 4 225 660 4185 -4320 part of\001 -4 0 0 41 -1 0 15 0.0000 4 225 990 5580 -2295 changelog\001 -4 0 0 41 -1 0 15 0.0000 4 180 615 4770 -2970 merge\001 4 0 0 32 -1 0 15 0.0000 4 225 990 2835 -2295 packaging\001 4 0 0 32 -1 0 15 0.0000 4 225 660 2925 -2115 part of\001 4 0 0 62 -1 0 15 0.0000 4 225 2325 1485 -7065 published, eg salsa, dgit\001 @@ -131,15 +125,23 @@ Single 4 0 0 32 -1 14 12 0.0000 4 120 240 3555 -2115 C3\001 4 0 0 61 -1 0 15 0.0000 4 225 1170 5400 -6570 (re)generate\001 4 0 0 61 -1 0 15 0.0000 4 225 1290 5490 -7110 pseudomerge\001 -4 0 0 41 -1 0 15 0.0000 4 225 675 4095 -2970 special\001 -4 0 0 41 -1 0 15 0.0000 4 165 1125 5580 -2115 add version\001 -4 0 0 40 -1 14 20 0.0000 4 255 195 4590 -2610 @\001 4 0 0 60 -1 14 20 0.0000 4 195 195 6643 -6423 %\001 -4 0 0 41 -1 0 15 0.0000 4 165 765 8055 -3600 commit\001 -4 0 0 41 -1 0 15 0.0000 4 225 1365 8055 -3825 autogenerated\001 -4 0 0 41 -1 0 15 0.0000 4 60 135 7830 -3735 =\001 4 0 0 30 -1 14 20 0.0000 4 90 195 7425 -3060 '\001 4 0 0 32 -1 0 15 0.0000 4 165 735 8055 -3015 rebased\001 4 0 0 32 -1 0 15 0.0000 4 165 765 8055 -2835 commit\001 4 0 0 32 -1 0 15 0.0000 4 60 135 7785 -3105 =\001 4 0 0 32 -1 0 15 0.0000 4 195 990 8055 -3195 rewritten/\001 +4 0 0 40 -1 14 20 0.0000 4 255 195 4590 -2610 @\001 +4 0 0 40 -1 14 20 0.0000 4 210 195 5490 -2610 d\001 +4 0 0 41 -1 0 15 0.0000 4 225 990 5580 -2295 changelog\001 +4 0 0 41 -1 0 15 0.0000 4 165 1125 5580 -2115 add version\001 +4 0 0 41 -1 0 15 0.0000 4 225 675 4095 -2970 special\001 +4 0 0 41 -1 16 20 0.0000 4 240 1035 4185 -3150 Anchor\001 +4 0 0 41 -1 0 15 0.0000 4 180 615 4770 -2970 merge\001 +4 0 0 41 -1 0 15 0.0000 4 225 1365 8055 -3825 autogenerated\001 +4 0 0 41 -1 0 15 0.0000 4 165 765 8055 -3600 commit\001 +4 0 0 41 -1 0 15 0.0000 4 60 135 7830 -3735 =\001 +4 0 0 41 -1 16 20 0.0000 4 315 2895 1665 -810 Upstream git history\001 +4 0 0 40 -1 14 20 0.0000 4 90 195 5850 -3510 "\001 +4 0 0 40 -1 14 20 0.0000 4 210 195 5715 -3510 1\001 +4 0 0 150 -1 14 12 0.0000 4 120 720 6750 -5355 master\001