diff options
| author | Julian Andres Klode <jak@debian.org> | 2018-05-09 08:15:54 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2018-05-09 08:15:54 +0000 |
| commit | bb36d9ede3f374dd24fdce7493d9fcbe92e1e7c8 (patch) | |
| tree | fd1fed8a732d6e636a40cf74172fbf8d9c356f28 | |
| parent | e85987ab2281e765a2b3e19aefe7f99f656428d8 (diff) | |
| parent | 179e456d2e3fb091934cd2c99579af10b6796149 (diff) | |
Merge branch 'pu/cleanup' into 'master'
Repository cleanups
See merge request apt-team/apt!12
123 files changed, 32 insertions, 126 deletions
diff --git a/.mailmap b/.mailmap new file mode 100644 index 000000000..c66db1ded --- /dev/null +++ b/.mailmap @@ -0,0 +1,18 @@ +# Unify user identities +Christian Perrier <bubulle@debian.org> +<ian@davenant.greenend.org.uk> <ian@anarres> +<ian@davenant.greenend.org.uk> <ian@liberator> +<jackyf@debian.org> <jackyf@1501-debian> +Michael Vogt <mvo@debian.org> <egon@debian-vm> +<mvo@debian.org> <egon@bottom> +<mvo@debian.org> <egon@debian-devbox> +<mvo@debian.org> <egon@pop> +<mvo@debian.org> <egon@tas> +<michael.vogt@ubuntu.com> <mvo@ubuntu.com> +# Name changes +Peter Krefting <peterk@debian.org> +# Email as user name +Christian Perrier <bubulle@debian.org> bubulle@debian.org <> +Julian Andres Klode <jak@debian.org> jak@debian.org <> +Loïc Minier <lool@dooz.org> lool@dooz.org <> +Martin Pitt <martin@piware.de> martin@piware.de <> diff --git a/CMake/apti18n.h.in b/CMake/apti18n.h.in index 9c843b037..192979590 100644 --- a/CMake/apti18n.h.in +++ b/CMake/apti18n.h.in @@ -1,5 +1,4 @@ // -*- mode: cpp; mode: fold -*- -// $Id: apti18n.h.in,v 1.6 2003/01/11 07:18:18 jgg Exp $ /* Internationalization macros for apt. This header should be included last in each C file. */ diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc index 26c85d066..3fc3afedb 100644 --- a/apt-inst/contrib/arfile.cc +++ b/apt-inst/contrib/arfile.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: arfile.cc,v 1.6.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### AR File - Handle an 'AR' archive diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h index 47624c72a..8124208c9 100644 --- a/apt-inst/contrib/arfile.h +++ b/apt-inst/contrib/arfile.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: arfile.h,v 1.2 2001/02/20 07:03:16 jgg Exp $ /* ###################################################################### AR File - Handle an 'AR' archive diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 69e43d6a1..42032ad13 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: extracttar.cc,v 1.8.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### Extract a Tar - Tar Extractor diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index edd3cec8e..c0b340e89 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: extracttar.h,v 1.2 2001/02/20 07:03:17 jgg Exp $ /* ###################################################################### Extract a Tar - Tar Extractor diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc index 6f7cf5691..f8d752e7f 100644 --- a/apt-inst/deb/debfile.cc +++ b/apt-inst/deb/debfile.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debfile.cc,v 1.3.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### Debian Archive File (.deb) diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h index 0bc3254d6..23a76bfdf 100644 --- a/apt-inst/deb/debfile.h +++ b/apt-inst/deb/debfile.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debfile.h,v 1.2 2001/02/20 07:03:17 jgg Exp $ /* ###################################################################### Debian Archive File (.deb) diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index f43e9953b..d6cf0ab3f 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: dirstream.cc,v 1.3.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### Directory Stream diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h index dac965db7..0f0e348d0 100644 --- a/apt-inst/dirstream.h +++ b/apt-inst/dirstream.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: dirstream.h,v 1.2 2001/02/20 07:03:16 jgg Exp $ /* ###################################################################### Directory Stream diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc index d7a234997..35fa015e7 100644 --- a/apt-inst/extract.cc +++ b/apt-inst/extract.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: extract.cc,v 1.6.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### Archive Extraction Directory Stream diff --git a/apt-inst/extract.h b/apt-inst/extract.h index d2e355474..4b4c8d7f8 100644 --- a/apt-inst/extract.h +++ b/apt-inst/extract.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: extract.h,v 1.2 2001/02/20 07:03:16 jgg Exp $ /* ###################################################################### Archive Extraction Directory Stream diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc index 8a16574ea..44b97d054 100644 --- a/apt-inst/filelist.cc +++ b/apt-inst/filelist.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: filelist.cc,v 1.4.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### File Listing - Manages a Cache of File -> Package names. diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h index 5d5327f6c..7fe43de63 100644 --- a/apt-inst/filelist.h +++ b/apt-inst/filelist.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: filelist.h,v 1.2 2001/02/20 07:03:16 jgg Exp $ /* ###################################################################### File Listing - Manages a Cache of File -> Package names. diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 8da8b7242..f5986a260 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-item.cc,v 1.46.2.9 2004/01/16 18:51:11 mdz Exp $ /* ###################################################################### Acquire Item - Item to acquire diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 8934d87a0..c9cd48bb6 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-method.cc,v 1.27.2.1 2003/12/24 23:09:17 mdz Exp $ /* ###################################################################### Acquire Method diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index c557d77bd..d159ef84f 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-worker.cc,v 1.34 2001/05/22 04:42:54 jgg Exp $ /* ###################################################################### Acquire Worker diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 983a0fb41..1e037231d 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire.cc,v 1.50 2004/03/17 05:17:11 mdz Exp $ /* ###################################################################### Acquire - File Acquiration diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 42b5cb44d..bb0e2f873 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: algorithms.cc,v 1.44 2002/11/28 18:49:16 jgg Exp $ /* ###################################################################### Algorithms - A set of misc algorithms diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index c070f4b9e..a22804c36 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cachefile.cc,v 1.8 2002/04/27 04:28:04 jgg Exp $ /* ###################################################################### CacheFile - Simple wrapper class for opening, generating and whatnot diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc index 1abc638ee..f335554a3 100644 --- a/apt-pkg/clean.cc +++ b/apt-pkg/clean.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: clean.cc,v 1.4 2001/02/20 07:03:17 jgg Exp $ /* ###################################################################### Clean - Clean out downloaded directories diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h index 2ba3932a0..d6490a0c5 100644 --- a/apt-pkg/clean.h +++ b/apt-pkg/clean.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: clean.h,v 1.2 1999/07/20 05:53:33 jgg Exp $ /* ###################################################################### Clean - Clean out downloaded directories diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index 7ae54060a..9db3980da 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cdromutl.cc,v 1.12 2001/02/20 07:03:17 jgg Exp $ /* ###################################################################### CDROM Utilities - Some functions to manipulate CDROM mounts. diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h index e94045b5c..4e07e42f6 100644 --- a/apt-pkg/contrib/cdromutl.h +++ b/apt-pkg/contrib/cdromutl.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cdromutl.h,v 1.3 2001/05/07 05:06:52 jgg Exp $ /* ###################################################################### CDROM Utilities - Some functions to manipulate CDROM mounts. diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index 2b8bef2c5..b2a96cadf 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cmndline.cc,v 1.15 2003/02/10 01:40:58 doogie Exp $ /* ###################################################################### Command Line Class - Sophisticated command line parser diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index 2751fb1db..bdd4f6e8f 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cmndline.h,v 1.7 1999/10/31 06:32:28 jgg Exp $ /* ###################################################################### Command Line Class - Sophisticated command line parser diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index eb873bdba..76d1b9370 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: configuration.cc,v 1.28 2004/04/30 04:00:15 mdz Exp $ /* ###################################################################### Configuration Class diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 73f7acb81..2a3ae1aa4 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: configuration.h,v 1.16 2002/11/11 06:55:50 doogie Exp $ /* ###################################################################### Configuration Class diff --git a/apt-pkg/contrib/crc-16.cc b/apt-pkg/contrib/crc-16.cc index 250d7664a..2e396ab78 100644 --- a/apt-pkg/contrib/crc-16.cc +++ b/apt-pkg/contrib/crc-16.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: crc-16.cc,v 1.1 1999/05/23 22:55:54 jgg Exp $ /* ###################################################################### CRC16 - Compute a 16bit crc very quickly diff --git a/apt-pkg/contrib/crc-16.h b/apt-pkg/contrib/crc-16.h index 228b00bc3..3e0756007 100644 --- a/apt-pkg/contrib/crc-16.h +++ b/apt-pkg/contrib/crc-16.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: crc-16.h,v 1.1 1999/05/23 22:55:54 jgg Exp $ /* ###################################################################### CRC16 - Compute a 16bit crc very quickly diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 74b5cd5cf..d0f450742 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: error.h,v 1.8 2001/05/07 05:06:52 jgg Exp $ /* ###################################################################### Global Error Class - Global error mechanism diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 6249b7c16..c78f1715c 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: fileutl.h,v 1.26 2001/05/07 05:06:52 jgg Exp $ /* ###################################################################### File Utilities diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index 5a1d356f1..630a2e674 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: hashes.cc,v 1.1 2001/03/06 07:15:29 jgg Exp $ /* ###################################################################### Hashes - Simple wrapper around the hash functions diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index dc91c1dd3..28bfd3459 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: hashes.h,v 1.2 2001/03/11 05:30:20 jgg Exp $ /* ###################################################################### Hashes - Simple wrapper around the hash functions diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h index 33e096b79..f11fc2f1c 100644 --- a/apt-pkg/contrib/hashsum_template.h +++ b/apt-pkg/contrib/hashsum_template.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: hashsum_template.h,v 1.3 2001/05/07 05:05:47 jgg Exp $ /* ###################################################################### HashSumValueTemplate - Generic Storage for a hash value diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc index ff7868fe2..21e3f0afd 100644 --- a/apt-pkg/contrib/md5.cc +++ b/apt-pkg/contrib/md5.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: md5.cc,v 1.12 2001/05/13 05:15:03 jgg Exp $ /* ###################################################################### MD5Sum - MD5 Message Digest Algorithm. diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index ad0d31374..38b6c6876 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: md5.h,v 1.6 2001/05/07 05:06:52 jgg Exp $ /* ###################################################################### MD5SumValue - Storage for a MD5Sum diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index bfded21e2..ee6a21c83 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: mmap.cc,v 1.22 2001/05/27 05:19:30 jgg Exp $ /* ###################################################################### MMap Class - Provides 'real' mmap or a faked mmap using read(). diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index 55b40147a..63d54d27c 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: mmap.h,v 1.12 2001/05/14 05:16:43 jgg Exp $ /* ###################################################################### MMap Class - Provides 'real' mmap or a faked mmap using read(). diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc index ed8b2aa88..84b4c0ed8 100644 --- a/apt-pkg/contrib/netrc.cc +++ b/apt-pkg/contrib/netrc.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: netrc.c,v 1.38 2007-11-07 09:21:35 bagder Exp $ /* ###################################################################### netrc file parser - returns the login and password of a give host in diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h index 46d8cab3d..981494064 100644 --- a/apt-pkg/contrib/netrc.h +++ b/apt-pkg/contrib/netrc.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: netrc.h,v 1.11 2004/01/07 09:19:35 bagder Exp $ /* ###################################################################### netrc file parser - returns the login and password of a give host in diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index 6743889b8..3bccc48d4 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: progress.cc,v 1.12 2003/01/11 07:17:04 jgg Exp $ /* ###################################################################### OpProgress - Operation Progress diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h index 43c84da71..4406a388b 100644 --- a/apt-pkg/contrib/progress.h +++ b/apt-pkg/contrib/progress.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: progress.h,v 1.6 2001/05/07 05:06:52 jgg Exp $ /* ###################################################################### OpProgress - Operation Progress diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc index 298a7799b..bf0b9d634 100644 --- a/apt-pkg/contrib/sha1.cc +++ b/apt-pkg/contrib/sha1.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: sha1.cc,v 1.3 2001/05/13 05:15:03 jgg Exp $ /* ###################################################################### SHA1 - SHA-1 Secure Hash Algorithm. diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h index 967e2eae0..dffb95033 100644 --- a/apt-pkg/contrib/sha1.h +++ b/apt-pkg/contrib/sha1.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: sha1.h,v 1.3 2001/05/07 05:05:47 jgg Exp $ /* ###################################################################### SHA1SumValue - Storage for a SHA-1 hash. diff --git a/apt-pkg/contrib/sha2.h b/apt-pkg/contrib/sha2.h index d8127c66b..e1a8c6c6e 100644 --- a/apt-pkg/contrib/sha2.h +++ b/apt-pkg/contrib/sha2.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: sha512.h,v 1.3 2001/05/07 05:05:47 jgg Exp $ /* ###################################################################### SHA{512,256}SumValue - Storage for a SHA-{512,256} hash. diff --git a/apt-pkg/contrib/sha2_internal.cc b/apt-pkg/contrib/sha2_internal.cc index 419b92aca..92a4a8619 100644 --- a/apt-pkg/contrib/sha2_internal.cc +++ b/apt-pkg/contrib/sha2_internal.cc @@ -29,7 +29,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $ */ #include <config.h> diff --git a/apt-pkg/contrib/sha2_internal.h b/apt-pkg/contrib/sha2_internal.h index fa4bfc4df..78d1d3618 100644 --- a/apt-pkg/contrib/sha2_internal.h +++ b/apt-pkg/contrib/sha2_internal.h @@ -29,7 +29,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $ */ #ifndef __SHA2_H__ diff --git a/apt-pkg/contrib/sptr.h b/apt-pkg/contrib/sptr.h index ee4a65d60..77806d94d 100644 --- a/apt-pkg/contrib/sptr.h +++ b/apt-pkg/contrib/sptr.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: sptr.h,v 1.3 2001/03/11 07:22:19 jgg Exp $ /* ###################################################################### Trivial non-ref counted 'smart pointer' diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 7507fff29..a569173af 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: strutl.cc,v 1.48 2003/07/18 14:15:11 mdz Exp $ /* ###################################################################### String Util - Some useful string functions. diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index f76fbd4ab..9f74f8c2a 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: strutl.h,v 1.22 2003/02/02 22:20:27 jgg Exp $ /* ###################################################################### String Util - These are some useful string functions diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 6aa3af162..10ebd1d3e 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debindexfile.cc,v 1.5.2.3 2004/01/04 19:11:00 mdz Exp $ /* ###################################################################### Debian Specific sources.list types and the three sorts of Debian diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 241313ff2..e8dff833d 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: deblistparser.cc,v 1.29.2.5 2004/01/06 01:43:44 mdz Exp $ /* ###################################################################### Package Cache Generator - Generator for the cache structure. diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index e59f2080a..09b56665f 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: deblistparser.h,v 1.9 2001/02/20 07:03:17 jgg Exp $ /* ###################################################################### Debian Package List Parser - This implements the abstract parser diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index bc4a378eb..22ac219ba 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debrecords.cc,v 1.10 2001/03/13 06:51:46 jgg Exp $ /* ###################################################################### Debian Package Records - Parser for debian package records diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h index 828c2b93b..7c3b9020c 100644 --- a/apt-pkg/deb/debrecords.h +++ b/apt-pkg/deb/debrecords.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debrecords.h,v 1.8 2001/03/13 06:51:46 jgg Exp $ /* ###################################################################### Debian Package Records - Parser for debian package records diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index 7fd206ed6..9656fcac3 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debsrcrecords.cc,v 1.6 2004/03/17 05:58:54 mdz Exp $ /* ###################################################################### Debian Source Package Records - Parser implementation for Debian style diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index 349e66ba2..45617f641 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debsrcrecords.h,v 1.8 2004/03/17 05:58:54 mdz Exp $ /* ###################################################################### Debian Source Package Records - Parser implementation for Debian style diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index 3ad25ba05..b620d889a 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debsystem.cc,v 1.4 2004/01/26 17:01:53 mdz Exp $ /* ###################################################################### System - Abstraction for running on different systems. diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h index 9fdecb42f..7b59fc073 100644 --- a/apt-pkg/deb/debsystem.h +++ b/apt-pkg/deb/debsystem.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debsystem.h,v 1.4 2003/01/11 07:16:33 jgg Exp $ /* ###################################################################### System - Debian version of the System Class diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index 4f301c98e..d2ebd2805 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debversion.cc,v 1.8 2003/09/10 23:39:49 mdz Exp $ /* ###################################################################### Debian Version - Versioning system for Debian diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 324551387..c073b5024 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: dpkgpm.h,v 1.8 2001/05/07 05:05:13 jgg Exp $ /* ###################################################################### DPKG Package Manager - Provide an interface to dpkg diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index bc9738baa..0f45fec90 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: depcache.cc,v 1.25 2001/05/27 05:36:04 jgg Exp $ /* ###################################################################### Dependency Cache - Caches Dependency information. diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h index c70d8107a..0855bb53f 100644 --- a/apt-pkg/edsp/edspsystem.h +++ b/apt-pkg/edsp/edspsystem.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debsystem.h,v 1.4 2003/01/11 07:16:33 jgg Exp $ /* ###################################################################### System - Debian version of the System Class diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 8704da80a..41cecdec1 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: indexcopy.cc,v 1.10 2002/03/26 07:38:58 jgg Exp $ /* ###################################################################### Index Copying - Aid for copying and verifying the index files diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index 3a36ce65c..85d0e87cd 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: indexfile.cc,v 1.2.2.1 2003/12/24 23:09:17 mdz Exp $ /* ###################################################################### Index File - Abstraction for an index of archive/source file. diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 2452b217b..22693d2a2 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: init.cc,v 1.20 2003/02/09 20:31:05 doogie Exp $ /* ###################################################################### Init - Initialize the package library diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 937e538ba..670b5e2bd 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: orderlist.cc,v 1.14 2001/05/07 05:49:43 jgg Exp $ /* ###################################################################### Order List - Represents and Manipulates an ordered list of packages. diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index d5a8275c3..156f7adb5 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: packagemanager.cc,v 1.30 2003/04/27 03:04:15 doogie Exp $ /* ###################################################################### Package Manager - Abstacts the package manager diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 119240cea..6b9c645a4 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: pkgcache.cc,v 1.37 2003/02/10 01:40:58 doogie Exp $ /* ###################################################################### Package Cache - Accessor code for the cache diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 37fa442ad..8fe1867d7 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: pkgcachegen.cc,v 1.53.2.1 2003/12/24 23:09:17 mdz Exp $ /* ###################################################################### Package Cache Generator - Generator for the cache structure. diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc index 8a5089d8a..77aa8ce1b 100644 --- a/apt-pkg/pkgrecords.cc +++ b/apt-pkg/pkgrecords.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: pkgrecords.cc,v 1.8 2003/09/02 04:52:16 mdz Exp $ /* ###################################################################### Package Records - Allows access to complete package description records diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index bdbd31a78..6d1342d45 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: pkgrecords.h,v 1.6 2001/03/13 06:51:46 jgg Exp $ /* ###################################################################### Package Records - Allows access to complete package description records diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc index 5d74e882b..efbaddcdb 100644 --- a/apt-pkg/pkgsystem.cc +++ b/apt-pkg/pkgsystem.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: pkgsystem.cc,v 1.3 2004/02/27 00:43:16 mdz Exp $ /* ###################################################################### System - Abstraction for running on different systems. diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 030bab26b..d7eb43c0f 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: policy.cc,v 1.10 2003/08/12 00:17:37 mdz Exp $ /* ###################################################################### Package Version Policy implementation diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 1fdc92dcb..a3d693151 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: sourcelist.cc,v 1.3 2002/08/15 20:51:37 niemeyer Exp $ /* ###################################################################### List of Sources diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index 0c0c7a9fc..9d515ae75 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: srcrecords.cc,v 1.7.2.2 2003/12/26 16:27:34 mdz Exp $ /* ###################################################################### Source Package Records - Allows access to source package records diff --git a/apt-pkg/tagfile-compat.cc b/apt-pkg/tagfile-compat.cc index e2cab474e..1e1d23e8c 100644 --- a/apt-pkg/tagfile-compat.cc +++ b/apt-pkg/tagfile-compat.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: tagfile.cc,v 1.37.2.2 2003/12/31 16:02:30 mdz Exp $ /* ###################################################################### Fast scanner for RFC-822 type header information diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 7de5c055b..98001afd1 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: tagfile.cc,v 1.37.2.2 2003/12/31 16:02:30 mdz Exp $ /* ###################################################################### Fast scanner for RFC-822 type header information diff --git a/apt-pkg/version.cc b/apt-pkg/version.cc index 8db311179..e0b83e0cd 100644 --- a/apt-pkg/version.cc +++ b/apt-pkg/version.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: version.cc,v 1.10 2001/02/20 07:03:17 jgg Exp $ /* ###################################################################### Version - Versioning system.. diff --git a/apt-pkg/version.h b/apt-pkg/version.h index 5110ecaa7..6cb29328e 100644 --- a/apt-pkg/version.h +++ b/apt-pkg/version.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: version.h,v 1.8 2001/05/27 05:55:27 jgg Exp $ /* ###################################################################### Version - Versioning system.. diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index 8106a150e..340f5a64c 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: versionmatch.cc,v 1.9 2003/05/19 17:58:26 doogie Exp $ /* ###################################################################### Version Matching diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index ce8f95de5..c9e436723 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: versionmatch.h,v 1.4 2001/05/29 03:07:12 jgg Exp $ /* ###################################################################### Version Matching diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 0f120a4b0..085962699 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-cache.cc,v 1.72 2004/04/30 04:34:03 mdz Exp $ /* ###################################################################### apt-cache - Manages the cache files diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 2b583b93a..e9218ae69 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-cdrom.cc,v 1.45 2003/11/19 23:50:51 mdz Exp $ /* ###################################################################### APT CDROM - Tool for handling APT's CDROM database. diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 4e546b098..252a56833 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-config.cc,v 1.11 2003/01/11 07:18:44 jgg Exp $ /* ###################################################################### APT Config - Program to manipulate APT configuration files diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 928fb1882..bd23453f3 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-extracttemplates.cc,v 1.15 2003/07/26 00:00:11 mdz Exp $ /* ###################################################################### APT Extract Templates - Program to extract debconf config and template diff --git a/cmdline/apt-extracttemplates.h b/cmdline/apt-extracttemplates.h index 66d98570a..bbd926e61 100644 --- a/cmdline/apt-extracttemplates.h +++ b/cmdline/apt-extracttemplates.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-extracttemplates.h,v 1.2 2001/02/27 04:26:03 jgg Exp $ /* ###################################################################### apt-extracttemplate - tool to extract template and config data diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 5cc0a02da..9b64e285e 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-get.cc,v 1.156 2004/08/28 01:05:16 mdz Exp $ /* ###################################################################### apt-get - Cover for dpkg diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc index 40be29c77..da451708f 100644 --- a/cmdline/apt-sortpkgs.cc +++ b/cmdline/apt-sortpkgs.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-sortpkgs.cc,v 1.5 2003/01/11 07:18:44 jgg Exp $ /* ###################################################################### APT Sort Packages - Program to sort Package and Source files diff --git a/doc/examples/apt.conf b/doc/examples/apt.conf index 7201d1920..8f93be7bb 100644 --- a/doc/examples/apt.conf +++ b/doc/examples/apt.conf @@ -1,4 +1,3 @@ -// $Id: apt.conf,v 1.43 1999/12/06 02:19:38 jgg Exp $ /* This file is a sample configuration file with a few harmless sample options. */ diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 196a0668c..a3fdf2391 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-ftparchive.cc,v 1.8.2.3 2004/01/02 22:01:48 mdz Exp $ /* ###################################################################### apt-ftparchive - Efficient work-alike for dpkg-scanpackages diff --git a/ftparchive/apt-ftparchive.h b/ftparchive/apt-ftparchive.h index b1ce17545..e6695557c 100644 --- a/ftparchive/apt-ftparchive.h +++ b/ftparchive/apt-ftparchive.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-ftparchive.h,v 1.3 2001/05/29 03:51:37 jgg Exp $ /* ###################################################################### Writer diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 210ce6dc1..20903652a 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cachedb.cc,v 1.7 2004/05/08 19:41:01 mdz Exp $ /* ###################################################################### CacheDB diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index 117ba5a1b..399e1f1ee 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cachedb.h,v 1.4 2004/05/08 19:41:01 mdz Exp $ /* ###################################################################### CacheDB diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index ae8a7e991..a743283b0 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: contents.cc,v 1.4 2003/02/10 07:34:41 doogie Exp $ /* ###################################################################### contents - Archive contents generator diff --git a/ftparchive/contents.h b/ftparchive/contents.h index 8691b0e87..74607053e 100644 --- a/ftparchive/contents.h +++ b/ftparchive/contents.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: contents.h,v 1.2 2001/02/20 07:03:18 jgg Exp $ /* ###################################################################### contents - Contents of archive things. diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index abb8c5906..19e6563e0 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: multicompress.cc,v 1.4 2003/02/10 07:34:41 doogie Exp $ /* ###################################################################### MultiCompressor diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h index 50453acab..c237269f2 100644 --- a/ftparchive/multicompress.h +++ b/ftparchive/multicompress.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: multicompress.h,v 1.2 2001/02/20 07:03:18 jgg Exp $ /* ###################################################################### MultiCompressor diff --git a/ftparchive/override.cc b/ftparchive/override.cc index 26d629bfa..16fefeca5 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: override.cc,v 1.4 2003/02/10 07:34:41 doogie Exp $ /* ###################################################################### Override diff --git a/ftparchive/override.h b/ftparchive/override.h index 74637404c..af62a0498 100644 --- a/ftparchive/override.h +++ b/ftparchive/override.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: override.h,v 1.4 2001/06/26 02:50:27 jgg Exp $ /* ###################################################################### Override diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index b20331f2c..61489f73a 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: writer.cc,v 1.14 2004/03/24 01:40:43 mdz Exp $ /* ###################################################################### Writer diff --git a/ftparchive/writer.h b/ftparchive/writer.h index b7c6435bf..9aa216859 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: writer.h,v 1.4.2.2 2003/12/26 22:55:43 mdz Exp $ /* ###################################################################### Writer diff --git a/methods/cdrom.cc b/methods/cdrom.cc index 3900e3e64..d8c032744 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cdrom.cc,v 1.20.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### CDROM URI method for APT diff --git a/methods/connect.cc b/methods/connect.cc index 519031ace..35f2da397 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: connect.cc,v 1.10.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### Connect - Replacement connect call diff --git a/methods/connect.h b/methods/connect.h index 63a94400e..86f6d529c 100644 --- a/methods/connect.h +++ b/methods/connect.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: connect.h,v 1.3 2001/02/20 07:03:18 jgg Exp $ /* ###################################################################### Connect - Replacement connect call diff --git a/methods/copy.cc b/methods/copy.cc index cc2fe9ea4..9a8665446 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: copy.cc,v 1.7.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### Copy URI - This method takes a uri like a file: uri and copies it diff --git a/methods/file.cc b/methods/file.cc index 269fb432d..ff4301576 100644 --- a/methods/file.cc +++ b/methods/file.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: file.cc,v 1.9.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### File URI method for APT diff --git a/methods/ftp.cc b/methods/ftp.cc index 2daba8ffe..ebe555a04 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: ftp.cc,v 1.31.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### FTP Acquire Method - This is the FTP acquire method for APT. diff --git a/methods/ftp.h b/methods/ftp.h index 52b856637..da9887bfd 100644 --- a/methods/ftp.h +++ b/methods/ftp.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- -// Description /*{{{*/// $Id: ftp.h,v 1.4 2001/03/06 07:15:29 jgg Exp $ -// $Id: ftp.h,v 1.4 2001/03/06 07:15:29 jgg Exp $ +// Description /*{{{*/ /* ###################################################################### FTP Acquire Method - This is the FTP acquire method for APT. diff --git a/methods/http.cc b/methods/http.cc index 5d286bcb4..4514c3d60 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ /* ###################################################################### HTTP Acquire Method - This is the HTTP acquire method for APT. diff --git a/methods/http.h b/methods/http.h index 84cc0b2b1..d511196e3 100644 --- a/methods/http.h +++ b/methods/http.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- -// Description /*{{{*/// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ -// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ +// Description /*{{{*/ /* ###################################################################### HTTP Acquire Method - This is the HTTP acquire method for APT. diff --git a/methods/rfc2553emu.cc b/methods/rfc2553emu.cc index 13f79391a..72b3fc42b 100644 --- a/methods/rfc2553emu.cc +++ b/methods/rfc2553emu.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: rfc2553emu.cc,v 1.8 2001/02/20 07:03:18 jgg Exp $ /* ###################################################################### RFC 2553 Emulation - Provides emulation for RFC 2553 getaddrinfo, diff --git a/methods/rfc2553emu.h b/methods/rfc2553emu.h index 462bfe26f..65d744d32 100644 --- a/methods/rfc2553emu.h +++ b/methods/rfc2553emu.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: rfc2553emu.h,v 1.4 2000/06/18 06:04:45 jgg Exp $ /* ###################################################################### RFC 2553 Emulation - Provides emulation for RFC 2553 getaddrinfo, diff --git a/methods/rsh.cc b/methods/rsh.cc index 69a51a13d..7f1d1cc69 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: rsh.cc,v 1.6.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### RSH method - Transfer files via rsh compatible program diff --git a/methods/rsh.h b/methods/rsh.h index dee4ad647..acdcb64e3 100644 --- a/methods/rsh.h +++ b/methods/rsh.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- -// Description /*{{{*/// $Id: rsh.h,v 1.4 2002/11/09 23:33:26 doogie Exp $ -// $Id: rsh.h,v 1.4 2002/11/09 23:33:26 doogie Exp $ +// Description /*{{{*/ /* ###################################################################### RSH method - Transfer files via rsh compatible program @@ -18,6 +18,8 @@ msgstr "" "X-Poedit-Country: Lebanon\n" "X-Poedit-SourceCharset: utf-8\n" "X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" #: apt-inst/contrib/arfile.cc msgid "Invalid archive signature" @@ -14,6 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n" #: apt-inst/contrib/arfile.cc msgid "Invalid archive signature" @@ -14,11 +14,11 @@ msgstr "" "PO-Revision-Date: 2018-01-11 21:11+0100\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" -"Language: de_DE\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;>\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" #: apt-inst/contrib/arfile.cc @@ -949,12 +949,12 @@ msgstr "Kon de bestandsindicator %d niet openen" #: apt-pkg/contrib/fileutl.cc #, c-format msgid "read, still have %llu to read but none left" -msgstr "lezen; moet er nog %lu lezen, maar er schieten er geen meer over" +msgstr "lezen; moet er nog %llu lezen, maar er schieten er geen meer over" #: apt-pkg/contrib/fileutl.cc #, c-format msgid "write, still have %llu to write but couldn't" -msgstr "schrijven; de laatste %lu konden niet weggeschreven worden" +msgstr "schrijven; de laatste %llu konden niet weggeschreven worden" #: apt-pkg/contrib/fileutl.cc #, c-format @@ -348,7 +348,7 @@ msgid "" "Skipping acquire of configured file '%s' as repository '%s' provides only " "weak security information for it" msgstr "" -"Пропускается получение настроенного файла «s», так как репозиторий «%s» " +"Пропускается получение настроенного файла «%s», так как репозиторий «%s» " "предоставляет только нестойкое шифрование информации" #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is @@ -1645,7 +1645,7 @@ msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Неизвестный тип «%s» в строфе %u в списке источников %s" #: apt-pkg/sourcelist.cc -#, c-format +#, fuzzy, c-format msgid "Unsupported file %s given on commandline" msgstr "В командной строке указан не поддерживаемый файл" @@ -8,7 +8,7 @@ # msgid "" msgstr "" -"Project-Id-Version: apt\n" +"Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2018-02-26 13:14+0100\n" "PO-Revision-Date: 2015-08-19 21:33+0200\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 43ec8125e..029396cb2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,6 @@ # Tetralet <tetralet@gmail.com> # Zhou Mo <cdluminate@gmail.com> 2016 # Simplified Chinese Translator, only make trivial fixes. # -# $Id: zh_TW.po,v 1.11 2004/04/30 04:50:38 mdz Exp $ msgid "" msgstr "" "Project-Id-Version: apt 1.2.X\n" @@ -19,6 +18,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: apt-inst/contrib/arfile.cc msgid "Invalid archive signature" |