[Pkg-asv-commits] r21 - in trunk: . debian man man/po

[ahoenen-guest at alioth.debian.org]

Author: ahoenen-guest
Date: 2008-02-17 14:39:15 +0000 (Sun, 17 Feb 2008)
New Revision: 21

Modified:
   trunk/apt-show-versions
   trunk/debian/changelog
   trunk/man/add.fr
   trunk/man/po/es.po
   trunk/man/po/fr.po
   trunk/man/po/sv.po
Log:
- Document the more complex internal data structures in a-s-v script:
  comments with content examples.
- Fix warnings about missing %releasenames records that occured when all of the
  following conditions applied:
  * Package file without release file
    (e.g.: deb http://debian.udsorg.ru/ unstable main)
  * a-s-v cache is used
- Fix BTS report #464047:
  When called with exactly one package and upgradeable option set for a package
  that actually is not upgradeable, return with non zero exit code.
- Related to this, sytematize a-s-v's exit codes and document them in manual
  page.
- Also related to this, introduce concept of "modes" (to ease code
  understanding): It describes the packages for which a-s-v is called:
  single, multiple, regex or all.
- If specified package is not only not installed, but even not available
  (e.g. a misspelled package name), dump an accordant comment.
- Take over french manual page actualizations from Jean-Baka Domelevo
  Entfellner.  (BTS report #460631)
- Propagate the manual page changes to the *.po files.
- Actualize FSF address paragraph in a-s-v script.
- Prepare a-s-v script regarding the relase number: 0.13.

PLEASE NOTE:
The *.po files need to be actualized due the manual page changes.  Especially
the spanish and swedish translations have dropped below the 80% threshold, thus
the corresponding manual pages won't be created at the moment.  Therefore just
before the next release I have to request translation updates.  However, as the
currently discussed fix of BTS report #460272 might affect the manual page
again, I want to wait with this request.


Modified: trunk/apt-show-versions
===================================================================
--- trunk/apt-show-versions	2008-02-12 20:27:30 UTC (rev 20)
+++ trunk/apt-show-versions	2008-02-17 14:39:15 UTC (rev 21)
@@ -11,7 +11,7 @@
 
 # Author: Christoph Martin <martin at uni-mainz.de>
 # Maintainer: Christoph Martin <martin at uni-mainz.de>
-# Version: 0.12
+# Version: 0.13
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -24,8 +24,10 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this file; see the file COPYING.  If not, write to the Free
-# Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this file; see the file 'copyright' respectively
+# '/usr/share/common-licenses/GPL-2'.  If not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 
 use strict;
 use Getopt::Long;
@@ -49,7 +51,7 @@
 my $policy = $cache->policy;
 
 my $ASV_VERSION;
-$ASV_VERSION ='0.12';
+$ASV_VERSION ='0.13';
 
 # Provide some constants (to avoid redundant literals).
 my $CODENAME = 'Codename';
@@ -82,16 +84,35 @@
 }
 if (scalar @ARGV == 1) {
     if (exists $opts{'package'}) {
-        die "apt-show-versions: too many arguments\n";
+        &die(1, "apt-show-versions: too many arguments\n");
     }
     $opts{'package'} = $ARGV[0];
 } elsif (scalar @ARGV > 1) {
     if (exists($opts{'package'}) or exists($opts{'regex'})) {
-        die "apt-show-versions: too many arguments\n";
+        &die(1, "apt-show-versions: too many arguments\n");
     }
     $pkg_names{$_} = 1 foreach (@ARGV);
 }
 
+# Determine call mode.
+my $MODE_SINGLE   = 1;  # Called with one package name.
+my $MODE_MULTIPLE = 2;  # Called with several packages names.
+my $MODE_REGEX    = 3;  # Called with a package name regular expression.
+my $MODE_ALL      = 4;  # Called without any package information: all packages.
+my $mode;
+if (%pkg_names) {
+    $mode = $MODE_MULTIPLE;
+}
+elsif ($opts{'regex'}) {
+    $mode = $MODE_REGEX;
+}
+elsif ($opts{'package'}) {
+    $mode = $MODE_SINGLE;
+}
+else {
+    $mode = $MODE_ALL;
+}
+
 if (exists $opts{'help'}) {
     print <<EOF;
 Apt-Show-Versions v.$ASV_VERSION (c) Christoph Martin
@@ -133,6 +154,14 @@
 
 my %used_suites = ();
 # Determine the release names currently used by this host.
+# %releasenames structure example:
+# ('ftp.de.debian.org_debian_dists_unstable' => {'Suite'    => 'unstable',
+#                                                'Name'     => 'unstable',
+#                                                'Codename' => 'sid'},
+#  'debian.udsorg.ru_dists_unstable'         => {'Suite'    => 'unknown',
+#                                                'Name'     => 'unknown',
+#                                                'Codename' => 'unknown'},
+#  ...)
 my %releasenames = &determine_releasenames();
 
 if (exists $opts{'initialize'}) {
@@ -149,16 +178,23 @@
 }
 # Test also to be sure $filescachefile is not corrupt and returns a ref to it
 if (!-e $filescachefile or -M $list_dir < -M $filescachefile or !ref($filesref)) {
-    opendir(DIR, $list_dir) or die "Can't opendir $list_dir: $!\n";
+    opendir(DIR, $list_dir) or &die("Can't opendir $list_dir: $!\n");
     @files = map { $list_dir . $_} grep /Packages$/, readdir(DIR);
     ($< == 0) and (store(\@files, $filescachefile) or
         warn "Can't write $filescachefile\n");
 }
-unless (scalar @files > 0) {die "Error: No information about packages! (Maybe no deb entries?)\n"};
+unless (@files > 0) {
+    &die("Error: No information about packages! (Maybe no deb entries?)\n");
+}
 closedir DIR ;
 
 # Get hash with all installed packages from cache or create new hash
 # and write cache if root
+# $ipackages structure example:
+# {'dblatex' => {'Version' => '0.2.8-6',
+#                'Status' => 'install ok installed',
+#                'Package' => 'dblatex'},
+#  ...}
 my $ipackages;
 
 if (-e $ipackagescachefile and -M $ipackagescachefile < -M $status_file) {
@@ -171,6 +207,20 @@
 }
 
 # Get available packages list from cache if possible
+# $apackages structure example:
+# {'dblatex' => {'ftp.de.debian.org_debian_dists_stable'
+#                 => {'Version' => '0.2-2',
+#                     'Release' => 'ftp.de.debian.org_debian_dists_stable',
+#                     'Package' => 'dblatex'},
+#                'ftp.de.debian.org_debian_dists_testing'
+#                 => {'Version' => '0.2.8-2',
+#                     'Release' => 'ftp.de.debian.org_debian_dists_testing',
+#                     'Package' => 'dblatex'},
+#                'ftp.de.debian.org_debian_dists_unstable'
+#                 => {'Version' => '0.2.8-6',
+#                     'Release' => 'ftp.de.debian.org_debian_dists_unstable',
+#                     'Package' => 'dblatex'}},
+#  ...}
 my $apackages;
 my $cache_file_corrupt;
 -e $apackagescachefile and $apackages = retrieve($apackagescachefile);
@@ -201,18 +251,17 @@
 }
 # Store if we are root
 ($< == 0) and (store($apackages, $apackagescachefile) or
-    die "Warning: Can't write to $apackagescachefile!\n");
+               &die("Warning: Can't write to $apackagescachefile!\n"));
 # Exit if we are root and using the -i option
 ($< == 0) and (exists $opts{'initialize'}) and exit;
 
 # print info for selected package
