Control: + patch

The bug isn't fixed. It's still exists: https://buildd.debian.org/status/package.php?p=fbi&ver=2.07-13

I made fixed patch.

diff -Nru fbi-2.07/debian/changelog fbi-2.07/debian/changelog
--- fbi-2.07/debian/changelog   2014-06-15 18:42:02.000000000 +0200
+++ fbi-2.07/debian/changelog   2014-06-07 00:29:00.000000000 +0200
@@ -1,10 +1,3 @@
-fbi (2.07-13.1) UNRELEASED; urgency=medium
-
-  * Non-maintainer upload.
-  * Really fix build with make 4.0 (Closes: #750263)
-
- -- Mateusz Łukasik <mat...@linuxmint.pl>  Sun, 15 Jun 2014 18:41:53 +0200
-
 fbi (2.07-13) unstable; urgency=medium
 
   * Fix build with make 4.0 (Closes: #750263)
diff -Nru fbi-2.07/debian/patches/fix-build-with-make4.diff 
fbi-2.07/debian/patches/fix-build-with-make4.diff
--- fbi-2.07/debian/patches/fix-build-with-make4.diff   2014-06-15 
18:50:42.000000000 +0200
+++ fbi-2.07/debian/patches/fix-build-with-make4.diff   2014-06-07 
00:28:37.000000000 +0200
@@ -1,3 +1,5 @@
+Author: Moritz Muehlenhoff <j...@debian.org>
+
 --- fbi-2.07.orig/mk/Autoconf.mk
 +++ fbi-2.07/mk/Autoconf.mk
 @@ -161,7 +161,7 @@ config: Make.config
diff -Nru fbi-2.07/debian/patches/fix-build-with-make4.patch 
fbi-2.07/debian/patches/fix-build-with-make4.patch
--- fbi-2.07/debian/patches/fix-build-with-make4.patch  2014-06-15 
18:51:47.000000000 +0200
+++ fbi-2.07/debian/patches/fix-build-with-make4.patch  1970-01-01 
01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-Description: fix build with make 4.0
-
-Author: Mateusz Łukasik <mat...@linuxmint.pl>
-Bug-Debian: http://bugs.debian.org/750263
-
---- a/Make.config
-+++ b/Make.config
-@@ -1,4 +1,4 @@
---e LIB                := lib
-+LIB           := lib
- RESDIR                := /etc/X11
- HAVE_ENDIAN_H := yes
- HAVE_LINUX_FB_H       := yes
---- a/mk/Autoconf.mk
-+++ b/mk/Autoconf.mk
-@@ -161,7 +161,7 @@ config: Make.config
-       @true
- 
- Make.config: $(srcdir)/GNUmakefile
--      @echo -e "$(make-config-q)" > $@
-+      @echo "$(make-config-q)" > $@
-       @echo
-       @echo "Make.config written, edit if needed"
-       @echo
diff -Nru fbi-2.07/debian/patches/series fbi-2.07/debian/patches/series
--- fbi-2.07/debian/patches/series      2014-06-15 18:52:11.000000000 +0200
+++ fbi-2.07/debian/patches/series      2014-06-10 21:21:35.000000000 +0200
@@ -12,4 +12,4 @@
 enable-hardening.diff
 enable-hardening2.diff
 libgif
-fix-build-with-make4.patch
+fix-build-with-make4.diff
Description: fix build with make 4.0

Author: Mateusz Łukasik <mat...@linuxmint.pl>
Bug-Debian: http://bugs.debian.org/750263

--- a/Make.config
+++ b/Make.config
@@ -1,4 +1,4 @@
--e LIB		:= lib
+LIB		:= lib
 RESDIR		:= /etc/X11
 HAVE_ENDIAN_H	:= yes
 HAVE_LINUX_FB_H	:= yes
--- a/mk/Autoconf.mk
+++ b/mk/Autoconf.mk
@@ -161,7 +161,7 @@ config: Make.config
 	@true
 
 Make.config: $(srcdir)/GNUmakefile
-	@echo -e "$(make-config-q)" > $@
+	@echo "$(make-config-q)" > $@
 	@echo
 	@echo "Make.config written, edit if needed"
 	@echo

Reply via email to