From 8c7dc44ae79d7d17699535e754c86b02a9d940b8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 12 Aug 2015 00:41:49 +0100 Subject: [PATCH] nmu-compare wip --- .gitignore | 2 ++ Makefile | 7 +++++++ nmu-compare.fig | 44 +++++++++++++++++++++++++++++++++++--------- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b7bee5d..315b9ec 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,6 @@ nmu-basic.ps slides.ps slides.pdf my-history-inc.ps +my-history-inc.eps +nmu-compare.ps *.1 diff --git a/Makefile b/Makefile index d12119d..050e2a8 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,13 @@ all: slides.pdf # wtf! LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 <$@.1 $o +%.eps: %.fig + iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1 + # wtf! + LC_CTYPE=en_GB fig2dev -L eps <$@.1 $o + +nmu-compare.ps: my-history-inc.eps + %.txt.eps: %.txt ./txt2ps ./txt2ps <$< |ps2eps -s a3 $o diff --git a/nmu-compare.fig b/nmu-compare.fig index 7744cf8..9d316db 100644 --- a/nmu-compare.fig +++ b/nmu-compare.fig @@ -8,25 +8,51 @@ Single -2 1200 2 0 32 #ffddaa +6 810 900 5130 2340 1 4 0 3 0 1 50 -1 20 0.000 1 0.0000 1133 2037 266 266 880 1953 1386 2122 -1 4 0 3 0 1 50 -1 20 0.000 1 0.0000 1133 2878 266 266 880 2795 1386 2963 1 4 0 3 0 6 50 -1 20 0.000 1 0.0000 1133 1196 266 266 880 1112 1386 1280 -2 1 0 5 2 7 52 -1 -1 12.000 0 0 7 0 0 2 - 1117 1280 1117 2896 2 1 0 5 0 7 55 -1 -1 12.000 0 0 -1 0 0 2 1117 1213 3338 1213 -2 1 0 5 0 7 55 -1 -1 12.000 0 0 -1 0 0 2 - 1117 2896 3338 2896 2 1 0 5 0 7 55 -1 -1 12.000 0 0 -1 0 0 2 1117 2054 1689 2054 2 2 0 4 0 2 52 -1 20 0.000 0 0 7 0 0 5 1723 944 3237 944 3237 1448 1723 1448 1723 944 +4 0 0 50 -1 16 18 0.0000 4 210 1515 1723 2122 Fix #765432\001 +4 0 0 50 -1 16 18 0.0000 4 210 1725 3405 1280 Finalise nmu1\001 +4 0 0 50 -1 18 18 0.0000 4 270 1020 1891 1280 dgit/sid\001 +-6 +1 4 0 3 0 1 50 -1 20 0.000 1 0.0000 1133 2878 266 266 880 2795 1386 2963 +1 4 0 3 0 1 50 -1 20 0.000 1 0.0000 7253 1947 266 266 7000 1863 7506 2032 +1 4 0 3 0 6 50 -1 20 0.000 1 0.0000 7253 1106 266 266 7000 1022 7506 1190 +1 4 0 3 0 6 50 -1 20 0.000 1 0.0000 7253 2874 266 266 7000 2790 7506 2958 +2 1 0 5 2 7 52 -1 -1 12.000 0 0 7 0 0 2 + 1117 1280 1117 2896 +2 1 0 5 0 7 55 -1 -1 12.000 0 0 -1 0 0 2 + 1117 2896 3338 2896 2 2 0 4 0 32 52 -1 20 0.000 0 0 7 0 0 5 1723 2626 4146 2626 4146 3131 1723 3131 1723 2626 2 1 0 4 0 2 50 -1 20 0.000 0 0 -1 0 0 4 3338 2626 4281 2626 4281 3131 3338 3131 -4 0 0 50 -1 16 18 0.0000 4 210 1515 1723 2122 Fix #765432\001 -4 0 0 50 -1 16 18 0.0000 4 210 1725 3405 1280 Finalise nmu1\001 -4 0 0 50 -1 18 18 0.0000 4 270 1020 1891 1280 dgit/sid\001 +2 1 0 5 2 7 52 -1 -1 12.000 0 0 7 0 0 2 + 7245 1125 7245 2610 +2 5 0 5 0 -1 55 -1 -1 0.000 0 0 -1 0 0 5 + 0 my-history-inc.eps + 900 3825 5932 3825 5932 8429 900 8429 900 3825 +2 5 0 5 0 -1 55 -1 -1 0.000 0 0 -1 0 0 5 + 0 my-history-inc.eps + 6975 2520 12007 2520 12007 7124 6975 7124 6975 2520 +2 1 0 5 0 7 55 -1 -1 12.000 0 0 -1 0 0 2 + 7237 1123 9458 1123 +2 1 0 5 0 7 55 -1 -1 12.000 0 0 -1 0 0 2 + 7237 1964 7809 1964 +2 2 0 4 0 2 52 -1 20 0.000 0 0 7 0 0 5 + 7843 854 9357 854 9357 1358 7843 1358 7843 854 +2 1 2 2 0 7 55 -1 -1 4.500 0 0 -1 0 0 2 + 6525 810 6525 8460 4 0 0 50 -1 16 18 0.0000 4 270 2565 1790 2963 remotes/dgit/dgit/sid\001 -4 0 0 50 -1 16 18 0.0000 4 270 3975 1710 3465 openssh (1:6.7p1-6) unstable; ...\001 +4 0 0 50 -1 16 18 0.0000 4 270 1350 4545 2925 # imported\001 +4 0 0 50 -1 16 18 0.0000 4 210 1515 7843 2032 Fix #765432\001 +4 0 0 50 -1 16 18 0.0000 4 210 1725 9525 1190 Finalise nmu1\001 +4 0 0 50 -1 18 18 0.0000 4 270 1020 8011 1190 dgit/sid\001 +4 0 4 55 -1 18 20 0.0000 4 240 3105 810 3600 DISJOINT HISTORY\001 +4 0 13 55 -1 18 22 0.0000 4 360 3615 7425 7785 Maintainer uses dgit\001 -- 2.30.2