merged -r1901..1911 from lp:~donkult/apt/sid

7 files changed, 3 insertions, 195 deletions

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 5373ee5cf..bf93bd2ee 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -81,10 +81,7 @@ MANPAGE_H = $(BASE)/buildlib/manpage.mak
 PROGRAM_H = $(BASE)/buildlib/program.mak
 PYTHON_H = $(BASE)/buildlib/python.mak
 COPY_H = $(BASE)/buildlib/copy.mak
-YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak
-SGML_MANPAGE_H = $(BASE)/buildlib/sgml_manpage.mak
 PO4A_MANPAGE_H = $(BASE)/buildlib/po4a_manpage.mak
-XML_MANPAGE_H = $(BASE)/buildlib/xml_manpage.mak
 FAIL_H = $(BASE)/buildlib/fail.mak
 PODOMAIN_H = $(BASE)/buildlib/podomain.mak
 
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index b3afca0ad..fdac3e6c3 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -9,8 +9,6 @@ CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -Wall
 CXX = @CXX@
 CXXFLAGS+= @CXXFLAGS@
 NUM_PROCS = @NUM_PROCS@
-GLIBC_VER = @GLIBC_VER@
-LIBSTDCPP_VER = @LIBSTDCPP_VER@
 
 # Linker stuff
 PICFLAGS+= -fPIC -DPIC
@@ -30,13 +28,7 @@ DEBIANDOC_TEXT = @DEBIANDOC_TEXT@
 
 DOXYGEN = @DOXYGEN@
 
-# SGML for the man pages
-DOCBOOK2MAN := @DOCBOOK2MAN@
-
-# XML for the man pages
-XMLTO := @XMLTO@
-
-# po4a for the man pages
+# xsltproc for the man pages
 XSLTPROC := @XSLTPROC@
 
 # po4a for the man pages
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 3d90c6ba4..dfa215d29 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -35,7 +35,8 @@ $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
 .PHONY: veryclean/$(LOCAL)
 veryclean/$(LOCAL):
 	-rm -rf $($(@F)-LIST) apt.ent apt.$(LC).8 \
-		$(addsuffix .xml,$($(@F)-LIST))
+		$(addsuffix .xml,$($(@F)-LIST)) \
+		offline.$(LC).sgml guide.$(LC).sgml
 
 HAVE_PO4A=yes
 endif
diff --git a/buildlib/sgml_manpage.mak b/buildlib/sgml_manpage.mak
deleted file mode 100644
index 5fcb75c46..000000000
--- a/buildlib/sgml_manpage.mak
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- make -*-
-
-# This handles man pages in DocBook SGMLL format. We convert to the respective
-# output in the source directory then copy over to the final dest. This
-# means yodl is only needed if compiling from CVS
-
-# Input
-# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8
-#             the sgml files are called apt-cache.8.sgml
-
-# See defaults.mak for information about LOCAL
-
-# Some local definitions
-ifdef DOCBOOK2MAN
-
-LOCAL := sgml-manpage-$(firstword $(SOURCE))
-$(LOCAL)-LIST := $(SOURCE)
-
-# Install generation hooks
-doc: $($(LOCAL)-LIST)
-veryclean: veryclean/$(LOCAL)
-
-$($(LOCAL)-LIST) :: % : %.sgml $(INCLUDES)
-	echo Creating man page $@
-	$(DOCBOOK2MAN) $<
-
-# Clean rule
-.PHONY: veryclean/$(LOCAL)
-veryclean/$(LOCAL):
-	-rm -rf $($(@F)-LIST)
-
-HAVE_SGML=yes
-endif
-
-INCLUDES :=
-
-ifndef HAVE_SGML
-# Strip from the source list any man pages we dont have compiled already
-SOURCE := $(wildcard $(SOURCE))
-endif
-
-# Chain to the manpage rule
-ifneq ($(words $(SOURCE)),0)
-include $(MANPAGE_H)
-endif
diff --git a/buildlib/tools.m4 b/buildlib/tools.m4
index 9a8d744f2..d1d692331 100644
--- a/buildlib/tools.m4
+++ b/buildlib/tools.m4
@@ -89,56 +89,6 @@ AC_DEFUN(ah_NUM_PROCS,
 	AC_SUBST(NUM_PROCS)
 ])
 
