From: Ian Jackson Date: Sat, 28 Jul 2018 09:32:30 +0000 (+0100) Subject: more X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=56bf4227c631f6e2dfb175d20a98b9da6cc67ab0;p=talk-2018-dc18-gdr.git more --- diff --git a/.gitignore b/.gitignore index 929aaaa..cdeb732 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ dm-*.ps usp-*.ps zoom.ps +refs.ps context.ps slides.pdf slides.ps diff --git a/Makefile b/Makefile index b6f81bd..70c774c 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ SLIDES+= dm-pre-wreck SLIDES+= dm-wreck # made from 4 SLIDES+= dm-post-wreck SLIDES+= dm-6 +SLIDES+= refs # dm-for-zoom is made from 6 #SLIDES+= manpage diff --git a/context.fig b/context.fig index 218c817..ada8e85 100644 --- a/context.fig +++ b/context.fig @@ -8,57 +8,63 @@ Single -2 1200 2 0 32 #888888 +6 6165 -1305 11340 -585 +4 0 0 100 -1 16 24 0.0000 4 300 4155 7155 -585 Debconf 2018 Hsinchu\001 +4 0 0 100 -1 16 24 0.0000 4 300 5175 6165 -990 Ian Jackson & Sean Whitton\001 +-6 +6 450 -7605 11475 -1530 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 - 8730 -5265 10080 -5265 + 8730 -5535 10080 -5535 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 - 8730 -4680 10035 -4680 + 8730 -4950 10035 -4950 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 - 9990 -4410 8730 -4410 -2 2 0 2 7 7 999 -1 -1 0.000 0 0 -1 0 0 5 - 180 -495 11475 -495 11475 -8280 180 -8280 180 -495 + 9990 -4680 8730 -4680 2 1 2 2 0 7 100 -1 -1 4.500 0 0 7 0 0 2 - 5760 -7290 5760 -1305 + 5760 -7560 5760 -1575 2 1 2 2 0 7 100 -1 -1 4.500 0 0 7 0 0 2 - 8550 -7290 8550 -1305 + 8550 -7560 8550 -1575 2 1 2 2 0 7 100 -1 -1 4.500 0 0 7 0 0 2 - 1620 -7290 1620 -1305 + 1620 -7560 1620 -1575 2 2 0 2 0 7 100 -1 -1 0.000 0 0 -1 0 0 5 - 10125 -4185 11430 -4185 11430 -5670 10125 -5670 10125 -4185 + 10125 -4455 11430 -4455 11430 -5940 10125 -5940 10125 -4455 2 2 0 2 0 7 100 -1 -1 0.000 0 0 -1 0 0 5 - 10170 -3690 11430 -3690 11430 -3240 10170 -3240 10170 -3690 + 10170 -3960 11430 -3960 11430 -3510 10170 -3510 10170 -3960 3 3 1 2 0 7 100 -1 -1 6.000 0 0 0 4 - 2205 -5940 5220 -5940 5175 -3195 2205 -3195 + 2205 -6210 5220 -6210 5175 -3465 2205 -3465 -1.000 -1.000 -1.000 -1.000 -4 0 0 100 -1 14 20 0.0000 4 210 1170 5850 -5400 sbuild\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 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 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 20 0.0000 4 270 780 9000 -5400 dgit\001 +4 0 0 100 -1 14 20 0.0000 4 210 1170 5850 -5670 sbuild\001 +4 0 0 100 -1 2 20 0.0000 4 225 1050 450 -7020 Editors\001 +4 0 0 100 -1 2 20 0.0000 4 225 2805 2250 -7020 Source code control\001 +4 0 0 100 -1 2 20 0.0000 4 225 1515 5850 -7020 Build tools\001 +4 0 0 100 -1 14 20 0.0000 4 150 975 450 -5670 emacs\001 +4 0 0 100 -1 14 20 0.0000 4 210 390 450 -5220 vi\001 +4 0 0 100 -1 14 20 0.0000 4 210 390 450 -4770 ed\001 +4 0 0 100 -1 14 20 0.0000 4 270 1365 2250 -4770 git-dpm\001 +4 0 0 100 -1 14 20 0.0000 4 270 1170 2250 -5220 gbp pq\001 +4 0 0 100 -1 14 20 0.0000 4 210 1365 5850 -4770 debuild\001 +4 0 0 100 -1 14 20 0.0000 4 270 1560 5850 -5220 pbuilder\001 +4 0 0 100 -1 14 20 0.0000 4 255 585 9000 -4410 apt\001 +4 0 0 100 -1 14 16 0.0000 4 240 660 9000 -4995 dput\001 +4 0 0 100 -1 14 24 0.0000 4 345 3120 2250 -5670 git-debrebase\001 +4 0 0 100 -1 14 16 0.0000 4 240 3300 2250 -4320 dpkg-source --commit\001 +4 0 0 100 -1 14 16 0.0000 4 240 2640 2250 -3960 svn-buildpackage\001 +4 0 0 100 -1 14 20 0.0000 4 270 780 9000 -5670 dgit\001 +4 0 0 100 -1 14 16 0.0000 4 240 2805 5850 -4410 dpkg-buildpackage\001 +4 0 0 100 -1 14 16 0.0000 4 240 990 2250 -3645 gitpkg\001 +4 0 0 100 -1 14 20 0.0000 4 150 585 3060 -2070 svn\001 +4 0 0 100 -1 14 20 0.0000 4 270 975 3060 -1665 quilt\001 +4 0 0 100 -1 14 24 0.0000 4 345 720 3060 -2520 git\001 +4 0 0 100 -1 2 20 0.0000 4 225 1605 8820 -7020 Publication\001 +4 0 0 100 -1 2 20 0.0000 4 225 1575 9090 -6705 & retrieval\001 +4 0 0 100 -1 18 20 0.0000 4 240 1155 10215 -4770 archive\001 +4 0 0 100 -1 18 20 0.0000 4 240 1110 10215 -5355 Debian\001 +4 0 0 100 -1 18 20 0.0000 4 315 1020 10305 -3645 (salsa)\001 +-6 +2 2 0 2 7 7 999 -1 -1 0.000 0 0 -1 0 0 5 + 180 -495 11475 -495 11475 -8280 180 -8280 180 -495 4 0 0 100 -1 18 24 0.0000 4 0 120 405 -7875 \001 -4 0 0 100 -1 14 16 0.0000 4 240 2805 5850 -4140 dpkg-buildpackage\001 -4 0 0 100 -1 14 16 0.0000 4 240 990 2250 -3375 gitpkg\001 -4 0 0 100 -1 14 20 0.0000 4 150 585 3060 -1800 svn\001 -4 0 0 100 -1 14 20 0.0000 4 270 975 3060 -1395 quilt\001 -4 0 0 100 -1 14 24 0.0000 4 345 720 3060 -2250 git\001 4 0 0 100 -1 16 24 0.0000 4 390 4200 405 -7965 git-debrebase - context\001 -4 0 0 100 -1 2 20 0.0000 4 225 1605 8820 -6750 Publication\001 -4 0 0 100 -1 2 20 0.0000 4 225 1575 9090 -6435 & retrieval\001 -4 0 0 100 -1 18 20 0.0000 4 240 1155 10215 -4500 archive\001 -4 0 0 100 -1 18 20 0.0000 4 240 1110 10215 -5085 Debian\001 -4 0 0 100 -1 18 20 0.0000 4 315 1020 10305 -3375 (salsa)\001 diff --git a/dm.fig b/dm.fig index 3c33349..f3f420d 100644 --- a/dm.fig +++ b/dm.fig @@ -111,7 +111,7 @@ Single 2 2 0 2 32 7 10 -1 -1 0.000 0 0 7 0 0 5 -675 -7020 1080 -7020 1080 -7200 -675 -7200 -675 -7020 2 2 0 2 7 7 999 -1 -1 0.000 0 0 -1 0 0 5 - -1125 -450 10125 -450 10125 -8235 -1125 -8235 -1125 -450 + -1080 -450 10170 -450 10170 -8235 -1080 -8235 -1080 -450 3 2 0 2 0 7 144 -1 -1 0.000 0 0 0 3 3510 -1260 2925 -1620 2430 -1215 0.000 -1.000 0.000 diff --git a/refs.fig b/refs.fig new file mode 100644 index 0000000..8db9ea8 --- /dev/null +++ b/refs.fig @@ -0,0 +1,25 @@ +#FIG 3.2 Produced by xfig version 3.2.6a +Landscape +Center +Metric +A4 +100.00 +Single +-2 +1200 2 +0 32 #888888 +2 2 0 2 7 7 999 -1 -1 0.000 0 0 -1 0 0 5 + 1080 -270 12510 -270 12510 -8055 1080 -8055 1080 -270 +4 0 0 100 -1 2 20 0.0000 4 300 4485 5580 -6930 in testing and stretch-backports\001 +4 0 0 100 -1 14 20 0.0000 4 270 3315 1845 -6930 git-debrebase.deb\001 +4 0 0 100 -1 14 20 0.0000 4 270 3120 1845 -2295 git-debrebase(1)\001 +4 0 0 100 -1 14 20 0.0000 4 270 3120 1845 -2745 git-debrebase(5)\001 +4 0 0 100 -1 2 20 0.0000 4 225 2475 6795 -6210 workflow tutorial\001 +4 0 0 100 -1 2 18 0.0000 4 195 240 7020 -5895 in\001 +4 0 0 100 -1 14 18 0.0000 4 240 1320 7425 -5895 dgit.deb\001 +4 0 0 100 -1 2 20 0.0000 4 225 3750 5400 -2520 Formal reference manuals\001 +4 0 0 100 -1 2 20 0.0000 4 300 6315 1890 -4680 Debconf 18 git-debrebase and dgit workshop\001 +4 0 0 100 -1 16 24 0.0000 4 390 4800 1350 -7740 git-debrebase - references\001 +4 0 0 100 -1 14 20 0.0000 4 270 4485 1845 -6075 dgit-maint-debrebase(7)\001 +4 0 0 100 -1 2 20 0.0000 4 300 8100 1890 -4320 drop-in session (bring your laptop or just your questions)\001 +4 0 0 100 -1 2 20 0.0000 4 300 4095 1890 -3915 Tuesday 10:00-11:45 room X\001