[Pkg-shadow-commits] r700 - trunk/debian/patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-12-14 19:43:55 +0000 (Wed, 14 Dec 2005)
New Revision: 700

Removed:
   trunk/debian/patches/448_enable_man
Modified:
   trunk/debian/patches/series
Log:
Remove 448, which is already applied.


Deleted: trunk/debian/patches/448_enable_man
===================================================================
--- trunk/debian/patches/448_enable_man	2005-12-14 19:43:09 UTC (rev 699)
+++ trunk/debian/patches/448_enable_man	2005-12-14 19:43:55 UTC (rev 700)
@@ -1,37 +0,0 @@
-Goal: permit the man pages generation from the XML files.
-
-Status wrt upstream: applied in 4.0.14
-
-Note: man pages are better with docbook-xsl 1.69.1
-The current version in Debian is 1.68.1. I noticed these differences:
-  * The extra inforamtion (date and User Commands) are not displayed in
-    the headers and footers.
-
-Index: shadow-4.0.13/configure.in
-===================================================================
---- shadow-4.0.13.orig/configure.in	2005-10-04 08:07:11.639959261 +0200
-+++ shadow-4.0.13/configure.in	2005-10-04 08:07:39.450292761 +0200
-@@ -263,6 +263,23 @@
- fi
- AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno)
- 
-+if test "$enable_man" = "yes"; then
-+	dnl
-+	dnl Check for xsltproc
-+	dnl
-+	AC_PATH_PROG([XSLTPROC], [xsltproc])
-+	if test -z "$XSLTPROC"; then
-+		enable_man=no
-+	fi
-+
-+	dnl check for DocBook DTD and stylesheets in the local catalog.
-+	JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
-+		[DocBook XML DTD V4.1.2], [], enable_man=no)
-+	JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
-+		[DocBook XSL Stylesheets], [], enable_man=no)
-+fi
-+AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno)
-+
- AC_SUBST(LIBCRYPT)
- AC_CHECK_LIB(crypt, crypt, [LIBCRYPT=-lcrypt],
- 	[AC_MSG_ERROR([crypt() not found])])

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-12-14 19:43:09 UTC (rev 699)
+++ trunk/debian/patches/series	2005-12-14 19:43:55 UTC (rev 700)
@@ -37,7 +37,6 @@
 423_su_arguments_are_concatenated
 426_grpck_group-gshadow_members_consistency
 542_useradd-O_option
-448_enable_man
 451_login_PATH
 452_doc_password_check_order
 454_userdel_no_MAIL_FILE