- updated to apt 0.5.15cnc7

Changed files:
    apt-ac_fixes.patch -> 1.2
    apt-filed.patch -> 1.4
    apt-man_fixes.patch -> 1.4
    apt-pld_man.patch -> 1.4
    apt-pld_user_in_ftp_pass.patch -> 1.3

diff --git a/apt-ac_fixes.patch b/apt-ac_fixes.patch
index af981da29b5de0aee70b116c4a8ddae7dc0011e9..39236d73df9721b7ef179c0a402576e80e3142c2 100644 (file)
--- a/apt-ac_fixes.patch
+++ b/apt-ac_fixes.patch
@@ -106,10 +106,10 @@
 --- apt-0.3.19cnc52/configure.in~      Thu Aug  2 18:28:45 2001
 +++ apt-0.3.19cnc52/configure.in       Wed Aug 15 03:40:32 2001
 @@ -203,7 +203,6 @@
- dnl Check for YODL
- dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","")
+ AM_GNU_GETTEXT_VERSION([0.11.4])
+ AM_GNU_GETTEXT
  
--ah_NUM_PROCS
+-dnl ah_NUM_PROCS
  rc_GLIBC_VER
  rc_LIBSTDCPP_VER
- ah_GCC3DEP
+ dnl ah_GCC3DEP

diff --git a/apt-filed.patch b/apt-filed.patch
index 88a702197fb5350a13cfa4d3468190c15593a539..f2d0e69db6aade19424cf972485b7c3e2c7bcdb3 100644 (file)
--- a/apt-filed.patch
+++ b/apt-filed.patch
@@ -11,26 +11,26 @@
  "wahrscheinlich, dass das Paket schlichtweg nicht installierbar ist und\n"
 --- apt-0.5.5cnc3/po/es_ES.po.wiget    Thu Feb 27 17:18:58 2003
 +++ apt-0.5.5cnc3/po/es_ES.po  Thu Mar  6 17:39:08 2003
-@@ -435,7 +435,7 @@
- msgstr "el paquete simplemente no se pueda instalar y se deba informar"
- 
- #: cmdline/apt-get.cc:1383
--msgid "that package should be filed."
-+msgid "that package should be filled."
- msgstr "de un error acerca de este paquete."
+@@ -815,7 +815,7 @@
+ msgid ""
+ "Since you only requested a single operation it is extremely likely that\n"
+ "the package is simply not installable and a bug report against\n"
+-"that package should be filed."
++"that package should be filled."
+ msgstr "Como solicitó solamente una única operación, es muy probable que"
  
- #: cmdline/apt-get.cc:1386
+ #: cmdline/apt-get.cc:2099 cmdline/apt-shell.cc:2180
 --- apt-0.5.5cnc3/po/it_IT.po.wiget    Thu Feb 27 17:18:30 2003
 +++ apt-0.5.5cnc3/po/it_IT.po  Thu Mar  6 17:39:08 2003
-@@ -435,7 +435,7 @@
- msgstr "il pacchetto sia semplicemente non installabile e"
- 
- #: cmdline/apt-get.cc:1383
--msgid "that package should be filed."
-+msgid "that package should be filled."
- msgstr "che debba essere inviato un bug report per il pacchetto."
+@@ -815,7 +815,7 @@
+ msgid ""
+ "Since you only requested a single operation it is extremely likely that\n"
+ "the package is simply not installable and a bug report against\n"
+-"that package should be filed."
++"that package should be filled."
+ msgstr ""
+ "Dal momento che hai richiesto un' operazione singola è molto probabile che"
  
- #: cmdline/apt-get.cc:1386
 --- apt-0.5.5cnc3/po/pt_BR.po.wiget    Thu Feb 27 17:18:39 2003
 +++ apt-0.5.5cnc3/po/pt_BR.po  Thu Mar  6 17:39:27 2003
 @@ -606,7 +606,7 @@
@@ -45,14 +45,14 @@
 --- apt-0.5.5cnc3/po/ru.po.wiget       Thu Feb 27 17:18:46 2003
 +++ apt-0.5.5cnc3/po/ru.po     Thu Mar  6 17:39:08 2003
 @@ -1040,7 +1040,7 @@
- msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ É ÔÒÅÂÕÅÔÓÑ ÏÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ Ï ÏÛÉÂËÅ"
- 
- #: cmdline/apt-get.cc:1413
--msgid "that package should be filed."
-+msgid "that package should be filled."
- msgstr "Ó ÜÔÉÍ ÐÁËÅÔÏÍ ÒÁÚÒÁÂÏÔÞÉËÁÍ."
- 
- #: cmdline/apt-get.cc:1416
+ msgid ""
+ "Since you only requested a single operation it is extremely likely that\n"
+ "the package is simply not installable and a bug report against\n"
+-"that package should be filed."
++"that package should be filled."
+ msgstr ""
+ "ôÁË ËÁË ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ ÷ÁÛÅÇÏ ÚÁÐÒÏÓÁ ÄÏÓÔÁÔÏÞÎÏ ÏÄÎÏÊ ÏÐÅÒÁÃÉÉ, ÔÏ\n"
+ "ÓËÏÒÅÅ ×ÓÅÇÏ ÜÔÏÔ ÐÁËÅÔ ÐÒÏÓÔÏ ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ. óÏÏÂÝÉÔÅ, ÐÏÖÁÌÕÊÓÔÁ,\n"
 --- apt-0.5.5cnc3/cmdline/apt-get.cc.wiget     Thu Feb 27 17:19:29 2003
 +++ apt-0.5.5cnc3/cmdline/apt-get.cc   Thu Mar  6 17:39:08 2003
 @@ -1552,7 +1552,7 @@

