+ Made removal of nonexistent photos quiet by the use of the force option.

+ Updated generated tex file in latex mode so that it uses the grffile
  package. This allows pdflatex to process our tex file assuming the photos
  are previously converted to PDF. (Closes: #542478)
+ Added texlive-latex-recommended as a suggested package in debian/control.
  It contains the grffile latex package.

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@440 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/debian/changelog b/debian/changelog
index 8d4be637a9a2edd488a46f742ba7297fa74b88ee..63febc22232ddf920371d453766d5c3d441cef2a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ signing-party (1.1.1-2) UNRELEASED; urgency=low
     + Added patch from Roland Rosenfeld to support RIPEMD160 checksum.
       (Closes: #533747).
     + Updated man page to mention support for SHA256 and RIPEMD160 checksum.
+    + Made removal of nonexistent photos quiet by the use of the force option.
+    + Updated generated tex file in latex mode so that it uses the grffile
+      package. This allows pdflatex to process our tex file assuming the photos
+      are previously converted to PDF. (Closes: #542478)
+    + Added texlive-latex-recommended as a suggested package in debian/control.
+      It contains the grffile latex package.
   * caff: Updated check for the local-user keyids.
     + Moved the current check to a new function get_local_user_keys().
     + Warned the user if a local-user keyid is not listed as a keyid in

diff --git a/debian/control b/debian/control
index 636e225a36d4de5800f8b310bc87e6ec9b4fa0ce..1ff1b43b8ee9869680b75bfa499fca02d5eb4f05 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, gnupg,
 Recommends: exim4 | mail-transport-agent, libtext-iconv-perl | libintl-perl | recode, dialog | whiptail, libpaper-utils,
 # springraph
  libgd-gd2-noxpm-perl | libgd-gd2-perl
-Suggests: imagemagick | graphicsmagick-imagemagick-compat, wipe,
+Suggests: imagemagick | graphicsmagick-imagemagick-compat, wipe, texlive-latex-recommended,
 # keyanalyze
  mutt
 Replaces: keylookup (<< 3.0), sig2dot (<< 1), springgraph (<< 1), keyanalyze (<< 0.1)

diff --git a/gpgsigs/gpgsigs b/gpgsigs/gpgsigs
index 5ba8c126792afc10486632b237f86bacf5d05b75..cc7bad0aa404d66c08192004f914f12a51e8a413 100755 (executable)
--- a/gpgsigs/gpgsigs
+++ b/gpgsigs/gpgsigs
@@ -181,7 +181,7 @@ while (<SIGS>) {
                next if $uidstatus eq "r";
                if ($latex and not $photocount) { # call once per key
                        my ($shortkey) = substr $key, -8;
-                       system "rm $shortkey.[1-9]*.eps";
+                       system "rm -f $shortkey.[1-9]*.eps";
                        system "gpg --photo-viewer 'gpgsigs-eps-helper $shortkey' --list-options show-photos --list-key $key > /dev/null";
                        $photocount = 1;
                }
@@ -307,6 +307,7 @@ if ($latex) {
 \usepackage[margin=2cm]{geometry}
 \usepackage{alltt}
 \usepackage{graphicx}
+\usepackage{grffile}
 \begin{document}
 \begin{alltt}
 EOF
@@ -354,7 +355,7 @@ while (<TXT>) {
                                if ($latex and ($uid =~ /^\[jpeg image/)) {
                                        $photocount++;
                                        print WRITE "\\begin{flushright}\n";
-                                       print WRITE "\\includegraphics[height=3cm]{$key.$photocount.eps}\n";
+                                       print WRITE "\\includegraphics[height=3cm]{$key.$photocount}\n";
                                        print WRITE "\\end{flushright}\n";
                                }
                        }