Control: tags -1 + patch

I tried to reproduce the problem in sid, and I see it too.  The makefile
in question contain this fragment, and the typo is in the lines starting
with 'dnl':

#AM_CFLAGS = -fsigned-char

dnl sysconfrcdir = $(sysconfdir)/rc.d/init.d
dnl dist_sysconfrc_SCRIPTS = readahead_early readahead_later

dnl initdir = $(sysconfdir)/init
dnl dist_init_DATA = readahead-collector.conf readahead-disable-services.conf 
readahead.conf

# Tell versions [3.59,3.63) of GNU make to not export all variables.

The source of these lines is the scripts/Makefile.am file.  I guess
automake changed the last few years, and no longer accept m4 comments in
the Makefile.am files.

The attached patch fixes the issue by changing 'dnl' to '#' in the
makefile, thus not depending m4 for commenting out the lines, but
instead telling make to ignore them.

Should I NMU to fix it, or will you handle it yourself?  This bug will
cause readahead-fedora to disappear from Jessie in a few days, so it is
a bit urgent to fix it.

-- 
Happy hacking
Petter Reinholdtsen
diff -ur readahead-fedora-1.5.6/debian/patches/debianise.patch readahead-fedora-1.5.6-pere/debian/patches/debianise.patch
--- readahead-fedora-1.5.6/debian/patches/debianise.patch	2014-06-28 20:53:41.000000000 +0000
+++ readahead-fedora-1.5.6-pere/debian/patches/debianise.patch	2014-06-28 20:59:27.717664545 +0000
@@ -264,15 +264,15 @@
  
 -# collect on rpm database change
 -READAHEAD_COLLECT_ON_RPM="yes"
--
--# Delay these services for the readahead-collector.
--# At least "auditd" has to be delayed, for the collector
--# to run, if it is enabled on the system.
--READAHEAD_DELAY_SERVICES="auditd"
 +# enable to run readahead in the background instead of blocking
 +# useful for SSDs
 +#RUN_IN_BACKGROUND="yes"
  
+-# Delay these services for the readahead-collector.
+-# At least "auditd" has to be delayed, for the collector
+-# to run, if it is enabled on the system.
+-READAHEAD_DELAY_SERVICES="auditd"
+-
 -# Minimum memory the machine has to have (kB)
 -# to run readahead.
 -READAHEAD_MIN_MEM=393216
@@ -284,11 +284,13 @@
 ===================================================================
 --- readahead.orig/scripts/Makefile.am
 +++ readahead/scripts/Makefile.am
-@@ -9,5 +9,5 @@ dist_sysconfcron_SCRIPTS = readahead.cro
- sysconfcronmonthlydir = $(sysconfdir)/cron.monthly
- dist_sysconfcronmonthly_SCRIPTS = readahead-monthly.cron
+@@ -1,7 +1,7 @@
+ include $(top_srcdir)/config/include-Makefile.am
+ 
+-dnl sysconfrcdir = $(sysconfdir)/rc.d/init.d
+-dnl dist_sysconfrc_SCRIPTS = readahead_early readahead_later
++# sysconfrcdir = $(sysconfdir)/rc.d/init.d
++# dist_sysconfrc_SCRIPTS = readahead_early readahead_later
  
--initdir = $(sysconfdir)/init
--dist_init_DATA = readahead-collector.conf readahead-disable-services.conf readahead.conf
-+dnl initdir = $(sysconfdir)/init
-+dnl dist_init_DATA = readahead-collector.conf readahead-disable-services.conf readahead.conf
+ sysconfcrondir = $(sysconfdir)/cron.daily
+ dist_sysconfcron_SCRIPTS = readahead.cron

Reply via email to