diff --git a/apt-man_fixes.patch b/apt-man_fixes.patch
index 60529851cf0689c0209abb663bbc6fce80b0a688..42d743781a5d17ae1037bd5cae70e09eae395ff3 100644 (file)
--- a/apt-man_fixes.patch
+++ b/apt-man_fixes.patch
@@ -1,72 +1,3 @@
-diff -Nur apt-0.5.4cnc7.orig/doc/apt-cache.8.sgml apt-0.5.4cnc7/doc/apt-cache.8.sgml
---- apt-0.5.4cnc7.orig/doc/apt-cache.8.sgml    Thu Jul 25 20:07:18 2002
-+++ apt-0.5.4cnc7/doc/apt-cache.8.sgml Tue Dec 10 16:41:34 2002
-@@ -67,7 +67,7 @@
-      
-      <VarListEntry><Term>gencaches</Term>
-      <ListItem><Para>
--     <literal/gencaches/ performs the same opration as 
-+     <literal/gencaches/ performs the same operation as 
-      <command/apt-get check/. It builds the source and package caches from 
-      the sources in &sources-list; and from <filename>/var/lib/dpkg/status</>.
-      </VarListEntry>
-@@ -152,7 +152,7 @@
-        <listitem><para>
-        <literal/Missing/ is the number of package names that were referenced in
-        a dependency but were not provided by any package. Missing packages may 
--       be in evidence if a full distribution is not accesssed, or if a package
-+       be in evidence if a full distribution is not accessed, or if a package
-        (real or virtual) has been dropped from the distribution. Usually they
-        are referenced from Conflicts statements.
-        </listitem>
-@@ -208,7 +208,7 @@
-      <VarListEntry><Term>search</Term>
-      <ListItem><Para>
-      <literal/search/ performs a full text search on all available package 
--     files for the regex pattern given. It searchs the package names and the 
-+     files for the regex pattern given. It searches the package names and the 
-      descriptions for an occurance of the string and prints out the package 
-      name and the short description. If <option/--full/ is given then output 
-      identical to <literal/show/ is produced for each matched package and 
-@@ -230,14 +230,14 @@
-      This command prints the name of each package in the system. The optional
-      argument is a prefix match to filter the name list. The output is suitable
-      for use in a shell tab complete function and the output is generated 
--     extremly quickly. This command is best used with the 
-+     extremely quickly. This command is best used with the 
-      <option/--generate/ option.
-      </VarListEntry>
-      
-      <VarListEntry><Term>dotty</Term>
-      <ListItem><Para>
-      <literal/dotty/ takes a list of packages on the command line and 
--     gernerates output suitable for use by dotty from the 
-+     generates output suitable for use by dotty from the 
-      <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</>
-      package. The result will be a set of nodes and edges representing the 
-      relationships between the packages. By default the given packages will 
-@@ -246,10 +246,10 @@
-      <literal>APT::Cache::GivenOnly</> option.
- 
-      <para>
--     The resulting nodes will have several shapse, normal packages are boxes,
-+     The resulting nodes will have several shapes, normal packages are boxes,
-      pure provides are triangles, mixed provides are diamonds, 
-      hexagons are missing packages. Orange boxes mean recursion was stopped 
--     [leaf packages], blue lines are prre-depends, green lines are conflicts.
-+     [leaf packages], blue lines are pre-depends, green lines are conflicts.
- 
-      <para>
-      Caution, dotty cannot graph larger sets of packages.
-@@ -287,7 +287,7 @@
-      <VarListEntry><term><option/-q/</><term><option/--quiet/</>
-      <ListItem><Para>
-      Quiet; produces output suitable for logging, omitting progress indicators.
--     More qs will produce more quite up to a maximum of 2. You can also use
-+     More qs will produce more quiet up to a maximum of 2. You can also use
-      <option/-q=#/ to set the quiet level, overriding the configuration file.
-      Configuration Item: <literal/quiet/.
-      </VarListEntry>
 diff -Nur apt-0.5.4cnc7.orig/doc/apt-cdrom.8.sgml apt-0.5.4cnc7/doc/apt-cdrom.8.sgml
 --- apt-0.5.4cnc7.orig/doc/apt-cdrom.8.sgml    Tue Jul 23 19:54:52 2002
 +++ apt-0.5.4cnc7/doc/apt-cdrom.8.sgml Tue Dec 10 16:43:13 2002
