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 --- doc/makefile | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'doc/makefile') diff --git a/doc/makefile b/doc/makefile index df2ddb25f..f52586935 100644 --- a/doc/makefile +++ b/doc/makefile @@ -11,6 +11,11 @@ SOURCE = $(wildcard *.sgml) DEBIANDOC_HTML_OPTIONS=-l en.UTF-8 include $(DEBIANDOC_H) +MANPAGEPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) +MANPAGEPOLIST = $(patsubst %,manpages-translation-%,$(MANPAGEPO)) + +doc: manpages + # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC # generate a list of accepted man page translations @@ -22,15 +27,26 @@ LOCAL := manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) # Install generation hooks -doc: $($(LOCAL)-LIST) -veryclean: veryclean/$(LOCAL) +manpages: $(MANPAGEPOLIST) $($(LOCAL)-LIST) $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< +$(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a + $(MAKE) -C $(dir $<) doc + +.PHONY: manpages dirs-manpage-subdirs $(MANPAGEPOLIST) +dirs: dirs-manpage-subdirs +dirs-manpage-subdirs: + for i in $(MANPAGEPO); do \ + test -d $$i || mkdir $$i; \ + test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ + done + # Clean rule .PHONY: veryclean/$(LOCAL) +veryclean: veryclean/$(LOCAL) veryclean/$(LOCAL): -rm -rf $($(@F)-LIST) @@ -47,12 +63,6 @@ TARGET = binary include $(COPY_H) .PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc -doc: - for i in $(shell ls po/*.po | sed -r 's#po/([a-z]+[A-Z_]*).po#\1#'); do \ - test -d $$i || mkdir $$i; \ - test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ - $(MAKE) -C $$i $@; \ - done clean: clean-subdirs veryclean: veryclean-subdirs -- cgit v1.2.3-70-g09d2 From 1c8754c2fc67e6bafd92af8cb964661e858c6f41 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 17 May 2012 22:21:03 +0200 Subject: * doc/makefile: - build manpages with the correct l10n.gentext.default.language setting to get the correct section titles provided by docbook --- buildlib/po4a_manpage.mak | 2 +- debian/changelog | 3 +++ doc/makefile | 2 ++ doc/manpage-style.xsl | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) (limited to 'doc/makefile') diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 404bb57a5..5814180d8 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -16,7 +16,7 @@ INCLUDES = apt.ent apt-verbatim.ent # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC -STYLESHEET=../manpage-style.xsl +STYLESHEET=manpage-style.xsl LOCAL := po4a-manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) diff --git a/debian/changelog b/debian/changelog index bcc29eb86..b6464388d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ apt (0.9.4) UNRELEASED; urgency=low * cmdline/apt-get.cc: - use the host architecture, not the build architecture for matching of [architecture restrictions] in Build-Depends (Closes: #672927) + * doc/makefile: + - build manpages with the correct l10n.gentext.default.language setting + to get the correct section titles provided by docbook [ Raphael Geissert ] * apt-pkg/acquire*.cc: diff --git a/doc/makefile b/doc/makefile index f52586935..76e29e2b9 100644 --- a/doc/makefile +++ b/doc/makefile @@ -42,6 +42,8 @@ dirs-manpage-subdirs: for i in $(MANPAGEPO); do \ test -d $$i || mkdir $$i; \ test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ + test -f $$i/manpage-style.xsl || sed "// i\ +" manpage-style.xsl > $$i/manpage-style.xsl; \ done # Clean rule diff --git a/doc/manpage-style.xsl b/doc/manpage-style.xsl index 85aa4521f..ef349f064 100644 --- a/doc/manpage-style.xsl +++ b/doc/manpage-style.xsl @@ -5,6 +5,7 @@ + <> -- cgit v1.2.3-70-g09d2 From 75f37d7d27c2579ddb88f852087a54934cb00c8b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 20 May 2012 18:37:14 +0200 Subject: move the creation of the manpage-style.xsl file to the rest of the manpage building instead of doing it at setup time, so we can properly depend on it --- buildlib/po4a_manpage.mak | 6 +++++- doc/makefile | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'doc/makefile') diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 5814180d8..1dedd0dcd 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -28,7 +28,11 @@ veryclean: veryclean/$(LOCAL) apt-verbatim.ent: ../apt-verbatim.ent cp ../apt-verbatim.ent . -$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) +manpage-style.xsl: ../manpage-style.xsl + sed "// i\ +" ../manpage-style.xsl > manpage-style.xsl + +$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here??? test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed diff --git a/doc/makefile b/doc/makefile index 76e29e2b9..4c0a431fd 100644 --- a/doc/makefile +++ b/doc/makefile @@ -29,7 +29,7 @@ $(LOCAL)-LIST := $(SOURCE) # Install generation hooks manpages: $(MANPAGEPOLIST) $($(LOCAL)-LIST) -$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) +$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< @@ -42,8 +42,6 @@ dirs-manpage-subdirs: for i in $(MANPAGEPO); do \ test -d $$i || mkdir $$i; \ test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ - test -f $$i/manpage-style.xsl || sed "// i\ -" manpage-style.xsl > $$i/manpage-style.xsl; \ done # Clean rule -- cgit v1.2.3-70-g09d2 From 1c46aec47a9059d308e21391a8b8e92bd1c41737 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 21 May 2012 15:13:05 +0200 Subject: apply the correct metadata (package, version, mail) to all pot and po files --- buildlib/config.h.in | 3 +++ buildlib/environment.mak.in | 1 + configure.in | 3 +++ doc/makefile | 10 +++++++--- po/makefile | 6 +++--- 5 files changed, 17 insertions(+), 6 deletions(-) (limited to 'doc/makefile') diff --git a/buildlib/config.h.in b/buildlib/config.h.in index b07d4f77f..656705038 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -51,4 +51,7 @@ /* The version number string */ #undef PACKAGE_VERSION +/* The mail address to reach upstream */ +#undef PACKAGE_MAIL + #define APT_8_CLEANER_HEADERS diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index 0f0fac095..7ceae70ce 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -3,6 +3,7 @@ PACKAGE = @PACKAGE@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_MAIL = @PACKAGE_MAIL@ # C++ compiler options CC = @CC@ diff --git a/configure.in b/configure.in index 2800fd2f3..f98f288b1 100644 --- a/configure.in +++ b/configure.in @@ -19,10 +19,13 @@ AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildli PACKAGE="apt" PACKAGE_VERSION="0.9.4" +PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") +AC_DEFINE_UNQUOTED(PACKAGE_MAIL,"$PACKAGE_MAIL") AC_SUBST(PACKAGE) AC_SUBST(PACKAGE_VERSION) +AC_SUBST(PACKAGE_MAIL) dnl Check the archs, we want the target type. AC_CANONICAL_SYSTEM diff --git a/doc/makefile b/doc/makefile index 4c0a431fd..d9542b438 100644 --- a/doc/makefile +++ b/doc/makefile @@ -83,14 +83,18 @@ ifdef PO4A doc: po4a update-po: - po4a --previous --no-backups --force --no-translations po4a.conf + po4a --previous --no-backups --force --no-translations \ + --package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \ + --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf po4a: - po4a --previous --no-backups po4a.conf + po4a --previous --no-backups \ + --package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \ + --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf endif stats: - for i in po/*.po; do echo -n "$$i: "; msgfmt --statistics $$i; done + for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done ifdef DOXYGEN DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) ) diff --git a/po/makefile b/po/makefile index 46b75ff4f..ebf6c06d0 100644 --- a/po/makefile +++ b/po/makefile @@ -61,7 +61,7 @@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po cp $@ $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo stats: - for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done + for i in *.pot *.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done binary: $(POTFILES) $(MOFILES) @@ -69,8 +69,8 @@ $(PACKAGE)-all.pot: $(POTFILES) # we create our partial pot files without a header to avoid changing dates in *.mo files, # but we want a header for our master-pot file, so we use a dummy pot with nothing but the header $(XGETTEXT) --default-domain=$(PO)/$(PACKAGE)-dummy.pot --foreign --language=c \ - -o $(PO)/$(PACKAGE)-dummy.pot --force-po --package-name=$(PACKAGE) \ - --package-version=$(PACKAGE_VERSION) --msgid-bugs-address=deity@lists.debian.org /dev/null + -o $(PO)/$(PACKAGE)-dummy.pot --force-po --package-name='$(PACKAGE)' \ + --package-version='$(PACKAGE_VERSION)' --msgid-bugs-address='$(PACKAGE_MAIL)' /dev/null $(MSGCOMM) --more-than=0 $(PO)/$(PACKAGE)-dummy.pot $(POTFILES) --output=$(PACKAGE)-all.pot rm -f $(PO)/$(PACKAGE)-dummy.pot -- cgit v1.2.3-70-g09d2 From aec2216091b3d70b3baa5a5b8c87ce208e35c19c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 23 May 2012 18:00:32 +0200 Subject: * doc/*.xml: - mark even more stuff as untranslateable and improve the markup here and there (no real text change) --- debian/changelog | 3 + doc/apt-cache.8.xml | 4 +- doc/apt-cdrom.8.xml | 5 +- doc/apt-config.8.xml | 2 +- doc/apt-ftparchive.1.xml | 14 +- doc/apt-mark.8.xml | 9 +- doc/apt-verbatim.ent | 12 ++ doc/apt.ent | 4 +- doc/makefile | 4 +- doc/po/apt-doc.pot | 390 +++++++++++++----------------------- doc/po/de.po | 502 ++++++++++++++++++----------------------------- doc/po4a.conf | 9 +- doc/sources.list.5.xml | 25 ++- 13 files changed, 385 insertions(+), 598 deletions(-) (limited to 'doc/makefile') diff --git a/debian/changelog b/debian/changelog index 3c43f6589..d416dc83e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ apt (0.9.6) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.cc: - dup() given compressed fd in OpenDescriptor if AutoClose is disabled as otherwise gzclose() and co will close it + * doc/*.xml: + - mark even more stuff as untranslateable and improve the + markup here and there (no real text change) -- David Kalnischkies Tue, 22 May 2012 18:13:19 +0200 diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index f36347107..1429af185 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -168,9 +168,7 @@ Reverse Provides: search performs a full text search on all available package - lists for the POSIX regex pattern given, see - regex - 7. + lists for the POSIX regex pattern given, see ®ex;. It searches the package names and the descriptions for an occurrence of the regular expression and prints out the package name and the short description, including virtual package diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index 501c4ee7e..dee42c1b1 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -49,8 +49,8 @@ Unless the , or option is - given one of the commands below must be present. - + given, one of the commands below must be present. + add is used to add a new disc to the @@ -75,7 +75,6 @@ - Options diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml index a8fb897ef..134c8b086 100644 --- a/doc/apt-config.8.xml +++ b/doc/apt-config.8.xml @@ -42,7 +42,7 @@ manner that is easy to use by scripted applications. Unless the , or option is - given one of the commands below must be present. + given, one of the commands below must be present. diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 028d9f70e..06d794a19 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -51,8 +51,8 @@ programs aside from &gzip;. When doing a full generate it automatically performs file-change checks and builds the desired compressed output files. - Unless the , or option is given one of the - commands below must be present. + Unless the , or option is given, + one of the commands below must be present. @@ -141,7 +141,7 @@ The generate configuration has 4 separate sections, each described below. - Dir Section + <literal>Dir</literal> Section The Dir section defines the standard directories needed to locate the files required during the generation process. These @@ -173,7 +173,7 @@ - Default Section + <literal>Default</literal> Section The Default section specifies default values, and settings that control the operation of the generator. Other sections may override @@ -239,7 +239,7 @@ - TreeDefault Section + <literal>TreeDefault</literal> Section Sets defaults specific to Tree sections. All of these variables are substitution variables and have the strings $(DIST), @@ -339,7 +339,7 @@ - Tree Section + <literal>Tree</literal> Section The Tree section defines a standard Debian file tree which consists of a base directory, then multiple sections in that base @@ -407,7 +407,7 @@ for i in Sections do - BinDirectory Section + <literal>BinDirectory</literal> Section The bindirectory section defines a binary directory tree with no special structure. The scope tag specifies the location of diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index 3b2b43c24..fcded2bf4 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -109,12 +109,11 @@ - - + + Read/Write package stats from the filename given with the parameter - &synopsis-filename; - instead of from the default location, which + &synopsis-param-filename; instead of from the default location, which is extended_status in the directory defined by the Configuration Item: Dir::State. @@ -130,7 +129,7 @@ See Also - &apt-get;,&aptitude;,&apt-conf; + &apt-get;,&aptitude;,&apt-conf; Diagnostics diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index a44f37ab8..ff37f4ae7 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -154,6 +154,18 @@ " > + + apt-transport-debtorrent + 1 + " +> + + + regex + 7 + " +> + diff --git a/doc/apt.ent b/doc/apt.ent index ea1dc0265..6a3837b95 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -103,7 +103,7 @@ &cachedir;/archives/partial/ Storage area for package files in transit. - Configuration Item: Dir::Cache::Archives (partial will be implicitly appended). + Configuration Item: Dir::Cache::Archives (partial will be implicitly appended) "> @@ -144,7 +144,7 @@ &statedir;/lists/partial/ Storage area for state information in transit. - Configuration Item: Dir::State::Lists (partial will be implicitly appended). + Configuration Item: Dir::State::Lists (partial will be implicitly appended) "> diff --git a/doc/makefile b/doc/makefile index d9542b438..7b49ac269 100644 --- a/doc/makefile +++ b/doc/makefile @@ -84,12 +84,12 @@ doc: po4a update-po: po4a --previous --no-backups --force --no-translations \ - --package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \ + --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf po4a: po4a --previous --no-backups \ - --package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \ + --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf endif diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 377e83429..38689d28d 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE # Copyright (C) YEAR Free Software Foundation, Inc. -# This file is distributed under the same license as the apt package. +# This file is distributed under the same license as the apt-doc package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 0.9.5\n" +"Project-Id-Version: apt-doc 0.9.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-05-22 16:30+0300\n" +"POT-Creation-Date: 2012-05-23 17:06+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -309,7 +309,7 @@ msgid "" " Storage area for package files in transit.\n" " Configuration Item: Dir::Cache::Archives " "(partial will be implicitly " -"appended). \n" +"appended)\n" " \n" "\">\n" msgstr "" @@ -391,7 +391,7 @@ msgid "" " Storage area for state information in transit.\n" " Configuration Item: Dir::State::Lists " "(partial will be implicitly " -"appended).\n" +"appended)\n" " \n" "\">\n" msgstr "" @@ -635,7 +635,7 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:44 apt-get.8.xml:44 +#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44 apt-ftparchive.1.xml:54 apt-get.8.xml:44 msgid "" "Unless the , or option is given, " "one of the commands below must be present." @@ -649,7 +649,7 @@ msgid "" msgstr "" #. type: Content of: