Merge branch '3.05'

doc/Changelog

@@ -1,3 +1,14 @@
+sysvinit (3.05) unreleased; urgency=low
+    * Helge Kreutzmann provided updated Makefile for
+      translation of manual pages. This has been added
+      to the man directory.
+    * Added sys/sysmacros.h include in mountpoint.c to fix
+      compiler errors on systems where major/minor macros were not defined.
+    * Applied patches from Mark Hindley to clean up man page
+      Makefile, translations and installs of new man pages.
+    * Remove reliance on linux/fs.h as it conflicts with glibc 2.36.
+      Patch provided by lucascars.
+
 sysvinit (3.04) released; urgency=low
     * Mark Hindley supplied patch to make bootlogd compile
       on GNU Hurd systems. Was missing major/minor macro.

man/Makefile

@@ -3,11 +3,26 @@ killall5.8 last.1 lastb.1 logsave.8 mesg.1 mountpoint.1 pidof.8 poweroff.8 \
 readbootlog.1 reboot.8 runlevel.8 shutdown.8 sulogin.8 telinit.8 utmpdump.1 \
 wall.1
 
-all install:
+PO4A := $(shell command -v po4a 2> /dev/null)
+
+PO4A_OPTS = --previous --srcdir po/ --destdir ./ --no-backups --stamp \
+            --package-name sysvinit --package-version $(VERSION) \
+            --msgid-bugs-address "Jesse <jsmith@resonatingmedia.com>"
+
+all:
 	sed --in-place=.orig --separate 's/\@VERSION\@/$(VERSION)/g' $(MANPAGES)
+ifdef PO4A
+	po4a $(PO4A_OPTS) po/po4a.cfg
+else
+	@echo 'Install po4a to build translated manpages'
+endif
+
+# Installation recipes are in ../src/Makefile
+install: all
 
 clean distclean:
 	for man in $(MANPAGES) ; do \
 	   if [ -f "$$man.orig" ] ; then mv "$$man.orig" "$$man" ; fi \
 	done
+	for lang in $(LANGUAGES) ; do rm -rf "$$lang" "$$lang.po" ; done