From e4bc41c765f2b9fec55faa747e8330130c987678 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 14 May 2012 14:39:15 +0200 Subject: - separate manpages from the rest of the doc building - make apt and apt-utils packages depend on manpages instead of full doc --- debian/changelog | 2 ++ debian/rules | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 12097ca6f..3de297513 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,10 +6,12 @@ apt (0.9.4) UNRELEASED; urgency=low as we don't need a symbol for it as it is not in a header * Makefile, buildlib/*.mak: - reshuffle dependencies so that parallel building seems to work + - separate manpages from the rest of the doc building * prepare-release: - apt-inst version isn't apt versions, so don't override variable * debian/rules: - apt-utils packages manpages, so it should depend on build-doc + - make apt and apt-utils packages depend on manpages instead of full doc -- David Kalnischkies Fri, 11 May 2012 23:26:59 +0200 diff --git a/debian/rules b/debian/rules index fcdff9d01..7b221fc2a 100755 --- a/debian/rules +++ b/debian/rules @@ -67,7 +67,8 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) export DPKG_GENSYMBOLS_CHECK_LEVEL=0 build: build/build-stamp -build-doc: build/build-doc-stamp +build-doc: build-manpages build/build-doc-stamp +build-manpages: build/build-manpages-stamp # Note that this is unconditionally done first as part of loading environment.mak # The true is needed to force make to reload environment.mak after running @@ -97,11 +98,16 @@ else endif touch $@ -build/build-doc-stamp: build/configure-stamp +build/build-doc-stamp: build/build-manpages-stamp build/configure-stamp # Add here commands to compile the package. $(MAKE) doc touch $@ +build/build-manpages-stamp: build/configure-stamp + # Add here commands to compile the package. + $(MAKE) manpages + touch $@ + clean: dh_testdir @@ -167,7 +173,7 @@ apt-doc: build-doc binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list -apt: build build-doc +apt: build build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -231,7 +237,7 @@ libapt-pkg-dev: build debian/libapt-pkg-dev.install dh_builddeb -p$@ apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates -apt-utils: build build-doc +apt-utils: build build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ -- cgit v1.2.3