On Sun, 06 Aug 2017 21:31:43 -0400, gregor herrmann wrote:

> Here's a patch fixing the regexps in the helper scripts and making
> the build succedd.

2nd try


Cheeers,
gregor


-- 
 .''`.  https://info.comodo.priv.at/ - Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   
diff -Nru esys-particle-2.3.5+dfsg1/debian/changelog esys-particle-2.3.5+dfsg1/debian/changelog
--- esys-particle-2.3.5+dfsg1/debian/changelog	2017-07-17 14:18:46.000000000 -0400
+++ esys-particle-2.3.5+dfsg1/debian/changelog	2017-08-06 17:48:39.000000000 -0400
@@ -1,3 +1,11 @@
+esys-particle (2.3.5+dfsg1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "esys-particle FTBFS with perl 5.26"
+    (Closes: #870821)
+
+ -- gregor herrmann <gre...@debian.org>  Sun, 06 Aug 2017 17:48:39 -0400
+
 esys-particle (2.3.5+dfsg1-1) unstable; urgency=medium
 
   * Upload into unstable.
diff -Nru esys-particle-2.3.5+dfsg1/debian/patches/07_fix_FTBFS_perl5.26.patch esys-particle-2.3.5+dfsg1/debian/patches/07_fix_FTBFS_perl5.26.patch
--- esys-particle-2.3.5+dfsg1/debian/patches/07_fix_FTBFS_perl5.26.patch	1969-12-31 19:00:00.000000000 -0500
+++ esys-particle-2.3.5+dfsg1/debian/patches/07_fix_FTBFS_perl5.26.patch	2017-08-06 17:48:39.000000000 -0400
@@ -0,0 +1,47 @@
+Description: Fix "Unescaped left brace in regex is illegal" error in perl helper scripts
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/870821
+Forwarded: no
+Author: gregor herrmann <gre...@debian.org>
+Last-Update: 2017-08-06
+
+--- a/Doc/Notes/makeglos.pl
++++ b/Doc/Notes/makeglos.pl
+@@ -46,7 +46,7 @@
+ {
+    while (<LOGFILE>)
+    {
+-      if (m/\\newglossarytype\[(.*)\]{(.*)}{(.*)}{(.*)}/)
++      if (m/\\newglossarytype\[(.*)\]\{(.*)}\{(.*)}\{(.*)}/)
+       {
+          $exttype{$2}{'in'}  = $3;
+          $exttype{$2}{'out'} = $4;
+@@ -237,7 +237,7 @@
+ 
+          for ($i = 1, $j=-1; $i < $n; $i++)
+          {
+-            if ($stuff[$i]=~s/{(.+)\\glosslabel{(.+)}}//)
++            if ($stuff[$i]=~s/\{(.+)\\glosslabel\{(.+)}}//)
+             {
+                $name = $&;
+ 
+--- a/Doc/Tutorial/makeglos.pl
++++ b/Doc/Tutorial/makeglos.pl
+@@ -46,7 +46,7 @@
+ {
+    while (<LOGFILE>)
+    {
+-      if (m/\\newglossarytype\[(.*)\]{(.*)}{(.*)}{(.*)}/)
++      if (m/\\newglossarytype\[(.*)\]\{(.*)}\{(.*)}\{(.*)}/)
+       {
+          $exttype{$2}{'in'}  = $3;
+          $exttype{$2}{'out'} = $4;
+@@ -237,7 +237,7 @@
+ 
+          for ($i = 1, $j=-1; $i < $n; $i++)
+          {
+-            if ($stuff[$i]=~s/{(.+)\\glosslabel{(.+)}}//)
++            if ($stuff[$i]=~s/\{(.+)\\glosslabel\{(.+)}}//)
+             {
+                $name = $&;
+ 
diff -Nru esys-particle-2.3.5+dfsg1/debian/patches/series esys-particle-2.3.5+dfsg1/debian/patches/series
--- esys-particle-2.3.5+dfsg1/debian/patches/series	2017-07-17 13:32:47.000000000 -0400
+++ esys-particle-2.3.5+dfsg1/debian/patches/series	2017-08-06 17:48:39.000000000 -0400
@@ -3,3 +3,4 @@
 03_ax-boost.patch
 05_fix_epydoc_timestamp.patch
 06_fix_FTBFS_gcc6.patch
+07_fix_FTBFS_perl5.26.patch

Attachment: signature.asc
Description: Digital Signature

-- 
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers

Reply via email to