Control: tags 869436 + pending

Dear maintainer,

I've prepared an NMU for ifeffit (versioned as 2:1.2.11d-10.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
diffstat for ifeffit-1.2.11d ifeffit-1.2.11d

 changelog                          |   10 ++++
 patches/series                     |    1 
 patches/unescaped-left-brace.patch |   78 +++++++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+)

diff -Nru ifeffit-1.2.11d/debian/changelog ifeffit-1.2.11d/debian/changelog
--- ifeffit-1.2.11d/debian/changelog	2016-11-06 12:37:37.000000000 +0100
+++ ifeffit-1.2.11d/debian/changelog	2017-07-24 14:06:47.000000000 +0200
@@ -1,3 +1,13 @@
+ifeffit (2:1.2.11d-10.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ gregor herrmann ]
+  * Fix "FTBFS with perl 5.26": add unescaped-left-brace.patch to escape
+    literal opening curly braces.  (Closes: #869436)
+
+ -- Mattia Rizzolo <mat...@debian.org>  Mon, 24 Jul 2017 14:06:47 +0200
+
 ifeffit (2:1.2.11d-10.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru ifeffit-1.2.11d/debian/patches/series ifeffit-1.2.11d/debian/patches/series
--- ifeffit-1.2.11d/debian/patches/series	2015-01-11 01:27:49.000000000 +0100
+++ ifeffit-1.2.11d/debian/patches/series	2017-07-24 14:05:44.000000000 +0200
@@ -3,3 +3,4 @@
 wrapper_patches
 documentation_patches
 readline_6.3_patch
+unescaped-left-brace.patch
diff -Nru ifeffit-1.2.11d/debian/patches/unescaped-left-brace.patch ifeffit-1.2.11d/debian/patches/unescaped-left-brace.patch
--- ifeffit-1.2.11d/debian/patches/unescaped-left-brace.patch	1970-01-01 01:00:00.000000000 +0100
+++ ifeffit-1.2.11d/debian/patches/unescaped-left-brace.patch	2017-07-24 14:05:44.000000000 +0200
@@ -0,0 +1,78 @@
+Description: Fix 'Unescaped left brace' error
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/869436
+Forwarded: no
+Author: gregor herrmann <gre...@debian.org>
+Last-Update: 2017-07-23
+
+--- a/doc/scripts/latexmk
++++ b/doc/scripts/latexmk
+@@ -1157,7 +1157,7 @@
+ 	}
+       }
+     }
+-    elsif (/\\blackandwhite{([^\001\040\011}]*)}/ || /\\colorslides{([^\001}]*)}/)
++    elsif (/\\blackandwhite\{([^\001\040\011}]*)}/ || /\\colorslides\{([^\001}]*)}/)
+     {
+       $slide_mode = 1;
+       $full_filename = $1;
+@@ -1179,7 +1179,7 @@
+ 	}
+       }
+     }
+-    elsif (/\\psfig{file=([^,}]+)/ || /\\psfig{figure=([^,}]+)/)
++    elsif (/\\psfig\{file=([^,}]+)/ || /\\psfig\{figure=([^,}]+)/)
+     {
+       $full_filename = &find_file($1,$psfigsearchpath);
+       if ($full_filename)
+@@ -1191,9 +1191,9 @@
+ 	}
+       }
+     }
+-    elsif ( /\\epsfbox{([^}]+)}/ || /\\epsfbox\[[^\]]*\]{([^}]+)}/ ||
+-	    /\\epsffile{([^}]+)}/ || /\\epsffile\[[^\]]*\]{([^}]+)}/ ||
+-	    /\\epsfig{file=([^,}]+)/ || /\\epsfig{figure=([^,}]+)/ )
++    elsif ( /\\epsfbox\{([^}]+)}/ || /\\epsfbox\[[^\]]*\]\{([^}]+)}/ ||
++	    /\\epsffile\{([^}]+)}/ || /\\epsffile\[[^\]]*\]\{([^}]+)}/ ||
++	    /\\epsfig\{file=([^,}]+)/ || /\\epsfig\{figure=([^,}]+)/ )
+     {
+       $full_filename = &find_file($1,$TEXINPUTS);
+       if ($full_filename)
+@@ -1210,7 +1210,7 @@
+       warn "	Detected landscape mode\n";
+       $landscape_mode = 1;
+     }
+-    elsif (/\\bibliography{([^}]+)}/)
++    elsif (/\\bibliography\{([^}]+)}/)
+     {
+       $bib_files = $1;
+       $bib_files =~ tr/,/ /;
+@@ -1218,7 +1218,7 @@
+       warn "	Found bibliography files [$bib_files]\n";
+       $bibtex_mode = 1;
+     }
+-    elsif (/\\psfigsearchpath{([^}]+)}/)
++    elsif (/\\psfigsearchpath\{([^}]+)}/)
+     {
+       $psfigsearchpath = $1;
+     }
+--- a/doc/scripts/FixPDFout
++++ b/doc/scripts/FixPDFout
+@@ -11,7 +11,7 @@
+     s/\\_/_/go;
+     s/\\137/_/go;
+     $line = $_;
+-    if (/\\BOOKMARK \[(.*)\]{(.*)}{(.*)}{(.*)}/ ) {
++    if (/\\BOOKMARK \[(.*)\]\{(.*)}\{(.*)}\{(.*)}/ ) {
+  	$n = $1; $x1 = $2;    $x2 = $3;	$x3 = $4;
+ 	$x2 =~ s/\{//go;  
+ 	$x2 =~ s/\}//go; 
+@@ -22,7 +22,7 @@
+ 	$x2 =~ s/ \(k\) / chi(k) /go;
+ 	$x2 =~ s/PD1OT1ptmptmmmnn//go;
+ 	$x2 =~ s/\\(\w*) //go; 
+-	$line = " \\BOOKMARK [$n]{$x1}{$x2}{$x3}"; 
++	$line = " \\BOOKMARK [$n]\{$x1}\{$x2}\{$x3}";
+      }
+     print OUT "$line\n";
+ }

Attachment: signature.asc
Description: PGP signature

Reply via email to