1 diff -Nur apt-0.3.19cnc50.orig/apt-pkg/init.cc apt-0.3.19cnc50/apt-pkg/init.cc
2 --- apt-0.3.19cnc50.orig/apt-pkg/init.cc Tue Jun 26 05:51:24 2001
3 +++ apt-0.3.19cnc50/apt-pkg/init.cc Tue Aug 14 23:59:37 2001
5 Cnf.Set("APT::Architecture",ARCHITECTURE);
8 - Cnf.Set("Dir::State","/var/state/apt/");
9 + Cnf.Set("Dir::State","/var/lib/apt/");
10 Cnf.Set("Dir::State::lists","lists/");
12 /* These really should be jammed into a generic 'Local Database' engine
13 diff -Nur apt-0.3.19cnc50.orig/doc/apt-cache.8 apt-0.3.19cnc50/doc/apt-cache.8
14 --- apt-0.3.19cnc50.orig/doc/apt-cache.8 Thu Jan 4 22:26:14 2001
15 +++ apt-0.3.19cnc50/doc/apt-cache.8 Tue Aug 14 23:55:55 2001
20 -2\&.1-12(/var/state/apt/lists/debian\&.midco\&.net_debian_dists_slink_main_binary-i386_Packages),
21 +2\&.1-12(/var/lib/apt/lists/debian\&.midco\&.net_debian_dists_slink_main_binary-i386_Packages),
26 locations to fetch packages from
29 -/var/state/apt/lists/
31 storage area for state information for each package resource specified in
34 -/var/state/apt/lists/partial/
35 +/var/lib/apt/lists/partial/
36 storage area for state information in transit
39 diff -Nur apt-0.3.19cnc50.orig/doc/apt-cache.8.yo apt-0.3.19cnc50/doc/apt-cache.8.yo
40 --- apt-0.3.19cnc50.orig/doc/apt-cache.8.yo Thu Aug 10 14:42:39 2000
41 +++ apt-0.3.19cnc50/doc/apt-cache.8.yo Tue Aug 14 23:56:18 2001
46 -2.1-12(/var/state/apt/lists/debian.midco.net_debian_dists_slink_main_binary-i386_Packages),
47 +2.1-12(/var/lib/apt/lists/debian.midco.net_debian_dists_slink_main_binary-i386_Packages),
52 it() /etc/apt/sources.list
53 locations to fetch packages from
55 - it() /var/state/apt/lists/
56 + it() /var/lib/apt/lists/
57 storage area for state information for each package resource specified in
59 - it() /var/state/apt/lists/partial/
60 + it() /var/lib/apt/lists/partial/
61 storage area for state information in transit
64 diff -Nur apt-0.3.19cnc50.orig/doc/apt-cdrom.8 apt-0.3.19cnc50/doc/apt-cdrom.8
65 --- apt-0.3.19cnc50.orig/doc/apt-cdrom.8 Thu Oct 26 18:22:51 2000
66 +++ apt-0.3.19cnc50/doc/apt-cdrom.8 Tue Aug 14 23:56:55 2001
68 directory you will be prompted for a descriptive title\&.
70 APT uses a CDROM ID to track which disc is currently in the drive and
71 -maintains a database of these IDs in \fB/var/state/apt/cdroms\&.list\fP
72 +maintains a database of these IDs in \fB/var/lib/apt/cdroms\&.list\fP
77 locations to fetch packages from
80 -/var/state/apt/lists/
82 storage area for state information for each package resource specified in
85 -/var/state/apt/lists/partial/
86 +/var/lib/apt/lists/partial/
87 storage area for state information in transit
90 -/var/state/apt/cdroms\&.list
91 +/var/lib/apt/cdroms\&.list
92 list of cdrom IDs and names\&.
95 diff -Nur apt-0.3.19cnc50.orig/doc/apt-cdrom.8.yo apt-0.3.19cnc50/doc/apt-cdrom.8.yo
96 --- apt-0.3.19cnc50.orig/doc/apt-cdrom.8.yo Thu Aug 10 14:42:39 2000
97 +++ apt-0.3.19cnc50/doc/apt-cdrom.8.yo Tue Aug 14 23:57:14 2001
99 directory you will be prompted for a descriptive title.
101 APT uses a CDROM ID to track which disc is currently in the drive and
102 -maintains a database of these IDs in bf(/var/state/apt/cdroms.list)
103 +maintains a database of these IDs in bf(/var/lib/apt/cdroms.list)
108 it() /etc/apt/sources.list
109 locations to fetch packages from
111 - it() /var/state/apt/lists/
112 + it() /var/lib/apt/lists/
113 storage area for state information for each package resource specified in
115 - it() /var/state/apt/lists/partial/
116 + it() /var/lib/apt/lists/partial/
117 storage area for state information in transit
119 - it() /var/state/apt/cdroms.list
120 + it() /var/lib/apt/cdroms.list
121 list of cdrom IDs and names.
124 diff -Nur apt-0.3.19cnc50.orig/doc/apt-get.8 apt-0.3.19cnc50/doc/apt-get.8
125 --- apt-0.3.19cnc50.orig/doc/apt-get.8 Wed Nov 1 22:32:28 2000
126 +++ apt-0.3.19cnc50/doc/apt-get.8 Tue Aug 14 23:57:34 2001
128 .IP "\fB--list-cleanup\fP"
129 This option defaults to on, use \fB--no-list-cleanup\fP to turn it off\&.
130 When on apt-get will automatically manage the contents of
131 -/var/state/apt/lists to ensure that obsolete files are erased\&. The only
132 +/var/lib/apt/lists to ensure that obsolete files are erased\&. The only
133 reason to turn it off is if you frequently change your source list\&.
134 Configuration Item: \fBAPT::Get::List-Cleanup\fP
136 @@ -299,12 +299,12 @@
137 storage area for package files in transit
140 -/var/state/apt/lists/
142 storage area for state information for each package resource specified in
146 -/var/state/apt/lists/partial/
147 +/var/lib/apt/lists/partial/
148 storage area for state information in transit
151 diff -Nur apt-0.3.19cnc50.orig/doc/apt-get.8.yo apt-0.3.19cnc50/doc/apt-get.8.yo
152 --- apt-0.3.19cnc50.orig/doc/apt-get.8.yo Thu Aug 10 14:42:39 2000
153 +++ apt-0.3.19cnc50/doc/apt-get.8.yo Tue Aug 14 23:57:50 2001
155 dit(bf(--list-cleanup))
156 This option defaults to on, use bf(--no-list-cleanup) to turn it off.
157 When on apt-get will automatically manage the contents of
158 -/var/state/apt/lists to ensure that obsolete files are erased. The only
159 +/var/lib/apt/lists to ensure that obsolete files are erased. The only
160 reason to turn it off is if you frequently change your source list.
161 Configuration Item: bf(APT::Get::List-Cleanup)
163 @@ -274,11 +274,11 @@
164 it() /var/cache/apt/archives/partial/
165 storage area for package files in transit
167 - it() /var/state/apt/lists/
168 + it() /var/lib/apt/lists/
169 storage area for state information for each package resource specified in
172 - it() /var/state/apt/lists/partial/
173 + it() /var/lib/apt/lists/partial/
174 storage area for state information in transit
177 diff -Nur apt-0.3.19cnc50.orig/doc/examples/configure-index apt-0.3.19cnc50/doc/examples/configure-index
178 --- apt-0.3.19cnc50.orig/doc/examples/configure-index Thu Jan 4 22:26:14 2001
179 +++ apt-0.3.19cnc50/doc/examples/configure-index Tue Aug 14 23:59:24 2001
183 // Location of the state dir
184 - State "/var/state/apt/"
185 + State "/var/lib/apt/"
189 diff -Nur apt-0.3.19cnc50.orig/doc/files.sgml apt-0.3.19cnc50/doc/files.sgml
190 --- apt-0.3.19cnc50.orig/doc/files.sgml Thu Aug 10 14:42:39 2000
191 +++ apt-0.3.19cnc50/doc/files.sgml Tue Aug 14 23:58:13 2001
194 The var directory structure is as follows:
205 -As is specified in the FHS 2.0 /var/state/apt is used for application
206 +As is specified in the FHS 2.2 /var/lib/apt is used for application
207 data that is not expected to be user modified. /var/cache/apt is used
208 for regeneratable data and is where the package cache and downloaded .debs
210 @@ -183,10 +183,10 @@
213 http://www.debian.org/archive/dists/stable/binary-i386/Packages
214 -/var/state/apt/lists/www.debian.org_archive_dists_stable_binary-i386_Packages
215 +/var/lib/apt/lists/www.debian.org_archive_dists_stable_binary-i386_Packages
217 cdrom:Debian 1.3/debian/Packages
218 -/var/state/apt/info/Debian%201.3_debian_Packages
219 +/var/lib/apt/info/Debian%201.3_debian_Packages
223 diff -Nur apt-0.3.19cnc50.orig/doc/pt_BR/apt-cache.8 apt-0.3.19cnc50/doc/pt_BR/apt-cache.8
224 --- apt-0.3.19cnc50.orig/doc/pt_BR/apt-cache.8 Mon Nov 27 19:01:01 2000
225 +++ apt-0.3.19cnc50/doc/pt_BR/apt-cache.8 Tue Aug 14 23:58:34 2001
230 -2\&.1-12(/var/state/apt/lists/debian\&.midco\&.net_debian_dists_slink_main_binary-i386_Packages),
231 +2\&.1-12(/var/lib/apt/lists/debian\&.midco\&.net_debian_dists_slink_main_binary-i386_Packages),
235 @@ -290,12 +290,12 @@
236 locais de onde obter os pacotes
239 -/var/state/apt/lists/
241 área de armazenamento para exibir informação para cada recurso de pacote
245 -/var/state/apt/lists/partial/
246 +/var/lib/apt/lists/partial/
247 área de armazenamento para exibir informação de estado em trânsito
249 .SH "CONSULTE TAMBÉM"
250 diff -Nur apt-0.3.19cnc50.orig/doc/pt_BR/apt-cdrom.8 apt-0.3.19cnc50/doc/pt_BR/apt-cdrom.8
251 --- apt-0.3.19cnc50.orig/doc/pt_BR/apt-cdrom.8 Mon Nov 27 19:01:01 2000
252 +++ apt-0.3.19cnc50/doc/pt_BR/apt-cdrom.8 Tue Aug 14 23:58:54 2001
255 APT usa uma identificação de CDROM para rastrear qual disco está
256 atualmente no drive e mantém uma base de dados destes IDs em
257 -\fB/var/state/apt/cdroms\&.list\fP
258 +\fB/var/lib/apt/cdroms\&.list\fP
263 locais da onde obter pacotes
266 -/var/state/apt/lists/
268 área de armazenamento para informação de estado para cada tipo de recurso de
269 pacote especificado em
272 -/var/state/apt/lists/partial/
273 +/var/lib/apt/lists/partial/
274 área de armazenamento para informação de estado em trânsito
277 -/var/state/apt/cdroms\&.list
278 +/var/lib/apt/cdroms\&.list
279 lista de IDs de CDROMs e nomes\&.
281 .SH "CONSULTE TAMBÉM"
282 diff -Nur apt-0.3.19cnc50.orig/doc/pt_BR/apt-get.8 apt-0.3.19cnc50/doc/pt_BR/apt-get.8
283 --- apt-0.3.19cnc50.orig/doc/pt_BR/apt-get.8 Mon Nov 27 19:01:01 2000
284 +++ apt-0.3.19cnc50/doc/pt_BR/apt-get.8 Tue Aug 14 23:59:16 2001
286 .IP "\fB--list-cleanup\fP"
287 Esta opção é habilitada por padrão, use \fB--no-list-cleanup\fP para
288 desabilitá-la\&. Quando habilitada o apt-get irá gerenciar
289 -automaticamente os conteúdos de /var/state/apt/lists para
290 +automaticamente os conteúdos de /var/lib/apt/lists para
291 certificar-se de que os arquivos obsoletos serão apagados\&. A única
292 razão para desativá-la é se você altera sua lista-fonte com freqüência\&.
293 Item de configuração: \fBAPT::Get::List-Cleanup\fP
294 @@ -307,12 +307,12 @@
295 área de armazenagem para arquivos de pacotes em trânsito
298 -/var/state/apt/lists/
300 área de armazenagem para informação de estado para cada recurso de
301 pacote especificado na lista de fontes
304 -/var/state/apt/lists/partial/
305 +/var/lib/apt/lists/partial/
306 área de armazenagem para informação de estado em trânsito
309 diff -Nur apt-0.3.19cnc50.orig/docs/files.html/ch1.html apt-0.3.19cnc50/docs/files.html/ch1.html
310 --- apt-0.3.19cnc50.orig/docs/files.html/ch1.html Mon Oct 2 22:04:53 2000
311 +++ apt-0.3.19cnc50/docs/files.html/ch1.html Tue Aug 14 23:55:08 2001
313 The var directory structure is as follows:
325 -As is specified in the FHS 2.0 /var/state/apt is used for application data that
326 +As is specified in the FHS 2.2 /var/lib/apt is used for application data that
327 is not expected to be user modified. /var/cache/apt is used for regeneratable
328 data and is where the package cache and downloaded .debs go.
330 diff -Nur apt-0.3.19cnc50.orig/docs/files.html/ch2.html apt-0.3.19cnc50/docs/files.html/ch2.html
331 --- apt-0.3.19cnc50.orig/docs/files.html/ch2.html Mon Oct 2 22:04:53 2000
332 +++ apt-0.3.19cnc50/docs/files.html/ch2.html Tue Aug 14 23:55:26 2001
333 @@ -174,10 +174,10 @@
336 http://www.debian.org/archive/dists/stable/binary-i386/Packages
337 - /var/state/apt/lists/www.debian.org_archive_dists_stable_binary-i386_Packages
338 + /var/lib/apt/lists/www.debian.org_archive_dists_stable_binary-i386_Packages
340 cdrom:Debian 1.3/debian/Packages
341 - /var/state/apt/info/Debian%201.3_debian_Packages
342 + /var/lib/apt/info/Debian%201.3_debian_Packages
346 diff -Nur apt-0.3.19cnc50.orig/docs/files.text apt-0.3.19cnc50/docs/files.text
347 --- apt-0.3.19cnc50.orig/docs/files.text Mon Oct 2 22:04:53 2000
348 +++ apt-0.3.19cnc50/docs/files.text Tue Aug 14 23:54:36 2001
351 The var directory structure is as follows:
372 - As is specified in the FHS 2.0 /var/state/apt is used for application
373 + As is specified in the FHS 2.2 /var/lib/apt is used for application
374 data that is not expected to be user modified. /var/cache/apt is used
375 for regeneratable data and is where the package cache and downloaded
377 @@ -202,10 +202,10 @@
378 representation from the ascii character set. Examples:
380 http://www.debian.org/archive/dists/stable/binary-i386/Packages
381 -/var/state/apt/lists/www.debian.org_archive_dists_stable_binary-i386_Packages
382 +/var/lib/apt/lists/www.debian.org_archive_dists_stable_binary-i386_Packages
384 cdrom:Debian 1.3/debian/Packages
385 -/var/state/apt/info/Debian%201.3_debian_Packages
386 +/var/lib/apt/info/Debian%201.3_debian_Packages
388 The other alternative that was considered was to use a deep directory
389 structure but this poses two problems, it makes it very difficult to