From: Ian Jackson Date: Sat, 28 Jul 2018 08:22:11 +0000 (+0100) Subject: context X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=3ac61e626fcb51c357631df09ad3c3565f6cc031;p=talk-2018-dc18-gdr.git context --- diff --git a/.gitignore b/.gitignore index 87a42a6..328cbe2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ dm-*.ps zoom.ps +context.ps slides.pdf slides.ps conflict.txt.eps diff --git a/Makefile b/Makefile index 1efc601..4cf1a7e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ +SLIDES+= context SLIDES+= dm-1 SLIDES+= dm-2 SLIDES+= dm-3 diff --git a/context.fig b/context.fig new file mode 100644 index 0000000..dc757f4 --- /dev/null +++ b/context.fig @@ -0,0 +1,89 @@ +#FIG 3.2 Produced by xfig version 3.2.6a +Landscape +Center +Metric +A4 +100.00 +Single +-2 +1200 2 +0 32 #888888 +2 1 0 2 0 7 100 -1 -1 0.000 0 0 7 1 1 2 + 0 0 1.00 60.00 120.00 + 0 0 1.00 60.00 120.00 + 5355 -2565 10170 -2565 +2 1 0 2 0 7 100 -1 -1 0.000 0 0 -1 1 1 2 + 0 0 1.00 60.00 120.00 + 0 0 1.00 60.00 120.00 + 7650 -5265 10080 -5265 +2 1 0 2 0 7 100 -1 -1 0.000 0 0 7 1 0 2 + 0 0 1.00 60.00 120.00 + 8820 -4680 9990 -4680 +2 1 0 2 0 7 100 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 9945 -4410 8820 -4410 +2 1 0 2 0 7 100 -1 -1 0.000 0 0 -1 1 1 2 + 0 0 1.00 60.00 120.00 + 0 0 1.00 60.00 120.00 + 990 -4095 1395 -2790 +2 1 0 2 0 7 100 -1 -1 0.000 0 0 -1 1 1 2 + 0 0 1.00 60.00 120.00 + 0 0 1.00 60.00 120.00 + 1980 -2655 2295 -3330 +2 1 0 2 0 7 100 -1 -1 0.000 0 0 -1 1 1 2 + 0 0 1.00 60.00 120.00 + 0 0 1.00 60.00 120.00 + 2205 -2565 2520 -3285 +2 1 0 2 0 7 100 -1 -1 0.000 0 0 -1 1 1 2 + 0 0 1.00 60.00 120.00 + 0 0 1.00 60.00 120.00 + 3915 -3420 4275 -2790 +2 1 0 2 0 7 100 -1 -1 0.000 0 0 -1 1 1 2 + 0 0 1.00 60.00 120.00 + 0 0 1.00 60.00 120.00 + 4095 -3510 4500 -2835 +3 0 0 2 0 7 100 -1 -1 0.000 0 1 1 4 + 0 0 1.00 60.00 120.00 + 0 0 1.00 60.00 120.00 + 5265 -2655 7245 -3015 8280 -5355 10080 -5265 + 0.000 1.000 1.000 0.000 +3 2 0 2 0 7 100 -1 -1 0.000 0 1 1 3 + 0 0 1.00 60.00 120.00 + 0 0 1.00 60.00 120.00 + 2070 -1710 3015 -1485 4050 -1845 + 0.000 -1.000 0.000 +4 0 0 100 -1 14 20 0.0000 4 210 1170 5850 -5400 sbuild\001 +4 0 0 100 -1 14 20 0.0000 4 270 585 9000 -2250 git\001 +4 0 0 100 -1 2 20 0.0000 4 225 1050 450 -6750 Editors\001 +4 0 0 100 -1 2 20 0.0000 4 225 2805 2250 -6750 Source code control\001 +4 0 0 100 -1 2 20 0.0000 4 225 1515 5850 -6750 Build tools\001 +4 0 0 100 -1 2 20 0.0000 4 225 2910 8550 -6750 Publication/retrieval\001 +4 0 0 100 -1 14 20 0.0000 4 150 975 450 -5400 emacs\001 +4 0 0 100 -1 14 20 0.0000 4 210 390 450 -4950 vi\001 +4 0 0 100 -1 14 20 0.0000 4 210 390 450 -4500 ed\001 +4 0 0 100 -1 14 20 0.0000 4 270 1365 2250 -4500 git-dpm\001 +4 0 0 100 -1 14 20 0.0000 4 270 1170 2250 -4950 gbp pq\001 +4 0 0 100 -1 14 20 0.0000 4 210 1365 5850 -4500 debuild\001 +4 0 0 100 -1 14 20 0.0000 4 270 1560 5850 -4950 pbuilder\001 +4 0 0 100 -1 14 20 0.0000 4 255 585 9000 -4140 apt\001 +4 0 0 100 -1 14 16 0.0000 4 240 660 9000 -4725 dput\001 +4 0 0 100 -1 18 24 0.0000 4 300 1020 10350 -2475 salsa\001 +4 0 0 100 -1 18 20 0.0000 4 240 1155 10350 -4500 archive\001 +4 0 0 100 -1 18 20 0.0000 4 240 1110 10350 -5085 Debian\001 +4 0 0 100 -1 14 24 0.0000 4 345 3120 2250 -5400 git-debrebase\001 +4 0 0 100 -1 14 16 0.0000 4 240 3300 2250 -4050 dpkg-source --commit\001 +4 0 0 100 -1 14 16 0.0000 4 240 2640 2250 -3690 svn-buildpackage\001 +4 0 0 100 -1 14 16 0.0000 4 30 495 2295 -3465 ...\001 +4 0 0 100 -1 18 20 0.0000 4 240 600 1125 -1530 tree\001 +4 0 0 100 -1 18 20 0.0000 4 315 1290 1125 -1935 working\001 +4 0 0 100 -1 18 20 0.0000 4 240 780 1125 -2295 Your\001 +4 0 0 100 -1 18 20 0.0000 4 180 540 4275 -1980 vcs\001 +4 0 0 100 -1 18 20 0.0000 4 255 735 4275 -1620 repo\001 +4 0 0 100 -1 18 20 0.0000 4 240 780 4275 -2340 Your\001 +4 0 0 100 -1 14 20 0.0000 4 150 585 2610 -675 svn\001 +4 0 0 100 -1 14 20 0.0000 4 270 975 2610 -315 quilt\001 +4 0 0 100 -1 14 24 0.0000 4 345 720 2610 -1080 git\001 +4 0 0 100 -1 14 20 0.0000 4 270 780 9000 -5400 dgit\001 +4 0 0 100 -1 18 24 0.0000 4 0 120 405 -7875 \001 +4 0 0 100 -1 16 24 0.0000 4 390 4305 405 -7965 git-debrebase context\001 +4 0 0 100 -1 14 16 0.0000 4 240 2805 5850 -4140 dpkg-buildpackage\001