From bfca7da0f5e261ab49c1e31c896299c00d9825aa Mon Sep 17 00:00:00 2001
From: Werner Fink <werner@suse.de>
Date: Wed, 27 Apr 2011 13:41:04 +0000
Subject: [PATCH] * Remove man-db tag for encoding for canonical man

---
 doc/Changelog      |  1 +
 man/fstab-decode.8 |  1 +
 src/Makefile       | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index d7b4261..1116bd9 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 sysvinit (2.89dsf) UNRELEASED; urgency=low
 
   [ Werner Fink ]
+  * Remove man-db tag for encoding for canonical man
   * Sulogin: try to detect the real device(s) used for the system console
     /dev/console if but only if /dev/console is used.  On Linux this can
     be more than one device, e.g. a serial line as well as a virtual
diff --git a/man/fstab-decode.8 b/man/fstab-decode.8
index ddfde18..893625a 100644
--- a/man/fstab-decode.8
+++ b/man/fstab-decode.8
@@ -1,3 +1,4 @@
+'\" -*- coding: UTF-8 -*-
 .\" A man page for fstab-decode(8).
 .\"
 .\" Copyright (C) 2006 Red Hat, Inc. All rights reserved.
diff --git a/src/Makefile b/src/Makefile
index 1ca8040..c815d09 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,6 +12,7 @@ CPPFLAGS =
 CFLAGS	?= -ansi -O2 -fomit-frame-pointer
 override CFLAGS += -W -Wall -D_GNU_SOURCE
 STATIC	=
+MANDB	:= s@^\('\\\\\"\)[^\*-]*-\*- coding: [^[:blank:]]\+ -\*-@\1@
 
 # For some known distributions we do not build all programs, otherwise we do.
 BIN	=
@@ -37,11 +38,13 @@ BIN	+= mountpoint
 SBIN	+= sulogin bootlogd
 MAN1	+= mountpoint.1
 MAN8	+= sulogin.8 bootlogd.8
+MANDB	:=
 endif
 
 ifeq ($(DISTRO),Owl)
 USRBIN	+= wall
 MAN1	+= wall.1
+MANDB	:=
 endif
 
 ifeq ($(DISTRO),SuSE)
@@ -51,6 +54,7 @@ SBIN	+= sulogin
 USRBIN	+= utmpdump
 MAN1	+= utmpdump.1 mountpoint.1
 MAN8	+= sulogin.8
+MANDB	:=
 endif
 
 ID		= $(shell id -u)
@@ -173,14 +177,17 @@ install:
 		$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
 		$(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/
 		$(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/
-		for i in $(MAN1); do \
-			$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man1/; \
+		for man in $(MAN1); do \
+			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man1/; \
+			sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man1/$$man ; \
 		done
-		for i in $(MAN5); do \
-			$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man5/; \
+		for man in $(MAN5); do \
+			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man5/; \
+			sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man5/$$man ; \
 		done
-		for i in $(MAN8); do \
-			$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man8/; \
+		for man in $(MAN8); do \
+			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man8/; \
+			sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man8/$$man ; \
 		done
 ifeq ($(ROOT),)
 		#