diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-01-08 22:28:49 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-01-08 22:28:49 +0100 |
| commit | 46e39c8e14dc98045107cfb38af8cecb8a4773b0 (patch) | |
| tree | fc51ea417acab91f22e968f1fe7e5e0eb1a23b56 /buildlib | |
| parent | 48b78442a60faf567390eab4372fe3e06c183e73 (diff) | |
* French manpage translation update
* spot & fix various typos in all manpages
* German manpage translation update
* cmdline/apt-cache.cc:
- remove translatable marker from the "%4i %s\n" string
* buildlib/po4a_manpage.mak:
- instruct debiandoc to build files with utf-8 encoding
* buildlib/tools.m4:
- fix some warning from the buildtools
* apt-pkg/acquire-item.cc:
- add configuration PDiffs::Limit-options to not download
too many or too big patches (Closes: #554349)
* debian/control:
- let all packages depend on ${misc:Depends}
* share/*-archive.gpg:
- remove the horrible outdated files. We already depend on
the keyring so we don't need to ship our own version
* cmdline/apt-key:
- errors out if wget is not installed (Closes: #545754)
- add --keyring option as we have now possibly many
* methods/gpgv.cc:
- pass all keyrings (TrustedParts) to gpgv instead of
using only one trusted.gpg keyring (Closes: #304846)
* methods/https.cc:
- finally merge the rest of the patchset from Arnaud Ebalard
with the CRL and Issuers options, thanks! (Closes: #485963)
Diffstat (limited to 'buildlib')
| -rw-r--r-- | buildlib/po4a_manpage.mak | 2 | ||||
| -rw-r--r-- | buildlib/tools.m4 | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index dfa215d29..6eec9d031 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -57,5 +57,5 @@ endif # Debian Doc SGML Documents SOURCE := $(wildcard *.$(LC).sgml) -DEBIANDOC_HTML_OPTIONS=-l $(LC) +DEBIANDOC_HTML_OPTIONS=-l $(LC).UTF-8 include $(DEBIANDOC_H) diff --git a/buildlib/tools.m4 b/buildlib/tools.m4 index d1d692331..433d5ca32 100644 --- a/buildlib/tools.m4 +++ b/buildlib/tools.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(ah_HAVE_GETCONF, +AC_DEFUN([ah_HAVE_GETCONF], [AC_ARG_WITH(getconf, [ --with-getconf Enable automagical buildtime configuration], [if test "$withval" = "yes"; then @@ -14,7 +14,7 @@ AC_DEFUN(ah_HAVE_GETCONF, ]) dnl ah_GET_CONF(variable, value ..., [default]) -AC_DEFUN(ah_GET_GETCONF, +AC_DEFUN([ah_GET_GETCONF], [AC_REQUIRE([ah_HAVE_GETCONF]) if test ! -z "$GETCONF";then old_args="[$]@" @@ -28,7 +28,7 @@ AC_DEFUN(ah_GET_GETCONF, eval $1="$3" fi ]) -AC_DEFUN(ah_NUM_CPUS, +AC_DEFUN([ah_NUM_CPUS], [AC_MSG_CHECKING([number of cpus]) AC_ARG_WITH(cpus, [ --with-cpus The number of cpus to be used for building(see --with-procs, default 1)], @@ -56,7 +56,7 @@ AC_DEFUN(ah_NUM_CPUS, AC_MSG_RESULT([$ah_NUM_CPUS_msg]) AC_SUBST(NUM_CPUS) ]) -AC_DEFUN(ah_PROC_MULTIPLY, +AC_DEFUN([ah_PROC_MULTIPLY], [AC_REQUIRE([ah_NUM_CPUS]) AC_MSG_CHECKING([processor multiplier]) AC_ARG_WITH(proc-multiply, @@ -72,7 +72,7 @@ AC_DEFUN(ah_PROC_MULTIPLY, AC_SUBST(PROC_MULTIPLY) ]) -AC_DEFUN(ah_NUM_PROCS, +AC_DEFUN([ah_NUM_PROCS], [AC_REQUIRE([ah_PROC_MULTIPLY]) AC_REQUIRE([ah_NUM_CPUS]) AC_MSG_CHECKING([number of processes to run during make]) @@ -89,7 +89,7 @@ AC_DEFUN(ah_NUM_PROCS, AC_SUBST(NUM_PROCS) ]) -AC_DEFUN(ah_GCC3DEP,[ +AC_DEFUN([ah_GCC3DEP],[ AC_MSG_CHECKING(if $CXX -MD works) touch gcc3dep.cc ${CXX-c++} -MD -o gcc3dep_test.o -c gcc3dep.cc |