-if (exists $opts{'package'} &&
-    !exists $opts{'regex'} ) {
+if ($mode == $MODE_SINGLE) {
     my $key = $opts{'package'};
 
     print_package ($key);
 }
-elsif (%pkg_names) {
+elsif ($mode == $MODE_MULTIPLE) {
     print_package($_) foreach (sort keys %pkg_names);
 }
 else {
@@ -244,11 +293,15 @@
             return 1;
         }
         elsif ($cmp_versions == 0) {
-            print "$package/$archiv"
-              . (!defined($opts{'brief'})
-                ? " uptodate $iversion\n"
-                : "\n")
-              unless (defined $opts{'upgradeable'});
+            unless (defined $opts{'upgradeable'}) {
+                print("$package/$archiv",
+                      defined($opts{'brief'}) ? "\n" : " uptodate $iversion\n");
+            }
+            elsif ($mode == $MODE_SINGLE) {
+                # Caller expects single given package to be upgradeable.
+                # Signal failure of this expectation with a special exit code.
+                exit 2;
+            }
             return 1;
         }
     }
@@ -261,8 +314,10 @@
 sub print_package {
     my ($package) = @_;
 
-    my @pkg_releases =
-      sort sort_pkg_releases values(%{$apackages->{$package}});
+    # Guarantee existence of %releasenames records for all releases of package
+    # and sort the releases according to this information.
+    &determine_pkgfile_release($_) foreach (keys(%{$apackages->{$package}}));
+    my @pkg_releases = sort sort_pkg_releases values(%{$apackages->{$package}});
 
     # print more information if required
     if ($opts{'allversions'}) {
@@ -371,7 +426,9 @@
         }
     } else {
         #       print "$package not installed: No available versions\n";
-        print "$package not installed\n";
+        print("$package not installed",
+              ($mode == $MODE_SINGLE and not keys(%{$apackages->{$package}}))
+              ? " (even not available)\n" : "\n");
     }
 
     #    my $sversion = $apackages->{$package}{"stable"}->{$VERSION};
@@ -402,7 +459,7 @@
     my ($key, $value, $package, $packages);
 
     my $release = &determine_pkgfile_release($file);
-    open FILE, $file or die "Can't open file $file: $!\n";
+    open FILE, $file or &die("Can't open file $file: $!\n");
     if ($opts{'verbose'}) {print "Parsing $file...";};
     while (<FILE>) {
         if (/^$/){
@@ -411,11 +468,10 @@
             if ($status) { # Are we parsing the status file?
                 # if we did not specify a package or pattern
                 # only include installed packages
-                unless ((!exists $opts{'package'} && !%pkg_names &&
-                        ($package->{$STATUS} =~ /not-installed/ ||
-                            $package->{$STATUS} =~ /config-files/ ||
-                            # don't print holded packages if requested
-                            ($opts{'nohold'} && $package->{$STATUS} =~ /hold/)))) {
+                unless ($mode == $MODE_ALL and
+                        ($package->{$STATUS} =~ /not-installed|config-files/ or
+                         # don't print holded packages if requested
+                         ($opts{'nohold'} and $package->{$STATUS} =~ /hold/))) {
                     $packages->{ $package->{$PACKAGE}} = $package;
                 }
             }
@@ -443,10 +499,15 @@
 
 ################################################################################
 # Determine the release of the specified package file.
+# If no corresponding %releasenames record exists, one gets created.
+# Argument $pkgfile is either full package file name or name core, e.g.:
+# - /var/lib/apt/lists/ftp.de.debian.org_debian_dists_unstable_main_binary-i386_Packages
+# - ftp.de.debian.org_debian_dists_unstable
 ################################################################################
 sub determine_pkgfile_release {
     my $pkgfile = shift;
 
+    return $pkgfile if ($releasenames{$pkgfile});
     $pkgfile =~ s{.*/}{};
     return undef if ($pkgfile eq 'status');
     foreach (keys %releasenames) {
@@ -481,7 +542,7 @@
 sub determine_releasenames {
     my %rel_names;
     opendir LIST_DIR, $list_dir
-        or die "Failed to open directory $list_dir: $!\n";
+        or &die("Failed to open directory $list_dir: $!\n");
     while (defined(my $rel_file = readdir LIST_DIR)) {
         my $file_name = "$list_dir/$rel_file";
         if ($rel_file =~ m/(.*)_Release$/) {
@@ -491,7 +552,7 @@
             next;
         }
         open RELEASE_FILE, "< $file_name"
-            or die "Failed to open file $file_name for reading: $!\n";
+            or &die("Failed to open file $file_name for reading: $!\n");
         while (defined (my $line = <RELEASE_FILE>)) {
             if ($line =~ m/^\s*($SUITE|$CODENAME):\s*(\S+)\s*$/o) {
                 $rel_names{$rel_file}{$1} = $2;
@@ -506,7 +567,7 @@
             }
         }
         close RELEASE_FILE
-            or die "Failed to close file $file_name: $!\n";
+            or &die("Failed to close file $file_name: $!\n");
         # Register suite as used.
         if (defined $rel_names{$rel_file}{$SUITE}) {
             $used_suites{$rel_names{$rel_file}{$SUITE}} = 1;
@@ -531,7 +592,7 @@
         }
     }
     closedir LIST_DIR
-        or die "Failed to close directory $list_dir: $!\n";
+        or &die("Failed to close directory $list_dir: $!\n");
     return %rel_names;
 }
 
@@ -617,6 +678,16 @@
     return($official_suites{$_[0]} || $#official_suites + 1);
 }
 
+################################################################################
+# Simple die wrapper which controls the exit code.
+# If first parameter is a number, it is used as the exit code.  Otherwise it
+# gets interpreted (like the remaining parameters) as the error message.
+################################################################################
+sub die {
+    $! = ($_[0] =~ m/^\d+$/) ? shift() : 255;
+    die @_;
+}
+
 # script documentation (POD style)
 
 =head1 NAME
@@ -697,6 +768,30 @@
 
 =back
 
+=head1 EXIT CODES
+
+=over 4
+
+=item 0
+
+No error
+
+=item 1
+
+Wrong usage
+
+=item 2
+
+apt-show-version has been called with exactly one package and upgradeable
+option set, but package is uptodate. As no output has been requested, this
+case gets signaled using the exit code.
+
+=item 255
+
+Unspecified error
+
+=back
+
 =head1 EXAMPLES
 
 If you want to know for all your installed packages whether they are

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-12 20:27:30 UTC (rev 20)
+++ trunk/debian/changelog	2008-02-17 14:39:15 UTC (rev 21)
@@ -9,8 +9,16 @@
     - Strictly sort versions by version number as primary criterion.
     - Enforce tabular layout.
   * Sort output by package names.
+  * If specified package is not only not installed, but even not available
+    (e.g. a misspelled package name), dump an accordant comment.
+  * When called with exactly one package and upgradeable option set for a
+    package that actually is not upgradeable, return with non zero exit code.
+    (Closes: #464047)
+  * Actualize french manual page.  Thanks, Jean-Baka Domelevo Entfellner.
+    (Closes: #460631)
+  * Actualize FSF address in a-s-v script.
 
- -- Andreas Hoenen <andreas.hoenen at arcor.de>  Tue, 12 Feb 2008 21:22:56 +0100
+ -- Andreas Hoenen <andreas.hoenen at arcor.de>  Sun, 17 Feb 2008 15:36:59 +0100
 
 apt-show-versions (0.12) unstable; urgency=low
 

Modified: trunk/man/add.fr
===================================================================
--- trunk/man/add.fr	2008-02-12 20:27:30 UTC (rev 20)
+++ trunk/man/add.fr	2008-02-17 14:39:15 UTC (rev 21)
@@ -3,3 +3,5 @@
 =head1 TRADUCTEUR
 
 Julien Louis <leonptitlouis at wanadoo.fr>
+
+Jean-Baka Domelevo Entfellner <domelevo at gmail.com>

Modified: trunk/man/po/es.po
===================================================================
--- trunk/man/po/es.po	2008-02-12 20:27:30 UTC (rev 20)
+++ trunk/man/po/es.po	2008-02-17 14:39:15 UTC (rev 21)
@@ -1,11 +1,11 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: apt-show-versions 0.0.7\n"
-"POT-Creation-Date: 2007-08-16 21:12+0200\n"
+"POT-Creation-Date: 2008-02-16 22:17+0100\n"
 "PO-Revision-Date: 2005-03-06 15:43+0100\n"
 "Last-Translator: Rubén Porras Campo <nahoo82 at telefonica.net>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -213,11 +213,59 @@
 
 # type: =head1
 #: man/apt-show-versions.pod:79
+msgid "EXIT CODES"
+msgstr ""
+
+# type: =item
+#: man/apt-show-versions.pod:83
+msgid "0"
+msgstr ""
+
+# type: textblock
+#: man/apt-show-versions.pod:85
+msgid "No error"
+msgstr ""
+
+# type: =item
+#: man/apt-show-versions.pod:87
+msgid "1"
+msgstr ""
+
+# type: textblock
+#: man/apt-show-versions.pod:89
+msgid "Wrong usage"
+msgstr ""
+
+# type: =item
+#: man/apt-show-versions.pod:91
+msgid "2"
+msgstr ""
+
+# type: textblock
+#: man/apt-show-versions.pod:93
+msgid ""
+"apt-show-version has been called with exactly one package and upgradeable "
+"option set, but package is uptodate. As no output has been requested, this "
+"case gets signaled using the exit code."
+msgstr ""
+
+# type: =item
+#: man/apt-show-versions.pod:97
+msgid "255"
+msgstr ""
+
+# type: textblock
+#: man/apt-show-versions.pod:99
+msgid "Unspecified error"
+msgstr ""
+
+# type: =head1
+#: man/apt-show-versions.pod:103
 msgid "EXAMPLES"
 msgstr "EJEMPLOS"
 
 # type: textblock
-#: man/apt-show-versions.pod:81
+#: man/apt-show-versions.pod:105
 msgid ""
 "If you want to know for all your installed packages whether they are "
 "uptodate or upgradeable, use:"
@@ -226,7 +274,7 @@
 "actualizables o están al día, use:"
 
 # type: verbatim
-#: man/apt-show-versions.pod:84
+#: man/apt-show-versions.pod:108
 #, no-wrap
 msgid ""
 "    apt-show-versions\n"
@@ -236,12 +284,12 @@
 "\n"
 
 # type: textblock
-#: man/apt-show-versions.pod:86
+#: man/apt-show-versions.pod:110
 msgid "If you want to have a list of all upgradeable packages:"
 msgstr "Si quiere una lista de todos los paquetes actualizables use:"
 
 # type: verbatim
-#: man/apt-show-versions.pod:88
+#: man/apt-show-versions.pod:112
 #, no-wrap
 msgid ""
 "    apt-show-versions -u\n"
@@ -251,12 +299,12 @@
 "\n"
 
 # type: textblock
-#: man/apt-show-versions.pod:90
+#: man/apt-show-versions.pod:114
 msgid "To get a list of all available versions of libc6:"
 msgstr "Para obtener una lista de todas las versiones de libc6:"
 
 # type: verbatim
-#: man/apt-show-versions.pod:92
+#: man/apt-show-versions.pod:116
 #, no-wrap
 msgid ""
 "    apt-show-versions -a -p libc6\n"
@@ -266,12 +314,12 @@
 "\n"
 
 # type: textblock
-#: man/apt-show-versions.pod:94
+#: man/apt-show-versions.pod:118
 msgid "To get information about several packages:"
 msgstr ""
 
 # type: verbatim
-#: man/apt-show-versions.pod:96
+#: man/apt-show-versions.pod:120
 #, fuzzy, no-wrap
 msgid ""
 "    apt-show-versions dpkg apt\n"
@@ -281,7 +329,7 @@
 "\n"
 
 # type: verbatim
-#: man/apt-show-versions.pod:98
+#: man/apt-show-versions.pod:122
 #, fuzzy, no-wrap
 msgid ""
 "    apt-show-versions -r ^texlive\n"
@@ -291,12 +339,12 @@
 "\n"
 
 # type: textblock
-#: man/apt-show-versions.pod:100
+#: man/apt-show-versions.pod:124
 msgid "To upgrade all packages in testing:"
 msgstr "Para actualizar todos los paquetes de la distribución en pruebas:"
 
 # type: verbatim
-#: man/apt-show-versions.pod:102
+#: man/apt-show-versions.pod:126
 #, no-wrap
 msgid ""
 "    apt-get install `apt-show-versions -u -b | fgrep testing`\n"
@@ -306,21 +354,21 @@
 "\n"
 
 # type: =head1
-#: man/apt-show-versions.pod:104
+#: man/apt-show-versions.pod:128
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 # type: textblock
-#: man/apt-show-versions.pod:106
+#: man/apt-show-versions.pod:130
 msgid "Christoph Martin, martin at uni-mainz.de"
 msgstr "Christoph Martin, martin at uni-mainz.de"
 
 # type: =head1
-#: man/apt-show-versions.pod:108
+#: man/apt-show-versions.pod:132
 msgid "SEE ALSO"
 msgstr "VÉASE ADEMÁS"
 
 # type: textblock
-#: man/apt-show-versions.pod:110
+#: man/apt-show-versions.pod:134
 msgid "apt(8), dpkg(1)"
 msgstr "apt(8), dpkg(1)"

Modified: trunk/man/po/fr.po
===================================================================
--- trunk/man/po/fr.po	2008-02-12 20:27:30 UTC (rev 20)
+++ trunk/man/po/fr.po	2008-02-17 14:39:15 UTC (rev 21)
@@ -1,16 +1,17 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-# 
+# APT-SHOW-VERSIONS manpages (French translation)
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# Julien Louis <leonptitlouis at wanadoo.fr>, 2007
+# Jean-Baka Domelevo Entfellner <domelevo at gmail.com>, 2007
 msgid ""
 msgstr ""
 "Project-Id-Version: apt-show-versions 0.07\n"
-"POT-Creation-Date: 2007-08-16 21:12+0200\n"
-"PO-Revision-Date: 2004-07-15 22:59+0200\n"
-"Last-Translator: Julien Louis <leonptitlouis at wanadoo.fr>\n"
-"Language-Team: french <debian-l10n-french at lists.debian.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-16 22:17+0100\n"
+"PO-Revision-Date: 2008-01-10 14:06+0100\n"
+"Last-Translator: Jean-Baka Domelevo Entfellner <domelevo at gmail.com>\n"
+"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: =head1
@@ -37,10 +38,10 @@
 "installed and available package versions and distribution and shows upgrade "
 "options within the specific distribution of the selected package."
 msgstr ""
-"apt-show-versions analyse le fichier status de dpkg et les listes d'APT pour "
-"trouver les versions des paquets installés, les versions des paquets "
-"disponibles et la distribution. Il affiche les options des mises à jour "
-"d'une distribution spécifique pour un paquet donné."
+"apt-show-versions analyse le fichier d'état de dpkg et les listes d'APT pour "
+"trouver les versions des paquets installés, les versions des paquets "
+"disponibles et la distribution. Il affiche les options de mise à jour d'un "
+"paquet donné au sein d'une distribution spécifique."
 
 # type: textblock
 #: man/apt-show-versions.pod:12
@@ -49,9 +50,9 @@
 "want to list all packages which are from testing and can be upgraded in "
 "testing."
 msgstr ""
-"Cela peut s'avérer utile si vous avez mélangé les environnements stable et "
-"testing et que vous voulez lister tous les paquets provenant de testing et "
-"pouvant être mis à niveau."
+"Cela peut s'avérer utile si vous avez mélangé les environnements stable et "
+"testing et que vous voulez afficher tous les paquets provenant de testing et "
+"pouvant être mis à niveau."
 
 # type: textblock
 #: man/apt-show-versions.pod:16
@@ -62,14 +63,14 @@
 "information, but can't update the cache. If you run as root with the option "
 "B<-i> the cache is initialized or updated only."
 msgstr ""
-"apt-show-versions utilise un cache pour conserver les informations sur le "
-"statut des paquets installés et disponibles. Si vous lancez apt-show-"
-"versions en tant que superutilisateur, le cache est mis à jour si cela est "
-"nécessaire. Si vous ne le lancez pas en tant que superutilisatuer, apt-show-"
-"versions utilisera les informations disponibles les plus récentes, mais il "
-"ne peut pas mettre à jour le cache. Si vous l'exécutez en tant que "
-"superutilisateur avec l'option B<-i>, le cache est seulement initialisé ou "
-"mis à jour."
+"apt-show-versions utilise un cache pour conserver les informations sur "
+"l'état des paquets installés et disponibles. Si vous lancez apt-show-"
+"versions avec les privilèges du superutilisateur, le cache sera mis à jour "
+"si cela est nécessaire. Si vous ne le lancez pas avec les privilèges du "
+"superutilisateur, apt-show-versions utilisera les informations disponibles "
+"les plus récentes, mais il ne pourra pas mettre à jour le cache. Si vous "
+"l'exécutez en tant que superutilisateur avec l'option B<-i>, le cache sera "
+"seulement initialisé ou mis à jour."
 
 # type: =head1
 #: man/apt-show-versions.pod:22
@@ -93,7 +94,8 @@
 "If you don't give any options the status of all installed packages is "
 "printed."
 msgstr ""
-"Le status de tous les paquets sera affiché si vous ne donnez aucune option."
+"Si aucune option n'est utilisée, l'état de tous les paquets installés sera "
+"affiché."
 
 # type: =item
 #: man/apt-show-versions.pod:33
@@ -107,10 +109,10 @@
 "also specify a package name without the option B<-p>. If B<-p> and a package "
 "name are missing, all installed packages are displayed."
 msgstr ""
-"Afficher les versions disponibles et installées du paquet spécifié "
-"I<paquet>. Vous pouvez aussi spécifier le nom d'un paquet sans l'option B<-"
-"p>. S'il manque B<-p> et le nom d'un paquet, tous les paquets installés "
-"seront affichés."
+"Afficher les versions disponibles et installées du paquet spécifié "
+"I<paquet>. Vous pouvez aussi spécifier le nom d'un paquet sans l'option B<-"
+"p>. Si B<-p> et le nom d'un paquet sont absents, tous les paquets installés "
+"seront affichés."
 
 # type: =item
 #: man/apt-show-versions.pod:39
@@ -121,7 +123,7 @@
 #: man/apt-show-versions.pod:41
 msgid "interpret I<package> from option B<-p> as a regex."
 msgstr ""
-"Interprête I<paquet> de l'option B<-p> comme une expression rationnelle."
+"Interprète I<paquet> de l'option B<-p> comme une expression rationnelle."
 
 # type: =item
 #: man/apt-show-versions.pod:43
@@ -131,7 +133,7 @@
 # type: textblock
 #: man/apt-show-versions.pod:45
 msgid "Print only upgradeable packages"
-msgstr "N'affiche que les paquets pouvant être mis à niveau."
+msgstr "N'affiche que les paquets pouvant être mis à niveau."
 
 # type: =item
 #: man/apt-show-versions.pod:47
@@ -141,7 +143,7 @@
 # type: textblock
 #: man/apt-show-versions.pod:49
 msgid "Print all available versions of the selected packages"
-msgstr "Affiche toutes les versions disponibles du paquet sélectionné."
+msgstr "Affiche toutes les versions disponibles du paquet sélectionné."
 
 # type: =item
 #: man/apt-show-versions.pod:51
@@ -152,8 +154,8 @@
 #: man/apt-show-versions.pod:53
 msgid "Print only package_name/distribution for upgradeable packages"
 msgstr ""
-"Affiche seulement nom_du_paquet/distribution pour les paquet pouvant être "
-"mis à jour."
+"Affiche seulement nom_du_paquet/distribution pour les paquets pouvant être "
+"mis à jour."
 
 # type: =item
 #: man/apt-show-versions.pod:55
@@ -163,7 +165,7 @@
 # type: textblock
 #: man/apt-show-versions.pod:57
 msgid "Prints out verbose messages."
-msgstr "Affiche des bavardages."
+msgstr "Affiche des informations détaillées."
 
 # type: =item
 #: man/apt-show-versions.pod:59
@@ -176,9 +178,9 @@
 "Initialize or update package cache only (as root). Do this every time when "
 "the status of the installed or available packages has changed."
 msgstr ""
-"Ne fait qu'initialiser ou mettre à jour le cache (en tant que "
-"superutilisateur). Effectuez cette action à chaque fois que le statut des "
-"paquets disponibles ou installés change."
+"Ne fait qu'initialiser ou mettre à jour le cache (en tant que "
+"superutilisateur). Effectuez cette action à chaque fois que l'état des "
+"paquets disponibles ou installés change."
 
 # type: =item
 #: man/apt-show-versions.pod:64
@@ -189,13 +191,13 @@
 #: man/apt-show-versions.pod:66
 msgid "Use I<file> as the dpkg status file instead of /var/lib/dpkg/status"
 msgstr ""
-"Utilise I<fichier> comme fichier status de dpkg à la place de /var/lib/dpkg/"
+"Utilise I<fichier> comme fichier d'état de dpkg à la place de /var/lib/dpkg/"
 "status"
 
 # type: =item
 #: man/apt-show-versions.pod:68
 msgid "B<-ld> I<directory>, B<--list-dir>=I<directory>"
-msgstr "B<-ld> I<répertoire>, B<--list-dir>=I<répertoire>"
+msgstr "B<-ld> I<répertoire>, B<--list-dir>=I<répertoire>"
 
 # type: textblock
 #: man/apt-show-versions.pod:70
@@ -203,7 +205,7 @@
 "Use I<directory> as path to apt's list files instead of /var/state/apt/"
 "lists/ or /var/lib/apt/lists/"
 msgstr ""
-"Utilise I<répertoire> comme chemin vers la liste des fichiers de apt au lieu "
+"Utilise I<répertoire> comme chemin vers la liste des fichiers de apt au lieu "
 "de /var/state/apt/lists/ ou /var/lib/apt/lists/"
 
 # type: =item
@@ -218,20 +220,68 @@
 
 # type: =head1
 #: man/apt-show-versions.pod:79
+msgid "EXIT CODES"
+msgstr ""
+
+# type: =item
+#: man/apt-show-versions.pod:83
+msgid "0"
+msgstr ""
+
+# type: textblock
+#: man/apt-show-versions.pod:85
+msgid "No error"
+msgstr ""
+
+# type: =item
+#: man/apt-show-versions.pod:87
+msgid "1"
+msgstr ""
+
+# type: textblock
+#: man/apt-show-versions.pod:89
+msgid "Wrong usage"
+msgstr ""
+
+# type: =item
+#: man/apt-show-versions.pod:91
+msgid "2"
+msgstr ""
+
+# type: textblock
+#: man/apt-show-versions.pod:93
+msgid ""
+"apt-show-version has been called with exactly one package and upgradeable "
+"option set, but package is uptodate. As no output has been requested, this "
+"case gets signaled using the exit code."
+msgstr ""
+
+# type: =item
+#: man/apt-show-versions.pod:97
+msgid "255"
+msgstr ""
+
+# type: textblock
+#: man/apt-show-versions.pod:99
+msgid "Unspecified error"
+msgstr ""
+
+# type: =head1
+#: man/apt-show-versions.pod:103
 msgid "EXAMPLES"
 msgstr "EXEMPLES"
 
 # type: textblock
-#: man/apt-show-versions.pod:81
+#: man/apt-show-versions.pod:105
 msgid ""
 "If you want to know for all your installed packages whether they are "
 "uptodate or upgradeable, use:"
 msgstr ""
-"Si vous voulez savoir si tous vos paquets sont à jour ou s'il peuvent être "
-"mis à niveau, utilisez :"
+"Si vous voulez savoir si tous vos paquets sont à jour ou s'ils peuvent être "
+"mis à niveau, utilisez :"
 
 # type: verbatim
-#: man/apt-show-versions.pod:84
+#: man/apt-show-versions.pod:108
 #, no-wrap
 msgid ""
 "    apt-show-versions\n"
@@ -241,13 +291,12 @@
 "\n"
 
 # type: textblock
-#: man/apt-show-versions.pod:86
+#: man/apt-show-versions.pod:110
 msgid "If you want to have a list of all upgradeable packages:"
-msgstr ""
-"Si vous voulez voir la liste de tous les paquets pouvant être mis à niveau :"
+msgstr "Pour voir la liste de tous les paquets pouvant être mis à niveau :"
 
 # type: verbatim
-#: man/apt-show-versions.pod:88
+#: man/apt-show-versions.pod:112
 #, no-wrap
 msgid ""
 "    apt-show-versions -u\n"
@@ -257,13 +306,13 @@
 "\n"
 
 # type: textblock
-#: man/apt-show-versions.pod:90
+#: man/apt-show-versions.pod:114
 msgid "To get a list of all available versions of libc6:"
 msgstr ""
-"Pour avoir la liste de toutes les versions disponibles du paquet libc6 :"
+"Pour avoir la liste de toutes les versions disponibles du paquet libc6Â :"
 
 # type: verbatim
-#: man/apt-show-versions.pod:92
+#: man/apt-show-versions.pod:116
 #, no-wrap
 msgid ""
 "    apt-show-versions -a -p libc6\n"
@@ -273,37 +322,37 @@
 "\n"
 
 # type: textblock
-#: man/apt-show-versions.pod:94
+#: man/apt-show-versions.pod:118
 msgid "To get information about several packages:"
-msgstr ""
+msgstr "Pour obtenir des informations sur plusieurs paquets :"
 
 # type: verbatim
-#: man/apt-show-versions.pod:96
-#, fuzzy, no-wrap
+#: man/apt-show-versions.pod:120
+#, no-wrap
 msgid ""
 "    apt-show-versions dpkg apt\n"
 "\n"
 msgstr ""
-"    apt-show-versions\n"
+"    apt-show-versions dpkg apt\n"
 "\n"
 
 # type: verbatim
-#: man/apt-show-versions.pod:98
-#, fuzzy, no-wrap
+#: man/apt-show-versions.pod:122
+#, no-wrap
 msgid ""
 "    apt-show-versions -r ^texlive\n"
 "\n"
 msgstr ""
-"    apt-show-versions -u\n"
+"    apt-show-versions -r ^texlive\n"
 "\n"
 
 # type: textblock
-#: man/apt-show-versions.pod:100
+#: man/apt-show-versions.pod:124
 msgid "To upgrade all packages in testing:"
-msgstr "Pour mettre à niveau tous les paquets de testing :"
+msgstr "Pour mettre à niveau tous les paquets de testing :"
 
 # type: verbatim
-#: man/apt-show-versions.pod:102
+#: man/apt-show-versions.pod:126
 #, no-wrap
 msgid ""
 "    apt-get install `apt-show-versions -u -b | fgrep testing`\n"
@@ -313,25 +362,21 @@
 "\n"
 
 # type: =head1
-#: man/apt-show-versions.pod:104
+#: man/apt-show-versions.pod:128
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 # type: textblock
-#: man/apt-show-versions.pod:106
+#: man/apt-show-versions.pod:130
 msgid "Christoph Martin, martin at uni-mainz.de"
 msgstr "Christoph Martin, martin at uni-mainz.de"
 
 # type: =head1
-#: man/apt-show-versions.pod:108
+#: man/apt-show-versions.pod:132
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 # type: textblock
-#: man/apt-show-versions.pod:110
+#: man/apt-show-versions.pod:134
 msgid "apt(8), dpkg(1)"
 msgstr "apt(8), dpkg(1)"
-
-# type: verbatim
-#~ msgid "\n"
-#~ msgstr "\n"

Modified: trunk/man/po/sv.po
===================================================================
--- trunk/man/po/sv.po	2008-02-12 20:27:30 UTC (rev 20)
+++ trunk/man/po/sv.po	2008-02-17 14:39:15 UTC (rev 21)
@@ -2,13 +2,13 @@
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # Daniel Nylander <po at danielnylander.se>, 2005.
 # , fuzzy
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: apt-show-versions 0.09\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-16 21:12+0200\n"
+"POT-Creation-Date: 2008-02-16 22:17+0100\n"
 "PO-Revision-Date: 2005-10-07 18:04+0200\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -209,11 +209,59 @@
 
 # type: =head1
 #: man/apt-show-versions.pod:79
+msgid "EXIT CODES"
+msgstr ""
+
+# type: =item
+#: man/apt-show-versions.pod:83
+msgid "0"
+msgstr ""
+
+# type: textblock
+#: man/apt-show-versions.pod:85
+msgid "No error"
+msgstr ""
+
+# type: =item
+#: man/apt-show-versions.pod:87
+msgid "1"
+msgstr ""
+
+# type: textblock
+#: man/apt-show-versions.pod:89
+msgid "Wrong usage"
+msgstr ""
+
+# type: =item
+#: man/apt-show-versions.pod:91
+msgid "2"
+msgstr ""
+
+# type: textblock
+#: man/apt-show-versions.pod:93
+msgid ""
+"apt-show-version has been called with exactly one package and upgradeable "
+"option set, but package is uptodate. As no output has been requested, this "
+"case gets signaled using the exit code."
+msgstr ""
+
+# type: =item
+#: man/apt-show-versions.pod:97
+msgid "255"
+msgstr ""
+
+# type: textblock
+#: man/apt-show-versions.pod:99
+msgid "Unspecified error"
+msgstr ""
+
+# type: =head1
+#: man/apt-show-versions.pod:103
 msgid "EXAMPLES"
 msgstr "EXEMPEL"
 
 # type: textblock
-#: man/apt-show-versions.pod:81
+#: man/apt-show-versions.pod:105
 msgid ""
 "If you want to know for all your installed packages whether they are "
 "uptodate or upgradeable, use:"
@@ -222,7 +270,7 @@
 "(uptodate) eller uppgraderingsbara, använd då:"
 
 # type: verbatim
-#: man/apt-show-versions.pod:84
+#: man/apt-show-versions.pod:108
 #, no-wrap
 msgid ""
 "    apt-show-versions\n"
@@ -232,12 +280,12 @@
 "\n"
 
 # type: textblock
-#: man/apt-show-versions.pod:86
+#: man/apt-show-versions.pod:110
 msgid "If you want to have a list of all upgradeable packages:"
 msgstr "Om du vill ha en lista på alla uppgraderingsbara paket:"
 
 # type: verbatim
-#: man/apt-show-versions.pod:88
+#: man/apt-show-versions.pod:112
 #, no-wrap
 msgid ""
 "    apt-show-versions -u\n"
@@ -247,12 +295,12 @@
 "\n"
 
 # type: textblock
-#: man/apt-show-versions.pod:90
+#: man/apt-show-versions.pod:114
 msgid "To get a list of all available versions of libc6:"
 msgstr "För att få en lista av alla tillgängliga versioner av libc6:"
 
 # type: verbatim
-#: man/apt-show-versions.pod:92
+#: man/apt-show-versions.pod:116
 #, no-wrap
 msgid ""
 "    apt-show-versions -a -p libc6\n"
@@ -262,12 +310,12 @@
 "\n"
 
 # type: textblock
-#: man/apt-show-versions.pod:94
+#: man/apt-show-versions.pod:118
 msgid "To get information about several packages:"
 msgstr ""
 
 # type: verbatim
-#: man/apt-show-versions.pod:96
+#: man/apt-show-versions.pod:120
 #, fuzzy, no-wrap
 msgid ""
 "    apt-show-versions dpkg apt\n"
@@ -277,7 +325,7 @@
 "\n"
 
 # type: verbatim
-#: man/apt-show-versions.pod:98
+#: man/apt-show-versions.pod:122
 #, fuzzy, no-wrap
 msgid ""
 "    apt-show-versions -r ^texlive\n"
@@ -287,12 +335,12 @@
 "\n"
 
 # type: textblock
-#: man/apt-show-versions.pod:100
+#: man/apt-show-versions.pod:124
 msgid "To upgrade all packages in testing:"
 msgstr "För att uppgradera alla paket i testing:"
 
 # type: verbatim
-#: man/apt-show-versions.pod:102
+#: man/apt-show-versions.pod:126
 #, no-wrap
 msgid ""
 "    apt-get install `apt-show-versions -u -b | fgrep testing`\n"
@@ -302,21 +350,21 @@
 "\n"
 
 # type: =head1
-#: man/apt-show-versions.pod:104
+#: man/apt-show-versions.pod:128
 msgid "AUTHOR"
 msgstr "SKAPARE"
 
 # type: textblock
-#: man/apt-show-versions.pod:106
+#: man/apt-show-versions.pod:130
 msgid "Christoph Martin, martin at uni-mainz.de"
 msgstr "Christoph Martin, martin at uni-mainz.de"
 
 # type: =head1
-#: man/apt-show-versions.pod:108
+#: man/apt-show-versions.pod:132
 msgid "SEE ALSO"
 msgstr "SE OCKSÅ"
 
 # type: textblock
-#: man/apt-show-versions.pod:110
+#: man/apt-show-versions.pod:134
 msgid "apt(8), dpkg(1)"
 msgstr "apt(8), dpkg(1)"