[Pgp-tools-commit] r440 - in trunk: debian gpgsigs

[Franck Joncourt]

Author: thialme-guest
Date: 2009-08-30 16:56:26 +0000 (Sun, 30 Aug 2009)
New Revision: 440

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/gpgsigs/gpgsigs
Log:
+ 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.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-08-30 10:12:07 UTC (rev 439)
+++ trunk/debian/changelog	2009-08-30 16:56:26 UTC (rev 440)
@@ -5,6 +5,12 @@
     + 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

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2009-08-30 10:12:07 UTC (rev 439)
+++ trunk/debian/control	2009-08-30 16:56:26 UTC (rev 440)
@@ -20,7 +20,7 @@
 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)

Modified: trunk/gpgsigs/gpgsigs
===================================================================
--- trunk/gpgsigs/gpgsigs	2009-08-30 10:12:07 UTC (rev 439)
+++ trunk/gpgsigs/gpgsigs	2009-08-30 16:56:26 UTC (rev 440)
@@ -181,7 +181,7 @@
 		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 @@
 \usepackage[margin=2cm]{geometry}
 \usepackage{alltt}
 \usepackage{graphicx}
+\usepackage{grffile}
 \begin{document}
 \begin{alltt}
 EOF
@@ -354,7 +355,7 @@
 				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";
 				}
 			}