-AC_DEFUN(rc_GLIBC_VER,
-	[AC_MSG_CHECKING([glibc version])
-	AC_CACHE_VAL(ac_cv_glibc_ver,
-	dummy=if$$
-	cat <<_GLIBC_>$dummy.c
-#include <features.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) { printf("libc6.%d",__GLIBC_MINOR__); exit(0); }
-_GLIBC_
-	${CC-cc} $dummy.c -o $dummy > /dev/null 2>&1
-	if test "$?" = 0; then
-		GLIBC_VER=`./$dummy`
-		AC_MSG_RESULT([$GLIBC_VER])
-		ac_cv_glibc_ver=$GLIBC_VER
-	else
-		AC_MSG_WARN([cannot determine GNU C library minor version number])
-	fi
-	rm -f $dummy $dummy.c
-	)
-	GLIBC_VER="-$ac_cv_glibc_ver"
-	AC_SUBST(GLIBC_VER)
-])
-
-AC_DEFUN(rc_LIBSTDCPP_VER,
-	[AC_MSG_CHECKING([libstdc++ version])
-	dummy=if$$
-	cat <<_LIBSTDCPP_>$dummy.cc
-#include <features.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) { exit(0); }
-_LIBSTDCPP_
-	${CXX-c++} $dummy.cc -o $dummy > /dev/null 2>&1
-
-	if test "$?" = 0; then
-		soname=`objdump -p ./$dummy |grep NEEDED|grep libstd`
-                LIBSTDCPP_VER=`echo $soname | sed -e 's/.*NEEDED.*libstdc++\(-libc.*\(-.*\)\)\?.so.\(.*\)/\3\2/'`
-	fi
-	rm -f $dummy $dummy.cc
-
-	if test -z "$LIBSTDCPP_VER"; then
-		AC_MSG_WARN([cannot determine standard C++ library version number])
-	else
-		AC_MSG_RESULT([$LIBSTDCPP_VER])
-		LIBSTDCPP_VER="-$LIBSTDCPP_VER"
-	fi
-	AC_SUBST(LIBSTDCPP_VER)
-])
-
 AC_DEFUN(ah_GCC3DEP,[
 	AC_MSG_CHECKING(if $CXX -MD works)
 	touch gcc3dep.cc
diff --git a/buildlib/xml_manpage.mak b/buildlib/xml_manpage.mak
deleted file mode 100644
index c8b155d09..000000000
--- a/buildlib/xml_manpage.mak
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- make -*-
-
-# This handles man pages in DocBook XML format. We convert to the respective
-# output in the source directory then copy over to the final dest. This
-# means xmlto is only needed if compiling from Arch
-
-# Input
-# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8
-#             the XML files are called apt-cache.8.xml
-
-# See defaults.mak for information about LOCAL
-
-# Some local definitions
-ifdef XMLTO
-
-LOCAL := xml-manpage-$(firstword $(SOURCE))
-$(LOCAL)-LIST := $(SOURCE)
-
-# Install generation hooks
-doc: $($(LOCAL)-LIST)
-veryclean: veryclean/$(LOCAL)
-
-$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
-	echo Creating man page $@
-	$(XMLTO) man $<
-
-# Clean rule
-.PHONY: veryclean/$(LOCAL)
-veryclean/$(LOCAL):
-	-rm -rf $($(@F)-LIST)
-
-HAVE_XMLTO=yes
-endif
-
-INCLUDES :=
-
-ifndef HAVE_XMLTO
-# Strip from the source list any man pages we dont have compiled already
-SOURCE := $(wildcard $(SOURCE))
-endif
-
-# Chain to the manpage rule
-ifneq ($(words $(SOURCE)),0)
-include $(MANPAGE_H)
-endif
diff --git a/buildlib/yodl_manpage.mak b/buildlib/yodl_manpage.mak
deleted file mode 100644
index a5f436f60..000000000
--- a/buildlib/yodl_manpage.mak
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- make -*-
-
-# This handles man pages in YODL format. We convert to the respective
-# output in the source directory then copy over to the final dest. This
-# means yodl is only needed if compiling from CVS
-
-# Input
-# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8
-#             the yodl files are called apt-cache.8.yo
-
-# See defaults.mak for information about LOCAL
-
-# Some local definitions
-ifdef YODL_MAN
-
-LOCAL := yodl-manpage-$(firstword $(SOURCE))
-$(LOCAL)-LIST := $(SOURCE)
-
-# Install generation hooks
-doc: $($(LOCAL)-LIST)
-veryclean: veryclean/$(LOCAL)
-
-$($(LOCAL)-LIST) :: % : %.yo
-	echo Creating man page $@
-	yodl2man -o $@ $<
-
-# Clean rule
-.PHONY: veryclean/$(LOCAL)
-veryclean/$(LOCAL):
-	-rm -rf $($(@F)-LIST)
-
-else
-
-# Strip from the source list any man pages we dont have compiled already
-SOURCE := $(wildcard $(SOURCE))
-
-endif
-
-# Chain to the manpage rule
-ifneq ($(words $(SOURCE)),0)
-include $(MANPAGE_H)
-endif