Bug#797242: freewnn: FTBFS: Bad format near line 1 "Binaryfilefull.fsrcmatches".
Followup-For: Bug #797242
Control: tag -1 patch
Attached is a patch for the egrep issue. This is not sufficient to make
the build reproducible, the dictionaries embed the hostname and maybe a
timestamp in the headers. I'm not digging deeper into this issue.
Andreas
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/changelog freewnn-1.1.1~a021+cvs20130302/debian/changelog
--- freewnn-1.1.1~a021+cvs20130302/debian/changelog 2013-11-23 23:38:32.000000000 +0100
+++ freewnn-1.1.1~a021+cvs20130302/debian/changelog 2015-09-10 00:32:52.000000000 +0200
@@ -1,3 +1,11 @@
+freewnn (1.1.1~a021+cvs20130302-5) UNRELEASED; urgency=medium
+
+ * QA upload.
+ * debian/patches/egrep-a.patch: Prevent egrep from reporting "Binary file ...
+ matches" in some locales. (Closes: #797242)
+
+ -- Andreas Beckmann <anbe@debian.org> Thu, 10 Sep 2015 00:29:28 +0200
+
freewnn (1.1.1~a021+cvs20130302-4) unstable; urgency=low
* QA upload.
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/patches/egrep-a.patch freewnn-1.1.1~a021+cvs20130302/debian/patches/egrep-a.patch
--- freewnn-1.1.1~a021+cvs20130302/debian/patches/egrep-a.patch 1970-01-01 01:00:00.000000000 +0100
+++ freewnn-1.1.1~a021+cvs20130302/debian/patches/egrep-a.patch 2015-09-10 00:29:16.000000000 +0200
@@ -0,0 +1,66 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: prevent egrep from reporting "Binary file ... matches"
+
+--- a/PubdicPlus/Makefile.in
++++ b/PubdicPlus/Makefile.in
+@@ -49,7 +49,7 @@ top_builddir = ..
+ ### rm -f *.fzk *.dic *.more
+ ###
+ ### std.fzk: $(FZK_SRC)
+-### /lib/cpp $(FZK_FLAG) fzk.master | egrep -v '^(# |$$)' | $(ATOF) $@
++### /lib/cpp $(FZK_FLAG) fzk.master | egrep -a -v '^(# |$$)' | $(ATOF) $@
+ ###
+ ### full.fzk: $(FZK_SRC)
+ ### make FZK_FLAG=-DKANSAI std.fzk
+--- a/Wnn/pubdicplus/Makefile.in
++++ b/Wnn/pubdicplus/Makefile.in
+@@ -353,7 +353,7 @@ $(WNNDICS): pod $(PUBDICPLUSSRC)/pubdic.
+ $(ATOD) -h $(HINSI) $@ < $<
+
+ .fsrc.fzk:
+- egrep -v '^(# |#line |#pragma |$$)' $< | $(ATOF) -h $(HINSI) $@
++ egrep -a -v '^(# |#line |#pragma |$$)' $< | $(ATOF) -h $(HINSI) $@
+
+ $(DIC): $(HINSI)
+
+--- a/cWnn/cdic/Makefile.in
++++ b/cWnn/cdic/Makefile.in
+@@ -64,10 +64,10 @@ all:: $(ALLTGT)
+ $(DICS): $(HINSI)
+
+ $(FULL):: $(FZK_SRCS) con.master-.c
+- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
++ $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -a -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
+
+ $(FULLR):: $(FZK_SRCS) con.masterR-.c
+- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
++ $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -a -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
+
+ # To avoid circular dependency, we don't use 'con.master?.c'
+ con.master-.c: con.master
+--- a/cWnn/tdic/Makefile.in
++++ b/cWnn/tdic/Makefile.in
+@@ -64,10 +64,10 @@ all:: $(ALLTGT)
+ $(DICS): $(HINSI)
+
+ $(FULL):: $(FZK_SRCS) con.master-.c
+- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
++ $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -a -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
+
+ $(FULLR):: $(FZK_SRCS) con.masterR-.c
+- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
++ $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -a -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
+
+ # To avoid circular dependency, we don't use 'con.master?.c'
+ con.master-.c: con.master
+--- a/kWnn/kdic/Makefile.in
++++ b/kWnn/kdic/Makefile.in
+@@ -62,7 +62,7 @@ all:: $(ALLTGT)
+ $(DICS): $(HINSI)
+
+ $(FULL):: $(FZK_SRCS) fzk.master-.c
+- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
++ $(FZK_PP) -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -a -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
+
+ # To avoid circular dependency, we don't use 'fzk.master.c'
+ fzk.master-.c: fzk.master
diff -Nru freewnn-1.1.1~a021+cvs20130302/debian/patches/series freewnn-1.1.1~a021+cvs20130302/debian/patches/series
--- freewnn-1.1.1~a021+cvs20130302/debian/patches/series 2013-11-23 23:38:32.000000000 +0100
+++ freewnn-1.1.1~a021+cvs20130302/debian/patches/series 2015-09-10 00:23:00.000000000 +0200
@@ -4,3 +4,4 @@
hardening-flags
hurd_support.patch
fix-parallel-build.patch
+egrep-a.patch
Reply to: