Control: tags -1 + patch

Please see attached patch that makes sure config.h gets included
before HAVE_SYS_SYSMACROS_H is checked, so that major and minor
macros gets properly defined.

Regards,
Andreas Henriksson
diff -Nru fdutils-5.5-20060227/debian/changelog 
fdutils-5.5-20060227/debian/changelog
--- fdutils-5.5-20060227/debian/changelog       2014-05-09 06:24:48.000000000 
+0200
+++ fdutils-5.5-20060227/debian/changelog       2019-01-10 22:47:37.000000000 
+0100
@@ -1,3 +1,10 @@
+fdutils (5.5-20060227-7.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add debian/config-ftbfs.patch (Closes: #916065)
+
+ -- Andreas Henriksson <andr...@fatal.se>  Thu, 10 Jan 2019 22:47:37 +0100
+
 fdutils (5.5-20060227-7) unstable; urgency=low
 
   * Switch to debhelper 9
diff -Nru fdutils-5.5-20060227/debian/patches/config-ftbfs.patch 
fdutils-5.5-20060227/debian/patches/config-ftbfs.patch
--- fdutils-5.5-20060227/debian/patches/config-ftbfs.patch      1970-01-01 
01:00:00.000000000 +0100
+++ fdutils-5.5-20060227/debian/patches/config-ftbfs.patch      2019-01-10 
22:47:20.000000000 +0100
@@ -0,0 +1,52 @@
+--- fdutils-5.5-20060227.orig/src/Makefile.in
++++ fdutils-5.5-20060227/src/Makefile.in
+@@ -23,7 +23,7 @@ CC       = @CC@
+ PID      = -DPIDFILE=\"@localstatedir@/run/diskseekd.pid\"
+ DEFINES  = $(DEFINES) $(PID) -DSYSCONFDIR=\"@sysconfdir@\"
+ DEFS     = @DEFS@ -DSYSCONFDIR=\"@sysconfdir@\"
+-CPPFLAGS = -I. -I@srcdir@ @CPPFLAGS@ $(DEFS)
++CPPFLAGS = -I. -I@srcdir@ -I@top_srcdir@ @CPPFLAGS@ $(DEFS)
+ CFLAGS   = -Wall @CFLAGS@
+ 
+ LDFLAGS     = @LDFLAGS@
+--- fdutils-5.5-20060227.orig/src/driveprm.c
++++ fdutils-5.5-20060227/src/driveprm.c
+@@ -1,3 +1,4 @@
++#include <config.h>
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_SYSMACROS_H
+ # include <sys/sysmacros.h>
+--- fdutils-5.5-20060227.orig/src/superformat.c
++++ fdutils-5.5-20060227/src/superformat.c
+@@ -32,6 +32,7 @@ Todo:
+       cylinders as happen to work (as in 2m).  Currently, if too many 
cylinders
+       are attempted it won't fail until the very end
+  */
++#include <config.h>
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_SYSMACROS_H
+ # include <sys/sysmacros.h>
+--- fdutils-5.5-20060227.orig/src/xdfcopy.c
++++ fdutils-5.5-20060227/src/xdfcopy.c
+@@ -2,6 +2,7 @@
+  * Software patents declared unconstitutional, worldwide
+  */
+ 
++#include <config.h>
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_SYSMACROS_H
+ # include <sys/sysmacros.h>
+--- fdutils-5.5-20060227.orig/src/diskseekd.c
++++ fdutils-5.5-20060227/src/diskseekd.c
+@@ -1,3 +1,4 @@
++#include <config.h>
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_SYSMACROS_H
+ # include <sys/sysmacros.h>
+--- fdutils-5.5-20060227.orig/src/floppymeter.c
++++ fdutils-5.5-20060227/src/floppymeter.c
+@@ -1,3 +1,4 @@
++#include <config.h>
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_SYSMACROS_H
+ # include <sys/sysmacros.h>
diff -Nru fdutils-5.5-20060227/debian/patches/series 
fdutils-5.5-20060227/debian/patches/series
--- fdutils-5.5-20060227/debian/patches/series  2014-05-09 06:24:48.000000000 
+0200
+++ fdutils-5.5-20060227/debian/patches/series  2019-01-10 22:47:31.000000000 
+0100
@@ -21,3 +21,4 @@
 remove_texi2html_dependency.patch
 floppymeter-makefile_typo.patch
 documentation-faq_cleanup.patch
+config-ftbfs.patch

Reply via email to