Rename images to deal with texinfo brokenness.

See <http://thread.gmane.org/gmane.comp.tex.texinfo.bugs/3533>.

18 files changed, 15 insertions, 10 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index dbafb32971..f9d31527c9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -41,14 +41,19 @@ gnutls_TEXINFOS = gnutls.texi signatures.texi fdl.texi lgpl-2.1.texi	\
 	examples/ex-alert.c examples/ex-x509-info.c examples/ex-crq.c	\
 	examples/ex-pkcs12.c guile.texi $(guile_texi)
 
-# Images.  Make sure there are eps + png + pdf of each.
-gnutls_TEXINFOS += layers.eps layers.png layers.pdf
-gnutls_TEXINFOS += pgp1.eps pgp1.png pgp1.pdf
-gnutls_TEXINFOS += x509-1.eps x509-1.png x509-1.pdf
-gnutls_TEXINFOS += gnutls-logo.eps gnutls-logo.png gnutls-logo.pdf
+# Images.  Make sure there are eps + png + pdf of each, plus the source dia.
+gnutls_TEXINFOS += gnutls-internals.dia gnutls-internals.eps		\
+                   gnutls-internals.png gnutls-internals.pdf
+gnutls_TEXINFOS += gnutls-layers.dia gnutls-layers.eps			\
+                   gnutls-layers.png gnutls-layers.pdf
+gnutls_TEXINFOS += gnutls-pgp.dia gnutls-pgp.eps gnutls-pgp.png		\
+                   gnutls-pgp.pdf
+gnutls_TEXINFOS += gnutls-x509.dia gnutls-x509.eps gnutls-x509.png	\
+                   gnutls-x509.pdf
+gnutls_TEXINFOS += gnutls-logo.dia gnutls-logo.eps gnutls-logo.png	\
+                   gnutls-logo.pdf
 
 # Images.  Make sure there are eps + png + pdf of each.
-gnutls_TEXINFOS += internals.eps internals.png internals.pdf
 gnutls_TEXINFOS += arch/certificate-user-use-case.dia	\
 	arch/certificate-user-use-case.eps		\
 	arch/certificate-user-use-case.pdf		\
diff --git a/doc/internals.dia b/doc/gnutls-internals.dia
index db875f0d14..db875f0d14 100644
--- a/doc/internals.dia
+++ b/doc/gnutls-internals.dia
diff --git a/doc/internals.eps b/doc/gnutls-internals.eps
index 41c0bd1b79..41c0bd1b79 100644
--- a/doc/internals.eps
+++ b/doc/gnutls-internals.eps
diff --git a/doc/internals.pdf b/doc/gnutls-internals.pdf
index 1b00177bd7..1b00177bd7 100644
--- a/doc/internals.pdf
+++ b/doc/gnutls-internals.pdf
diff --git a/doc/internals.png b/doc/gnutls-internals.png
index 132701714e..132701714e 100644
--- a/doc/internals.png
+++ b/doc/gnutls-internals.png
diff --git a/doc/layers.dia b/doc/gnutls-layers.dia
index 0e1cd4aabc..0e1cd4aabc 100644
--- a/doc/layers.dia
+++ b/doc/gnutls-layers.dia
diff --git a/doc/layers.eps b/doc/gnutls-layers.eps
index 377ad527ad..377ad527ad 100644
--- a/doc/layers.eps
+++ b/doc/gnutls-layers.eps
diff --git a/doc/layers.pdf b/doc/gnutls-layers.pdf
index 12dd9dd47c..12dd9dd47c 100644
--- a/doc/layers.pdf
+++ b/doc/gnutls-layers.pdf
diff --git a/doc/layers.png b/doc/gnutls-layers.png
index e0f28de845..e0f28de845 100644
--- a/doc/layers.png
+++ b/doc/gnutls-layers.png
diff --git a/doc/pgp1.dia b/doc/gnutls-pgp.dia
index 74cfa708d5..74cfa708d5 100644
--- a/doc/pgp1.dia
+++ b/doc/gnutls-pgp.dia
diff --git a/doc/pgp1.eps b/doc/gnutls-pgp.eps
index c953101a46..c953101a46 100644
--- a/doc/pgp1.eps
+++ b/doc/gnutls-pgp.eps
diff --git a/doc/pgp1.pdf b/doc/gnutls-pgp.pdf
index 04c8a2dcb1..04c8a2dcb1 100644
--- a/doc/pgp1.pdf
+++ b/doc/gnutls-pgp.pdf
diff --git a/doc/pgp1.png b/doc/gnutls-pgp.png
index c66340b84f..c66340b84f 100644
--- a/doc/pgp1.png
+++ b/doc/gnutls-pgp.png
diff --git a/doc/x509-1.dia b/doc/gnutls-x509.dia
index 0742bb3677..0742bb3677 100644
--- a/doc/x509-1.dia
+++ b/doc/gnutls-x509.dia
diff --git a/doc/x509-1.eps b/doc/gnutls-x509.eps
index 5129adb383..5129adb383 100644
--- a/doc/x509-1.eps
+++ b/doc/gnutls-x509.eps
diff --git a/doc/x509-1.pdf b/doc/gnutls-x509.pdf
index 8a9e6968de..8a9e6968de 100644
--- a/doc/x509-1.pdf
+++ b/doc/gnutls-x509.pdf
diff --git a/doc/x509-1.png b/doc/gnutls-x509.png
index 00784db824..00784db824 100644
--- a/doc/x509-1.png
+++ b/doc/gnutls-x509.png
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index 264393b789..1ffd4ffcde 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -431,7 +431,7 @@ A brief description of how @acronym{GnuTLS} works internally is shown
 at the figure below. This section may be easier to understand after
 having seen the examples (@pxref{examples}).
 
-@image{internals,12cm,8cm}
+@image{gnutls-internals,12cm,8cm}
 
 As shown in the figure, there is a read-only global state that is
 initialized once by the global initialization function.  This global
@@ -593,7 +593,7 @@ negotiation, the initial key exchange and authentication.  @xref{The
 Handshake Protocol}, for more information about the handshake
 protocol.  The protocol layering in TLS is shown in the figure below.
 
-@image{layers,12cm,8cm}
+@image{gnutls-layers,12cm,8cm}
 
 @node The transport layer
 @section The Transport Layer
@@ -1534,7 +1534,7 @@ entities.  Usually more than one certification authorities exist, and
 certification authorities may certify other authorities to issue
 certificates as well, following a hierarchical model.
 
-@image{x509-1,7cm,9.5cm}
+@image{gnutls-x509,7cm,9.5cm}
 
 One needs to trust one or more CAs for his secure communications. In
 that case only the certificates issued by the trusted authorities are
@@ -1768,7 +1768,7 @@ key. When Alice signs Bob's key, she is introducing Bob's key to
 anyone who trusts Alice. If someone trusts Alice to introduce keys,
 then Alice is a trusted introducer in the mind of that observer.
 
-@image{pgp1,11cm,9cm}
+@image{gnutls-pgp,11cm,9cm}
 
 For example: If David trusts Alice to be an introducer, and Alice
 signed Bob's key, Dave also trusts Bob's key to be the real one.