From 1ee287858bb8178bcc66f0b1a02f1006656710a7 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 10 Dec 2002 15:21:51 +0000 Subject: [PATCH] - updated for 0.5.4cnc7 Changed files: apt-pld_man.patch -> 1.2 --- apt-pld_man.patch | 236 ++++++++++++++++++---------------------------- 1 file changed, 90 insertions(+), 146 deletions(-) diff --git a/apt-pld_man.patch b/apt-pld_man.patch index bba36aa..ed47f30 100644 --- a/apt-pld_man.patch +++ b/apt-pld_man.patch @@ -1,155 +1,99 @@ -diff -uNr apt-0.3.19cnc52.old/doc/apt-get.8 apt-0.3.19cnc52/doc/apt-get.8 ---- apt-0.3.19cnc52.old/doc/apt-get.8 Tue Nov 27 00:05:40 2001 -+++ apt-0.3.19cnc52/doc/apt-get.8 Tue Nov 27 00:13:47 2001 -@@ -313,7 +313,7 @@ - dselect(8), - sources\&.list(5), - apt\&.conf(5), --The APT Users Guide in /usr/doc/apt/ -+The APT Users Guide in /usr/share/doc/apt*/ - .PP - .SH "DIAGNOSTICS" - apt-get returns zero on normal operation, decimal 100 on error\&. -diff -uNr apt-0.3.19cnc52.old/doc/apt-get.8.yo apt-0.3.19cnc52/doc/apt-get.8.yo ---- apt-0.3.19cnc52.old/doc/apt-get.8.yo Tue Nov 27 00:05:40 2001 -+++ apt-0.3.19cnc52/doc/apt-get.8.yo Tue Nov 27 00:14:13 2001 -@@ -288,7 +288,7 @@ - dselect(8), - sources.list(5), - apt.conf(5), --The APT Users Guide in /usr/doc/apt/ -+The APT Users Guide in /usr/share/doc/apt*/ - - manpagediagnostics() - apt-get returns zero on normal operation, decimal 100 on error. -diff -uNr apt-0.3.19cnc52.old/doc/apt.conf.5 apt-0.3.19cnc52/doc/apt.conf.5 ---- apt-0.3.19cnc52.old/doc/apt.conf.5 Thu Jan 4 22:26:14 2001 -+++ apt-0.3.19cnc52doc/apt.conf.5 Tue Nov 27 00:20:59 2001 -@@ -42,9 +42,8 @@ - it more readable\&. Lists can be created by opening a scope an including a - single word enclosed in quotes followed by a semicolon\&. - In general the sample configuration file in --\fI/usr/doc/apt/examples/apt\&.conf\fP and --\fI/usr/doc/apt/examples/configure-index\fP --(or \fI/usr/share/doc/apt*/examples/configure-index\fP in Conectiva) -+\fI/usr/share/doc/apt*/apt\&.conf.gz\fP and -+\fI/usr/share/doc/apt*/configure-index.gz\fP - is a good guide for how it should look\&. - .PP - All of the APT tools take a -o option which allows an arbitary configuration -@@ -154,7 +153,7 @@ - by the ftp_proxy environment variable\&. To use a ftp proxy you will have to - set the ftp::ProxyLogin script in the configuration file\&. This entry - specifies the commands to send to tell the proxy server what to connect --to\&. Please see \fI/usr/doc/apt/examples/configure-index\fP for an example of how -+to\&. Please see \fI/usr/share/doc/apt*/configure-index.gz\fP for an example of how - to do this\&. The subsitution variables available are $(PROXY_USER), - $(PROXY_PASS), $(SITE_USER), $(SITE_PASS), $(SITE), and $(SITE_PORT)\&. - Each is taken from it\'s respective URI component\&. -@@ -265,8 +264,7 @@ - disable the inclusion of statfs data in CDROM IDs\&. - .PP - .SH "EXAMPLES" --\fB/usr/doc/apt/examples/configure-index\&.gz\fP or --\fB/usr/share/doc/apt*/configure-index\fP -+\fB/usr/share/doc/apt*/configure-index.gz\fP - contains a sample configuration - file showing the default values for all possible options\&. - .PP -diff -uNr apt-0.3.19cnc52.old/doc/apt.conf.5.yo apt-0.3.19cnc52/doc/apt.conf.5.yo ---- apt-0.3.19cnc52.old/doc/apt.conf.5.yo Thu Aug 10 14:42:39 2000 -+++ apt-0.3.19cnc52/doc/apt.conf.5.yo Tue Nov 27 00:20:10 2001 -@@ -33,8 +33,8 @@ - it more readable. Lists can be created by opening a scope an including a - single word enclosed in quotes followed by a semicolon. - In general the sample configuration file in --em(/usr/doc/apt/examples/apt.conf) and --em(/usr/doc/apt/examples/configure-index) -+em(/usr/share/doc/apt*/apt.conf.gz) and -+em(/usr/share/doc/apt*/configure-index.gz) +diff -Nur apt-0.5.4cnc7.orig/doc/apt-get.8 apt-0.5.4cnc7/doc/apt-get.8 +--- apt-0.5.4cnc7.orig/doc/apt-get.8 Tue Jul 23 19:54:52 2002 ++++ apt-0.5.4cnc7/doc/apt-get.8 Tue Dec 10 16:08:46 2002 +@@ -384,7 +384,7 @@ + .SH "SEE ALSO" + .PP + \fBapt-cache\fR(8), \fBapt-cdrom\fR(8), \fBdpkg\fR(8), \fBdselect\fR(8), \fB\fIsources.list\fB\fR(5), \fB\fIapt.conf\fB\fR(5), +-The APT users guide in /usr/share/doc/apt/, \fBapt_preferences\fR(5). ++The APT users guide in /usr/share/doc/apt*/, \fBapt_preferences\fR(5). + .SH "DIAGNOSTICS" + .PP + \fBapt-get\fR returns zero on normal operation, decimal 100 on error. +diff -Nur apt-0.5.4cnc7.orig/doc/apt.conf.5 apt-0.5.4cnc7/doc/apt.conf.5 +--- apt-0.5.4cnc7.orig/doc/apt.conf.5 Tue Jul 23 19:54:52 2002 ++++ apt-0.5.4cnc7/doc/apt.conf.5 Tue Dec 10 16:16:50 2002 +@@ -58,7 +58,7 @@ + .fi + .PP + In general the sample configuration file in +-\fI/usr/share/doc/apt//examples/apt.conf\fR \fI/usr/share/doc/apt/examples/configure-index.gz\fR ++\fI/usr/share/doc/apt*/examples/apt.conf\fR \fI/usr/share/doc/apt*/examples/configure-index.gz\fR is a good guide for how it should look. + .PP + Two specials are allowed, #include and #clear. +@@ -178,7 +178,7 @@ + proxy you will have to set the ftp::ProxyLogin script in the + configuration file. This entry specifies the commands to send to tell + the proxy server what to connect to. Please see +-\fI/usr/share/doc/apt/examples/configure-index.gz\fR for an example of ++\fI/usr/share/doc/apt*/examples/configure-index.gz\fR for an example of + how to do this. The subsitution variables available are + $(PROXY_USER), $(PROXY_PASS), $(SITE_USER), + $(SITE_PASS), $(SITE), and $(SITE_PORT). +@@ -329,7 +329,7 @@ + disable the inclusion of statfs data in CDROM IDs. + .SH "EXAMPLES" + .PP +-\fI/usr/share/doc/apt/examples/configure-index.gz\fR contains a ++\fI/usr/share/doc/apt*/examples/configure-index.gz\fR contains a + sample configuration file showing the default values for all possible + options. + .SH "FILES" +diff -Nur apt-0.5.4cnc7.orig/doc/apt.conf.5.sgml apt-0.5.4cnc7/doc/apt.conf.5.sgml +--- apt-0.5.4cnc7.orig/doc/apt.conf.5.sgml Thu Jul 25 20:07:18 2002 ++++ apt-0.5.4cnc7/doc/apt.conf.5.sgml Tue Dec 10 16:19:21 2002 +@@ -59,7 +59,7 @@ + + + In general the sample configuration file in +- &docdir;/examples/apt.conf &configureindex; ++ &docdir;examples/apt.conf &configureindex; + is a good guide for how it should look. + + Two specials are allowed, - All of the APT tools take a -o option which allows an arbitary configuration -@@ -146,7 +146,7 @@ - by the ftp_proxy environment variable. To use a ftp proxy you will have to - set the ftp::ProxyLogin script in the configuration file. This entry - specifies the commands to send to tell the proxy server what to connect --to. Please see em(/usr/doc/apt/examples/configure-index) for an example of how -+to. Please see em(/usr/share/doc/apt*/configure-index.gz) for an example of how - to do this. The subsitution variables available are $(PROXY_USER), - $(PROXY_PASS), $(SITE_USER), $(SITE_PASS), $(SITE), and $(SITE_PORT). - Each is taken from it's respective URI component. -@@ -263,7 +263,7 @@ - data in CDROM IDs. - - manpagesection(EXAMPLES) --bf(/usr/doc/apt/examples/configure-index.gz) contains a sample configuration -+bf(/usr/share/doc/apt*/configure-index.gz) contains a sample configuration - file showing the default values for all possible options. - - manpagesection(FILES) -diff -uNr apt-0.3.19cnc52.old/doc/pt_BR/apt-get.8 apt-0.3.19cnc52/doc/pt_BR/apt-get.8 ---- apt-0.3.19cnc52.old/doc/pt_BR/apt-get.8 Tue Nov 27 00:05:40 2001 -+++ apt-0.3.19cnc52/doc/pt_BR/apt-get.8 Tue Nov 27 00:22:40 2001 -@@ -321,7 +321,7 @@ - dselect(8), - sources\&.list(5), - apt\&.conf(5), --O guia do usuário APT em /usr/doc/apt/ -+O guia do usuário APT em /usr/share/doc/apt*/ - .PP - .SH "DIAGNOSTICS" - apt-get retorna zero em operação normal, decimal 100 em erro\&. -diff -uNr apt-0.3.19cnc52.old/doc/pt_BR/apt.conf.5 apt-0.3.19cnc52/doc/pt_BR/apt.conf.5 ---- apt-0.3.19cnc52.old/doc/pt_BR/apt.conf.5 Mon Nov 27 19:01:01 2000 -+++ apt-0.3.19cnc52/doc/pt_BR/apt.conf.5 Tue Nov 27 00:25:08 2001 -@@ -43,9 +43,9 @@ - podem ser criadas abrindo-se um escopo e incluindo uma palavra simples - encapsulada em aspas seguida por um ponto-e-vírgula\&. - Geralmente o arquivo exemplo de configuração em --\fI/usr/doc/apt/examples/apt\&.conf\fP e \fI/usr/doc/apt/examples/configure-index\fP --(ou \fI/usr/share/doc/apt*/examples/configure-index\fP no Conectiva) é --um bom guia sobre como o arquivo deve ficar. -+\fI/usr/share/doc/apt*/apt\&.conf.gz\fP e -+\fI/usr/share/doc/apt*/configure-index.gz\fP -+é um bom guia sobre como o arquivo deve ficar. - .PP - Todas as ferramentas APT usam uma opção -o que permite que uma - diretiva arbitrária de configuração seja especificada na linha de -@@ -169,7 +169,7 @@ - ftp você deverá configurar o script ftp::ProxyLogin no arquivo de - configuração\&. Esta entrada especifica os comandos a serem enviados - para dizer ao servidor proxy o que deve ser conectado aonde\&. Por --favor consulte \fI/usr/doc/apt/examples/configure-index\fP para um -+favor consulte \fI/usr/share/doc/apt*/examples/configure-index.gz\fP para um - exemplo de como fazer isso\&. As variáveis de substituição disponíveis - são $(PROXY_USER), $(PROXY_PASS), $(SITE_USER), $(SITE_PASS), $(SITE), - e $(SITE_PORT)\&. -@@ -259,8 +259,7 @@ - A maioria das opções na seção \fBdebug\fP não são interessantes ao usuário normal, entretanto, \fBDebug::pkgProblemResolver\fP mostra uma saída interessante sobre as decisões feitas por dist-upgrade\&. \fBDebug::NoLocking\fP desabilita a trava de arquivos de forma que o apt possa executar algumas operações sem ser root e \fBDebug::pkgDPkgPM\fP (ou \fBDebug::pkgRPMPM\fP) irá imprimir a linha de comando para cada chamada de dpkg\&. \fBDebug::IdentCdrom\fP irá desabilitar a inclusão de dados statfs nas IDs de CDROMs\&. - .PP - .SH "EXEMPLOS" --\fB/usr/doc/apt/examples/configure-index\&.gz\fP ou --\fB/usr/share/doc/apt*/configure-index\fP -+\fB/usr/share/doc/apt*/configure-index\&.gz\fP - contém um arquivo exemplo de configurações mostrando os valores padrão de todas as opções possíveis\&. - .PP - .SH "ARQUIVOS" ---- apt-0.3.19cnc52.old/doc/makefile Wed Nov 1 23:29:15 2000 -+++ apt-0.3.19cnc52/doc/makefile Mon Nov 26 23:59:16 2001 + +- ++ + &docdir;examples/configure-index.gz"> + /etc/apt.conf"> + +diff -Nur apt-0.5.4cnc7.orig/doc/fr/apt.ent.fr apt-0.5.4cnc7/doc/fr/apt.ent.fr +--- apt-0.5.4cnc7.orig/doc/fr/apt.ent.fr Tue Jul 23 19:54:52 2002 ++++ apt-0.5.4cnc7/doc/fr/apt.ent.fr Tue Dec 10 16:21:02 2002 +@@ -1,7 +1,7 @@ + + + +- ++ + &docdir;examples/configure-index.gz"> + /etc/apt.conf"> + +diff -Nur apt-0.5.4cnc7.orig/doc/makefile apt-0.5.4cnc7/doc/makefile +--- apt-0.5.4cnc7.orig/doc/makefile Tue Jul 23 19:54:52 2002 ++++ apt-0.5.4cnc7/doc/makefile Tue Dec 10 16:20:41 2002 @@ -1,6 +1,6 @@ # -*- make -*- BASE=.. --SUBDIR=doc doc/pt_BR -+SUBDIR=doc doc/pl doc/pt_BR +-SUBDIR=doc ++SUBDIR=doc doc/pl # Bring in the default rules include ../buildlib/defaults.mak -@@ -13,6 +13,7 @@ +@@ -13,7 +13,8 @@ # Man pages - SOURCE = apt-cache.8 apt-get.8 apt-cdrom.8 apt.conf.5 \ - sources.list.5 vendors.list.5 apt-config.8 \ -+ pl/apt-cache.8 pl/apt-get.8 pl/apt-cdrom.8 \ - pt_BR/apt-cache.8 pt_BR/apt-get.8 pt_BR/apt-cdrom.8 \ - pt_BR/apt.conf.5 pt_BR/sources.list.5 pt_BR/vendors.list.5 \ - pt_BR/apt-config.8 + SOURCE = apt-cache.8 apt-get.8 apt-cdrom.8 apt.conf.5 sources.list.5 \ + apt-config.8 apt-sortpkgs.1 apt-ftparchive.1 apt_preferences.5 \ +- apt-extracttemplates.1 vendors.list.5 ++ apt-extracttemplates.1 vendors.list.5 \ ++ pl/apt-cache.8 pl/apt-get.8 pl/apt-cdrom.8 + INCLUDES = apt.ent + include $(SGML_MANPAGE_H) + -- 2.44.0