@@ -179,24 +110,15 @@ diff -Nur apt-0.5.4cnc7.orig/doc/apt.conf.5.sgml apt-0.5.4cnc7/doc/apt.conf.5.sg
  
       <VarListEntry><Term>Immediate-Configure</Term>
       <ListItem><Para>
--     Disable Immedate Configuration; This dangerous option disables some
-+     Disable Immedate Configuration; this dangerous option disables some
+-     Disable Immediate Configuration; This dangerous option disables some
++     Disable Immediate Configuration; this dangerous option disables some
       of APT's ordering code to cause it to make fewer dpkg calls. Doing
       so may be necessary on some extremely slow single user systems but 
       is very dangerous and may cause package install scripts to fail or worse.
-@@ -187,7 +187,7 @@
-      meaning to use no proxies. The <envar/http_proxy/ environment variable
-      will override all settings.
-      <para>
--     Three settings are provided for cache control with HTTP/1.1 complient 
-+     Three settings are provided for cache control with HTTP/1.1 compliant 
-      proxy caches. <literal/No-Cache/ tells the proxy to not use its cached 
-      response under any circumstances, <literal/Max-Age/ is sent only for 
-      index files and tells the cache to refresh its object if it is older than 
 diff -Nur apt-0.5.4cnc7.orig/doc/apt.ent apt-0.5.4cnc7/doc/apt.ent
 --- apt-0.5.4cnc7.orig/doc/apt.ent     Tue Dec 10 16:22:06 2002
 +++ apt-0.5.4cnc7/doc/apt.ent  Tue Dec 10 16:44:47 2002
-@@ -121,14 +121,14 @@
+@@ -121,15 +121,15 @@
  
       <VarListEntry><term><option/-c/</><term><option/--config-file/</>
       <ListItem><Para>
@@ -204,12 +126,13 @@ diff -Nur apt-0.5.4cnc7.orig/doc/apt.ent apt-0.5.4cnc7/doc/apt.ent
 +     Configuration File; specify a configuration file to use. 
       The program will read the default configuration file and then this 
       configuration file. See &apt-conf; for syntax information.     
+      </Para></ListItem>
       </VarListEntry>
       
       <VarListEntry><term><option/-o/</><term><option/--option/</>
       <ListItem><Para>
--     Set a Configuration Option; This will set an arbitary configuration 
+-     Set a Configuration Option; This will set an arbitrary configuration 
 +     Set a Configuration Option; this will set an arbitrary configuration 
       option. The syntax is <option>-o Foo::Bar=bar</>.
+      </Para></ListItem>
       </VarListEntry>
- ">

diff --git a/apt-pld_man.patch b/apt-pld_man.patch
index d65855b6e94215a026e7889d7404c2374c5044be..1c4ecdbbf7d3d1b77443585863962575ddedd2ed 100644 (file)
--- a/apt-pld_man.patch
+++ b/apt-pld_man.patch
@@ -1,15 +1,3 @@
-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 @@
- </programlisting></informalexample>
-    <para>
-    In general the sample configuration file in 
--   <filename>&docdir;/examples/apt.conf</> &configureindex;
-+   <filename>&docdir;examples/apt.conf</> &configureindex;
-    is a good guide for how it should look.
-    <para>
-    Two specials are allowed, <literal/#include/ and <literal/#clear/. 
 diff -Nur apt-0.5.4cnc7.orig/doc/apt.ent apt-0.5.4cnc7/doc/apt.ent
 --- apt-0.5.4cnc7.orig/doc/apt.ent     Thu Jul 25 20:07:18 2002
 +++ apt-0.5.4cnc7/doc/apt.ent  Tue Dec 10 16:09:18 2002
@@ -27,7 +15,7 @@ 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/doc/fr/apt.ent.fr    Tue Dec 10 16:21:02 2002
 @@ -1,7 +1,7 @@
  <!-- -*- mode: sgml; mode: fold -*- -->
- <!-- translation of version 1.7 -->
+ <!-- translation of version 1.9 -->
  <!-- Some common paths.. -->
 -<!ENTITY docdir "/usr/share/doc/apt/">
 +<!ENTITY docdir "/usr/share/doc/apt*/">

diff --git a/apt-pld_user_in_ftp_pass.patch b/apt-pld_user_in_ftp_pass.patch
index 7f53bcd448dcc2bf3e20418f914106aa9e31acff..e1d5a65833c55ce5d3111e69314aa6052dfc37db 100644 (file)
--- a/apt-pld_user_in_ftp_pass.patch
+++ b/apt-pld_user_in_ftp_pass.patch
@@ -1,10 +1,10 @@
 --- apt-0.5.4cnc7/methods/ftp.cc.orig  Thu Jul 25 20:07:19 2002
 +++ apt-0.5.4cnc7/methods/ftp.cc       Tue Dec 10 20:48:50 2002
 @@ -185,7 +185,7 @@
-    
     // Setup the variables needed for authentication
     string User = "anonymous";
--   string Pass = "apt_get_ftp_2.1@debian.linux.user";
+    // CNC:2003-06-16
+-   string Pass = "apt_get_ftp_2.1@rpm.linux.user";
 +   string Pass = "apt_get_ftp@pld.linux.user";
  
     // Fill in the user/pass