From 5cf395a70e0d843ca5c0cf0034b01526409ae971 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 10 Aug 2015 15:25:30 +0100 Subject: [PATCH] wip data-flow --- .gitignore | 2 ++ Makefile | 29 +++++++++++++++++++++++++++++ data-flow.fig | 45 ++++++++++++++++++++++++++------------------- 3 files changed, 57 insertions(+), 19 deletions(-) create mode 100644 Makefile diff --git a/.gitignore b/.gitignore index e7683df..a3233e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *~ *.bak +data-flow.ps +*.1 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..8f607ca --- /dev/null +++ b/Makefile @@ -0,0 +1,29 @@ + +SLIDES+= data-flow + +SLIDEFILES=$(addsuffix .ps, $(SLIDES)) + +o= >$@.new && mv -f $@.new $@ + +all: slides.pdf + +%.ps: %.fig + iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1 + # wtf! + LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 <$@.1 $o + +%.txt.eps: %.txt ./txt2ps + ./txt2ps <$< |ps2eps -s a3 $o + +%.ps: %.lout + lout $< $o + +slides.ps: $(SLIDEFILES) Makefile + cat $(SLIDEFILES) $o + +slides.pdf: slides.ps Makefile + ps2pdf $< $@ + +install: slides.pdf talk.txt + rsync -vP $^ ijackson@chiark:public-html/2015/debconf-dgit-talk/ + git push ijackson@chiark:public-git/talk-2015-debconf-dgit.git diff --git a/data-flow.fig b/data-flow.fig index 3a4d30b..10d7569 100644 --- a/data-flow.fig +++ b/data-flow.fig @@ -8,6 +8,8 @@ Single -2 1200 2 0 32 #808080 +5 1 0 3 0 7 50 -1 -1 0.000 0 0 0 1 2925.000 6596.591 3375 5400 2925 7875 2475 5400 + 1 1 2.00 120.00 240.00 6 8910 2610 10890 4320 1 2 0 3 0 7 50 -1 -1 0.000 1 0.0000 9900 2925 900 225 9000 2700 10800 3150 1 2 0 3 0 7 52 -1 -1 0.000 1 0.0000 9900 4050 900 225 9000 4050 10800 4050 @@ -51,8 +53,6 @@ Single 2 5 0 1 7 -1 50 -1 -1 0.000 0 0 -1 0 0 5 0 git-logo-thing.png 2700 2925 3314 2925 3314 3667 2700 3667 2700 2925 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 6075 2700 6750 2700 2 1 0 3 32 7 50 -1 -1 0.000 0 0 -1 0 0 2 6075 2475 6750 2475 2 1 0 3 32 7 50 -1 -1 0.000 0 0 7 0 0 2 @@ -66,42 +66,49 @@ Single 9000 1710 10350 1710 10800 1440 2 1 0 3 32 7 50 -1 -1 0.000 0 0 7 0 0 3 9000 1350 10350 1350 10350 2025 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 1 0 2 - 1 1 2.00 120.00 240.00 - 8100 3825 8550 3825 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 1 0 2 - 1 1 2.00 120.00 240.00 - 4725 3825 4275 3825 2 1 0 3 32 7 50 -1 -1 0.000 0 0 7 1 0 2 1 1 2.00 120.00 240.00 4725 1350 4275 1350 2 1 0 3 32 7 50 -1 -1 0.000 0 0 7 1 0 2 1 1 2.00 120.00 240.00 8100 1350 8550 1350 +2 2 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5 + 11250 450 7830 450 7830 5040 11250 5040 11250 450 2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 1 0 2 1 1 2.00 120.00 240.00 - 7470 3960 5310 3960 + 8730 3150 4050 3150 2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 1 0 2 1 1 2.00 120.00 240.00 - 5310 4140 7470 4140 + 4050 3330 8730 3330 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 1 0 2 + 1 1 2.00 120.00 240.00 + 8640 6210 4050 3600 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 0 1 2 + 1 1 2.00 120.00 240.00 + 8550 6390 3960 3780 3 2 0 3 32 7 50 -1 -1 0.000 0 0 0 4 4725 1350 5175 1575 5625 2250 6075 2475 0.000 -1.000 -1.000 0.000 -3 2 0 3 0 7 50 -1 -1 0.000 0 0 0 4 - 4725 3825 5175 3600 5625 2925 6075 2700 - 0.000 -1.000 -1.000 0.000 3 2 0 3 32 7 50 -1 -1 0.000 0 0 0 4 8100 1350 7650 1575 7200 2250 6750 2475 0.000 -1.000 -1.000 0.000 -3 2 0 3 0 7 50 -1 -1 0.000 0 0 0 4 - 8100 3825 7650 3600 7200 2925 6750 2700 - 0.000 -1.000 -1.000 0.000 4 0 32 50 -1 14 16 0.0000 4 240 1155 2430 1665 .tar.gz\001 4 0 32 50 -1 14 16 0.0000 4 180 660 2430 1395 .dsc\001 4 0 32 50 -1 14 16 0.0000 4 240 1155 9180 1890 .tar.gz\001 4 0 32 50 -1 14 16 0.0000 4 180 660 9180 1620 .dsc\001 4 0 0 50 -1 14 20 0.0000 4 270 1560 9225 4725 dgit.d.o\001 4 0 32 50 -1 14 20 0.0000 4 270 1365 9225 900 ftp.d.o\001 -4 0 0 50 -1 14 20 0.0000 4 270 1755 5490 4500 dgit push\001 -4 0 0 50 -1 14 20 0.0000 4 270 1950 5400 3780 dgit fetch\001 -4 0 0 50 -1 2 20 0.0000 4 300 1950 8910 8100 any git server\001 +4 0 0 50 -1 2 20 0.0000 4 300 2565 1710 5040 your working tree\001 +4 0 0 50 -1 14 20 0.0000 4 270 1755 5490 3690 dgit push\001 +4 0 0 50 -1 14 20 0.0000 4 270 1950 5400 2970 dgit fetch\001 +4 0 0 50 -1 14 16 5.7596 4 240 1485 5760 4410 git fetch\001 +4 0 0 50 -1 2 16 0.0000 4 255 1590 9180 8010 any git server\001 +4 0 0 50 -1 14 16 5.7596 4 240 1320 5580 5040 git push\001 +4 0 0 50 -1 14 20 0.0000 4 255 2145 2250 5850 ed/emacs/vi\001 +4 0 0 50 -1 14 20 0.0000 4 270 1950 2250 6210 git-commit\001 +4 0 0 50 -1 14 20 0.0000 4 270 2925 2250 6570 git-cherry-pick\001 +4 0 0 50 -1 14 20 0.0000 4 270 1755 2250 6930 git-reset\001 +4 0 0 50 -1 14 20 0.0000 4 270 1755 2250 7290 git-clean\001 +4 0 0 50 -1 14 20 0.0000 4 270 1365 2250 7650 git-dpm\001 +4 0 0 50 -1 14 20 0.0000 4 270 1170 2250 8010 gbp pq\001 +4 0 0 50 -1 14 20 0.0000 4 210 1755 2250 8370 debcommit\001 -- 2.30.2