autopatch done

diff --git a/Makefile b/Makefile
index fa145eb0cf9c9285665d9421a6171e29988b31a3..e0d530e5c1a883eae1872c7f5dbfc339cf9d81ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 
-SLIDES=title archive-vcs manpage demo-placeholder data libavg access-table
+SLIDES= title archive-vcs manpage demo-placeholder data libavg
+SLIDES+= autopatch access-table
 
 SLIDEFILES=$(addsuffix .ps, $(SLIDES))
 
@@ -26,6 +27,7 @@ manpage.ps: dgit.1-manpage Makefile
        LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 <$@.1 $o
 
 data.ps: data-checkout.txt.eps data-dget.txt.eps data-dsc.txt.eps
+autopatch.ps: autopatch-top.txt.eps
 
 %.txt.eps: %.txt ./txt2ps
        ./txt2ps <$< |ps2eps -s a3 $o

diff --git a/autopatch-bot.txt b/autopatch-bot.txt
deleted file mode 100644 (file)
index f83442c..0000000
--- a/autopatch-bot.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-Description: Automatically generated patch (0.11-1nmu1)
- Last (up to) 3 git changes, FYI:
- .
- commit 85fe079e4cfabd405ca738ff8a89dfad19f17800
- Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
- Date:   Sat Feb 8 17:45:05 2014 +0000
- .
-     debian: finalise changelog for 0.11-1nmu1
- .
- commit c0818e59eab55ace2b177d0ea88682c81d2830aa
- Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
- Date:   Sat Feb 8 17:22:45 2014 +0000
- .
-     Tests: Sort the keywords in the graph output
- .
-     They come out in hash order which is not necessarily stable.
-     Fixes FTBFS with perl 5.18 (Debian #711446, CPAN #85950).
- .
-     Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
- .
- commit bcedbb978208ce08d35e8f317fed5b34695ac1ab
- Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
- Date:   Sat Feb 8 17:18:34 2014 +0000
- .
-     Tests: Provide a TestUtils.pl containing broken-out launder() function
- .
-     The code for laundering font sizes was duplicated between the tests.
-     Instead, break it out into a common function launder() in a new file
-     t/TestUtils.pl (which exists just for the tests).
- .
-     Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
- .
-     squash! Tests: Provide a Test.pm containing
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-
----
-
---- libgraph-writer-graphviz-perl-0.11.orig/MANIFEST
-+++ libgraph-writer-graphviz-perl-0.11/MANIFEST
-@@ -14,3 +14,4 @@ README
- t/0.use.t
- t/1.simple.t
- t/2.ioall.t
-+t/TestUtils.pl
---- libgraph-writer-graphviz-perl-0.11.orig/t/1.simple.t
-+++ libgraph-writer-graphviz-perl-0.11/t/1.simple.t
-@@ -6,6 +6,7 @@ use Test::Simple tests => 1;
- use IO::All;
- use Graph;
- use Graph::Writer::GraphViz;
-+require 't/TestUtils.pl';
- 
- my @v = qw/Alice Bob Crude Dr/;
- my $g = Graph->new;
-@@ -17,9 +18,8 @@ $wr->write_graph($g,'t/graph.simple.dot'
- $/ = undef;
- my $g1 = <DATA>;
- my $g2 = io('t/graph.simple.dot')->slurp;
--# Ignore font-sizes, it's system-dependant
--$g1 =~ s/\d+/0/g;
--$g2 =~ s/\d+/0/g;
-+launder(\$g1);
-+launder(\$g2);
- ok($g1 eq $g2);
- unlink('t/graph.simple.dot');
- 
---- /dev/null
-+++ libgraph-writer-graphviz-perl-0.11/t/TestUtils.pl
-@@ -0,0 +1,13 @@
-+
-+sub launder ($) {
-+    my ($gr) = @_;
-+    # Ignore font-sizes, it's system-dependant
-+    $$gr =~ s/\d+/0/g;
-+    # Sort the keywords in the graph output, as they come out
-+    # in hash order which isn't necessarily stable.
-+    $$gr =~ s{((?:\s+.*\n)+)}{
-+        join "\n", sort split /\n/, $1
-+    }ge;
-+}
-+
-+1;
---- libgraph-writer-graphviz-perl-0.11.orig/t/2.ioall.t
-+++ libgraph-writer-graphviz-perl-0.11/t/2.ioall.t
-@@ -6,6 +6,7 @@ use Test::Simple tests => 2;
- use IO::All;
- use Graph;
- use Graph::Writer::GraphViz;
-+require 't/TestUtils.pl';
- 
- my @v = qw/Alice Bob Crude Dr/;
- my $g = Graph->new;
-@@ -25,9 +26,9 @@ $g2 = $io->slurp;
- }
- 
- ok(-f 't/graph.ioall.dot');
--# Ignore font-sizes, it's system-dependant
--$g1 =~ s/\d+/0/g;
--$g2 =~ s/\d+/0/g;
-+
-+launder(\$g1);
-+launder(\$g2);
- ok($g1 eq $g2);
- $io->unlink;
- 

diff --git a/autopatch-top.txt b/autopatch-top.txt
index f83442cc1ba2914be9f872dd3e2ec0944f68c079..5af5cde0d4db122f69561112a7dfe151c4e1ad64 100644 (file)
--- a/autopatch-top.txt
+++ b/autopatch-top.txt
@@ -38,68 +38,3 @@ Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 --- libgraph-writer-graphviz-perl-0.11.orig/MANIFEST
 +++ libgraph-writer-graphviz-perl-0.11/MANIFEST
 @@ -14,3 +14,4 @@ README
- t/0.use.t
- t/1.simple.t
- t/2.ioall.t
-+t/TestUtils.pl
---- libgraph-writer-graphviz-perl-0.11.orig/t/1.simple.t
-+++ libgraph-writer-graphviz-perl-0.11/t/1.simple.t
-@@ -6,6 +6,7 @@ use Test::Simple tests => 1;
- use IO::All;
- use Graph;
- use Graph::Writer::GraphViz;
-+require 't/TestUtils.pl';
- 
- my @v = qw/Alice Bob Crude Dr/;
- my $g = Graph->new;
-@@ -17,9 +18,8 @@ $wr->write_graph($g,'t/graph.simple.dot'
- $/ = undef;
- my $g1 = <DATA>;
- my $g2 = io('t/graph.simple.dot')->slurp;
--# Ignore font-sizes, it's system-dependant
--$g1 =~ s/\d+/0/g;
--$g2 =~ s/\d+/0/g;
-+launder(\$g1);
-+launder(\$g2);
- ok($g1 eq $g2);
- unlink('t/graph.simple.dot');
- 
---- /dev/null
-+++ libgraph-writer-graphviz-perl-0.11/t/TestUtils.pl
-@@ -0,0 +1,13 @@
-+
-+sub launder ($) {
-+    my ($gr) = @_;
-+    # Ignore font-sizes, it's system-dependant
-+    $$gr =~ s/\d+/0/g;
-+    # Sort the keywords in the graph output, as they come out
-+    # in hash order which isn't necessarily stable.
-+    $$gr =~ s{((?:\s+.*\n)+)}{
-+        join "\n", sort split /\n/, $1
-+    }ge;
-+}
-+
-+1;
---- libgraph-writer-graphviz-perl-0.11.orig/t/2.ioall.t
-+++ libgraph-writer-graphviz-perl-0.11/t/2.ioall.t
-@@ -6,6 +6,7 @@ use Test::Simple tests => 2;
- use IO::All;
- use Graph;
- use Graph::Writer::GraphViz;
-+require 't/TestUtils.pl';
- 
- my @v = qw/Alice Bob Crude Dr/;
- my $g = Graph->new;
-@@ -25,9 +26,9 @@ $g2 = $io->slurp;
- }
- 
- ok(-f 't/graph.ioall.dot');
--# Ignore font-sizes, it's system-dependant
--$g1 =~ s/\d+/0/g;
--$g2 =~ s/\d+/0/g;
-+
-+launder(\$g1);
-+launder(\$g2);
- ok($g1 eq $g2);
- $io->unlink;
- 

diff --git a/autopatch.fig b/autopatch.fig
new file mode 100644 (file)
index 0000000..4ccc555
--- /dev/null
+++ b/autopatch.fig
@@ -0,0 +1,26 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+2 5 0 1 0 -1 50 -1 -1 0.000 0 0 -1 0 0 5
+       0 autopatch-top.txt.eps
+        0 135 7858 135 7858 7088 0 7088 0 135
+2 1 0 2 17 17 50 -1 -1 0.000 0 0 -1 0 0 4
+        -45 7470 -45 90 7875 90 7875 7470
+2 2 0 2 30 30 60 -1 20 0.000 0 0 -1 0 0 5
+        810 630 5040 630 5040 810 810 810 810 630
+2 2 0 2 6 6 60 -1 20 0.000 0 0 -1 0 0 5
+        4590 90 5760 90 5760 315 4590 315 4590 90
+2 2 0 2 6 6 60 -1 20 0.000 0 0 -1 0 0 5
+        3735 1305 4905 1305 4905 1530 3735 1530 3735 1305
+2 2 0 2 6 6 60 -1 20 0.000 0 0 -1 0 0 5
+        2430 -360 3735 -360 3735 -45 2430 -45 2430 -360
+2 2 0 2 30 30 60 -1 20 0.000 0 0 -1 0 0 5
+        3825 -360 10305 -360 10305 -45 3825 -45 3825 -360
+4 0 0 50 -1 14 14 0.0000 4 210 12300 -45 -135 debian/patches/auto-0.11-1nmu1-85fe079e4cfabd405ca738ff8a89dfad19f17800-1391881523\001
+4 0 0 60 -1 14 28 4.7124 4 360 855 9675 2565 :-(\001