Updated to dpkg 1.4.1.4

diff --git a/ChangeLog b/ChangeLog
index c3d7e4bb3e2729249e646169459114118a2d2622..399500d98e5d8db5c29b51c464484e6a4c977019 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+dpkg (1.4.1.3) unstable; urgency=low
+
+  * Modify tarobject() so it does not complain if we are creating a
+    directory that replaces a removed file. This works around the
+    problem that the filedatabase doesn't remember what filetype a
+    file was by assuming it already was a directory
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Mon, 31 May 1999 23:49:23 +0200
+
+dpkg (1.4.1.2) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Rebuild, so this is glibc2.1 (unless you're on m68k), which is rumoured
+    to also fix the i8n-problems.
+  * Incorporate 1.6 format of .changes, patch from Guy Maor
+  * Fix bug in section-handling of dpkg-scanpackages, patch from Guy Maor
+  * Disable force-overwrites again, since we're in unstable
+  * Assume largemem on systems for which sysinfo is not available, Bug# 33658
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Wed, 26 May 1999 15:50:17 +0200
+
+dpkg (1.4.1.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Install emacs-startup scripts with mode 0644 (lintian)
+  * Incorporate changes in NMU 1.4.0.32 made by Vincent Renardias
+    <vincent@waw.com> for slink:
+    + Apply patch from Jim Pick for update-alternatives.pl to
+      fix 'Important' bugs #30891 in dpkg and (#27382, #27383, #27696,
+      #27703, #27736, #27097(merged bugs)) in jdk1.1.
+  * Incorporate changes in NMU 1.4.0.33 made by me for slink:
+    + Fix illegal perl construct (Bug# 30985)
+    + Initialize oialtname->useinstead and oicontest->camefrom to 0 (Bug# 30397)
+    + Update shlibs.default for libncurses 4 (Bug# 30332)
+    + Suggest debian-keyring instead of developer-keyring (Bug# 27376, 30248)
+    + Abort dpkg-divert when attempting to divert a directory (Bug# 30126)
+    + Make dpkg-deb.1 aware that it is in section 1, not 8
+    + Fix section in reference to dpkg-deb in dpkg.8 (Bug# 29740)
+    + Fix typo in --force-help (Bug# 26193)
+    + Correct path for debian-changelog-mode.el (Bug# 24606)
+    + Make disk-method for dpkg use /var/run instead of /tmp to fix
+      symlink-attacks (Bug# 21399)
+    + Document -n and -f options for update-rc.d in manpage (Bug# 15913)
+    + Add --abort-after option to change after how many errors we abort and
+      change the default to 50 (Bug# 22940)
+    + Fix controllib.pl: don't check debian/substvars unless needed, and
+      don't depend on language settings (Bug# 31508)
+    + Allow a - in the architecture-field (Bug# 25537)
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Mon,  1 Feb 1999 00:44:01 +0100
+
+dpkg (1.4.1) unstable; urgency=low
+
+  * Maintainer release by IWJ.
+  * Changed Maintainer: field description.
+  * Various changes to make the damn thing build.
+  * Add .cvsignore files.
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Sun,  1 Nov 1998 17:33:38 +0000
+
 dpkg (1.4.0.31) unstable; urgency=low
 
   * dpkg/processarc.c: Make newfileslist static like the other arguments

diff --git a/configure.in b/configure.in
index fc97395ffbb40bdf2b199640eac69d14be032754..536ce54aa6f5fb97956df34dc52e6c56a7c92b38 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -90,7 +90,7 @@ AC_ARG_WITH(olddeb,
 
 dnl gettext
 
-ALL_LINGUAS="en fr"
+ALL_LINGUAS="en fr es"
 AM_GNU_GETTEXT
 AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
 AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])

diff --git a/debian/changelog b/debian/changelog
index 60d2a915633884fa3734bf6981c4c6d7771cfe1a..fc0dd5bc163201d42c946c0278ea2506edbeaa51 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+dpkg (1.4.1.4) unstable; urgency=low
+
+  * Also change developer-keyring to debian-keyring for dpkg-dev package
+  * Include spanish translation from Nicolás Lichtmaier <nick@debian.org>
+  * Depend on perl5 instead of perl
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Mon,  5 Jul 1999 00:04:14 +0200
+
+dpkg (1.4.1.3) unstable; urgency=low
+
+  * Modify tarobject() so it does not complain if we are creating a
+    directory that replaces a removed file. This works around the
+    problem that the filedatabase doesn't remember what filetype a
+    file was by assuming it already was a directory
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Mon, 31 May 1999 23:49:23 +0200
+
+dpkg (1.4.1.2) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Rebuild, so this is glibc2.1 (unless you're on m68k), which is rumoured
+    to also fix the i8n-problems.
+  * Incorporate 1.6 format of .changes, patch from Guy Maor
+  * Fix bug in section-handling of dpkg-scanpackages, patch from Guy Maor
+  * Disable force-overwrites again, since we're in unstable
+  * Assume largemem on systems for which sysinfo is not available, Bug# 33658
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Wed, 26 May 1999 15:50:17 +0200
+
 dpkg (1.4.1.1) unstable; urgency=low
 
   * Non-maintainer upload

diff --git a/debian/control b/debian/control
index e00a27299820f2af1575eb1ce2d3f5e14a74db9b..9b4ba3b17e2e16107fee8da447499929b08882ba 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -24,9 +24,9 @@ Package: dpkg-dev
 Section: devel
 Priority: important
 Architecture: all
-Depends: perl
+Depends: perl5
 Recommends: cpio (>= 2.4.2-2), patch (>= 2.2-1), gcc, make
-Suggests: gnupg, developer-keyring
+Suggests: gnupg, debian-keyring
 Conflicts: dpkgname
 Replaces: dpkgname, dpkg (<< 1.4.0)
 Description: Package building tools for Debian Linux

diff --git a/doc/manuals-version b/doc/manuals-version
index 07d249e097e15e31063d9f1c481e1bdf65f6d465..0de45ccea47ae94362c82713a4656e8f29f802af 100644 (file)
--- a/doc/manuals-version
+++ b/doc/manuals-version
@@ -1,2 +1,2 @@
-<!entity manuals-version "1.4.1.1">
-<!entity dpkg-version "1.4.1.1">
+<!entity manuals-version "1.4.1.3">
+<!entity dpkg-version "1.4.1.3">

diff --git a/main/archives.c b/main/archives.c
index 5b7769ce88d40dea8b2d3311f2cbb3f9250127cb..057b6d3280fd065efb88cc6b3f95a6a05fe17bd8 100644 (file)
--- a/main/archives.c
+++ b/main/archives.c
@@ -356,7 +356,12 @@ int tarobject(struct TarInfo *ti) {
                         "in package %.250s with nondirectory"),
                         nifd->namenode->name,otherpkg->name);
           } else {
-            forcibleerr(fc_overwrite,
+            /* WTA: At this point we are replacing something without a Replaces.
+            * if the new object is a directory and the previous object does not
+            * exist assume it's also a directory and don't complain
+            */
+            if (! (statr && ti->Type==Directory))
+              forcibleerr(fc_overwrite,
                         _("trying to overwrite `%.250s', which is also in package %.250s"),
                         nifd->namenode->name,otherpkg->name);
           }

diff --git a/main/filesdb.c b/main/filesdb.c
index 5ff4bdee504d749e71ab503551bdd3f99f1fdcbe..ab18f7f543915967e778df53728ca59c2c55be9b 100644 (file)
--- a/main/filesdb.c
+++ b/main/filesdb.c
@@ -354,7 +354,7 @@ void ensure_diversions(void) {
     linebuf[l]= 0;
     oialtname->camefrom= findnamenode(linebuf);
     oialtname->useinstead= 0;    
-    
+
     if (!fgets(linebuf,sizeof(linebuf),file))
       if (ferror(file)) ohshite(_("read error in diversions [ii]"));
       else ohshit(_("unexpected EOF in diversions [ii]"));
@@ -487,9 +487,12 @@ void iterfileend(struct fileiterator *i) {
 
 void filesdbinit(void) {
   struct filenamenode *fnn;
+#ifdef HAVE_SYSINFO
   struct sysinfo info;
+#endif
   int i;
 
+#ifdef HAVE_SYSINFO
   if (!f_largemem) {
     f_largemem= -1;
     if (!sysinfo(&info)) {
@@ -498,7 +501,10 @@ void filesdbinit(void) {
         f_largemem= 1;
     }
   }
-  
+#else
+  f_largemem= 1;
+#endif
+
   switch (f_largemem) {
   case 1:
     for (i=0; i<BINS; i++)

diff --git a/main/main.c b/main/main.c
index 4522cb12a6ed6f7a7c4fe9c351d82445efa824ba..79d5526eb476cae6ec22016ecd301f5b96d9e084 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -73,7 +73,7 @@ Usage: \n\
   dpkg -l|--list [<pattern> ...]          list packages concisely\n\
   dpkg -S|--search <pattern> ...          find package(s) owning file(s)\n\
   dpkg -C|--audit                         check for broken package(s)\n\
-  dpkg --abort-after <n>                  abort after encountering <n> errors\n
+  dpkg --abort-after <n>                  abort after encountering <n> errors\n\
   dpkg --print-architecture               print target architecture (uses GCC)\n\
   dpkg --print-gnu-build-architecture     print GNU version of target arch\n\
   dpkg --print-installation-architecture  print host architecture (for inst'n)\n\
@@ -88,7 +88,7 @@ Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n\
 For internal use: dpkg --assert-support-predepends | --predep-package |\n\
   --assert-working-epoch\n\
 \n\
-Options:
+Options:\n\
   --admindir=<directory>     Use <directory> instead of %s\n\
   --root=<directory>         Install on alternative system rooted elsewhere\n\
   --instdir=<directory>      Change inst'n root without changing admin dir\n\
@@ -129,7 +129,7 @@ int f_pending=0, f_recursive=0, f_alsoselect=1, f_skipsame=0, f_noact=0;
 int f_autodeconf=0, f_largemem=0;
 unsigned long f_debug=0;
 /* Change fc_overwrite to 1 to enable force-overwrite by default */
-int fc_downgrade=1, fc_configureany=0, fc_hold=0, fc_removereinstreq=0, fc_overwrite=1;
+int fc_downgrade=1, fc_configureany=0, fc_hold=0, fc_removereinstreq=0, fc_overwrite=0;
 int fc_removeessential=0, fc_conflicts=0, fc_depends=0, fc_dependsversion=0;
 int fc_autoselect=1, fc_badpath=0, fc_overwritediverted=0, fc_architecture=0;
 int fc_nonroot=0, fc_overwritedir=0;

diff --git a/po/en.po b/po/en.po
index bbb4a543fade9c5069c35e7c2203ac9ceaa92ed5..6143b5ef4f7fb274c58f7ef0ef3a5b68a6a8cfa2 100644 (file)
--- a/po/en.po
+++ b/po/en.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-01-31 05:45-0800\n"
+"POT-Creation-Date: 1999-06-01 00:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -639,12 +639,12 @@ msgstr "error reading from dpkg-deb pipe"
 msgid "error setting timestamps of `%.255s'"
 msgstr "error setting timestamps of `%.255s'"
 
-#: main/archives.c:165 main/archives.c:407
+#: main/archives.c:165 main/archives.c:412
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "error setting ownership of `%.255s'"
 
-#: main/archives.c:167 main/archives.c:415
+#: main/archives.c:167 main/archives.c:420
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "error setting permissions of `%.255s'"
@@ -689,96 +689,96 @@ msgid ""
 msgstr ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 
-#: main/archives.c:360
+#: main/archives.c:365
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "trying to overwrite `%.250s', which is also in package %.250s"
 
-#: main/archives.c:388
+#: main/archives.c:393
 #, c-format
 msgid "unable to fdopen for `%.255s'"
 msgstr "unable to fdopen for `%.255s'"
 
-#: main/archives.c:397
+#: main/archives.c:402
 #, c-format
 msgid "error reading dpkg-deb during `%.255s'"
 msgstr "error reading dpkg-deb during `%.255s'"
 
-#: main/archives.c:404
+#: main/archives.c:409
 #, c-format
 msgid "error writing to `%.255s'"
 msgstr "error writing to `%.255s'"
 
-#: main/archives.c:413
+#: main/archives.c:418
 #, c-format
 msgid "error flushing `%.255s'"
 msgstr "error flushing `%.255s'"
 
-#: main/archives.c:418
+#: main/archives.c:423
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "error closing/writing `%.255s'"
 
-#: main/archives.c:423
+#: main/archives.c:428
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "error creating pipe `%.255s'"
 
-#: main/archives.c:429
+#: main/archives.c:434
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "error creating device `%.255s'"
 
-#: main/archives.c:438
+#: main/archives.c:443
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "error creating hard link `%.255s'"
 
-#: main/archives.c:445
+#: main/archives.c:450
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "error creating symbolic link `%.255s'"
 
-#: main/archives.c:452
+#: main/archives.c:457
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "error setting ownership of symlink `%.255s'"
 
-#: main/archives.c:458
+#: main/archives.c:463
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "error creating directory `%.255s'"
 
-#: main/archives.c:463
+#: main/archives.c:468
 msgid "bad tar type, but already checked"
 msgstr "bad tar type, but already checked"
 
-#: main/archives.c:493
+#: main/archives.c:498
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "unable to move aside `%.255s' to install new version"
 
-#: main/archives.c:506
+#: main/archives.c:511
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "unable to make backup symlink for `%.255s'"
 
-#: main/archives.c:512
+#: main/archives.c:517
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "unable to chown backup symlink for `%.255s'"
 
-#: main/archives.c:516
+#: main/archives.c:521
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "unable to make backup link of `%.255s' before installing new version"
 
-#: main/archives.c:522
+#: main/archives.c:527
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "unable to install new version of `%.255s'"
 
-#: main/archives.c:536
+#: main/archives.c:541
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -787,7 +787,7 @@ msgstr ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
 "%s"
 
-#: main/archives.c:543
+#: main/archives.c:548
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -796,7 +796,7 @@ msgstr ""
 "dpkg: warning - considering deconfiguration of essential\n"
 " package %s, to enable removal of %s.\n"
 
-#: main/archives.c:547
+#: main/archives.c:552
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -805,7 +805,7 @@ msgstr ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable removal of %s.\n"
 
-#: main/archives.c:560
+#: main/archives.c:565
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -814,22 +814,22 @@ msgstr ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
 "%s"
 
-#: main/archives.c:594
+#: main/archives.c:599
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: considering removing %s in favour of %s ...\n"
 
-#: main/archives.c:598
+#: main/archives.c:603
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s is not properly installed - ignoring any dependencies on it.\n"
 
-#: main/archives.c:625
+#: main/archives.c:630
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: may have trouble removing %s, as it provides %s ...\n"
 
-#: main/archives.c:640
+#: main/archives.c:645
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -838,17 +838,17 @@ msgstr ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "request.\n"
 
-#: main/archives.c:643
+#: main/archives.c:648
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: package %s requires reinstallation, will not remove.\n"
 
-#: main/archives.c:652
+#: main/archives.c:657
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: yes, will remove %s in favour of %s.\n"
 
-#: main/archives.c:660
+#: main/archives.c:665
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -857,46 +857,46 @@ msgstr ""
 "dpkg: regarding %s containing %s:\n"
 "%s"
 
-#: main/archives.c:663
+#: main/archives.c:668
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "conflicting packages - not installing %.250s"
 
-#: main/archives.c:664
+#: main/archives.c:669
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 
-#: main/archives.c:701
+#: main/archives.c:706
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive needs at least one path argument"
 
-#: main/archives.c:730
+#: main/archives.c:735
 msgid "failed to exec find for --recursive"
 msgstr "failed to exec find for --recursive"
 
-#: main/archives.c:734
+#: main/archives.c:739
 msgid "failed to fdopen find's pipe"
 msgstr "failed to fdopen find's pipe"
 
-#: main/archives.c:741
+#: main/archives.c:746
 msgid "error reading find's pipe"
 msgstr "error reading find's pipe"
 
-#: main/archives.c:742
+#: main/archives.c:747
 msgid "error closing find's pipe"
 msgstr "error closing find's pipe"
 
-#: main/archives.c:745
+#: main/archives.c:750
 msgid "searched, but found no packages (files matching *.deb"
 msgstr "searched, but found no packages (files matching *.deb"
 
-#: main/archives.c:762
+#: main/archives.c:767
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s needs at least one package archive file argument"
 
-#: main/archives.c:809
+#: main/archives.c:814
 msgid "unknown action"
 msgstr "unknown action"
 
@@ -1906,7 +1906,7 @@ msgstr ""
 "conditions.  There is NO warranty.  See dpkg --licence for details.\n"
 
 #: main/main.c:57
-#, fuzzy
+#, c-format
 msgid ""
 "Usage: \n"
 "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -1929,26 +1929,6 @@ msgid ""
 "  dpkg -C|--audit                         check for broken package(s)\n"
 "  dpkg --abort-after <n>                  abort after encountering <n> "
 "errors\n"
-msgstr ""
-"Usage: \n"
-"  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
-"  dpkg --unpack          <.deb file name> ... | -R|--recursive <dir> ...\n"
-"  dpkg -A|--record-avail <.deb file name> ... | -R|--recursive <dir> ...\n"
-"  dpkg --configure           <package name> ... | -a|--pending\n"
-"  dpkg -r|--remove | --purge <package name> ... | -a|--pending\n"
-"  dpkg --get-selections [<pattern> ...]   get list of selections to stdout\n"
-"  dpkg --set-selections                   set package selections from stdin\n"
-"  dpkg --update-avail <Packages-file>     replace available packages info\n"
-"  dpkg --merge-avail <Packages-file>      merge with info from file\n"
-"  dpkg --clear-avail                      erase existing available info\n"
-"  dpkg --forget-old-unavail               forget uninstalled unavailable "
-"pkgs\n"
-"  dpkg -s|--status <package-name> ...     display package status details\n"
-"  dpkg --print-avail <package-name> ...   display available version details\n"
-"  dpkg -L|--listfiles <package-name> ...  list files `owned' by package(s)\n"
-"  dpkg -l|--list [<pattern> ...]          list packages concisely\n"
-"  dpkg -S|--search <pattern> ...          find package(s) owning file(s)\n"
-"  dpkg -C|--audit                         check for broken package(s)\n"
 "  dpkg --print-architecture               print target architecture (uses "
 "GCC)\n"
 "  dpkg --print-gnu-build-architecture     print GNU version of target arch\n"
@@ -1990,6 +1970,7 @@ msgstr ""
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
 "Use `dselect' for user-friendly package management.\n"
+msgstr ""
 
 #: main/main.c:117
 msgid ""
@@ -3521,3 +3502,88 @@ msgstr "%s: %d of %d file(s) failed MD5 check\n"
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: no files checked\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: \n"
+#~ "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
+#~ "  dpkg --unpack          <.deb file name> ... | -R|--recursive <dir> ...\n"
+#~ "  dpkg -A|--record-avail <.deb file name> ... | -R|--recursive <dir> ...\n"
+#~ "  dpkg --configure           <package name> ... | -a|--pending\n"
+#~ "  dpkg -r|--remove | --purge <package name> ... | -a|--pending\n"
+#~ "  dpkg --get-selections [<pattern> ...]   get list of selections to stdout\n"
+#~ "  dpkg --set-selections                   set package selections from stdin\n"
+#~ "  dpkg --update-avail <Packages-file>     replace available packages info\n"
+#~ "  dpkg --merge-avail <Packages-file>      merge with info from file\n"
+#~ "  dpkg --clear-avail                      erase existing available info\n"
+#~ "  dpkg --forget-old-unavail               forget uninstalled unavailable "
+#~ "pkgs\n"
+#~ "  dpkg -s|--status <package-name> ...     display package status details\n"
+#~ "  dpkg --print-avail <package-name> ...   display available version details\n"
+#~ "  dpkg -L|--listfiles <package-name> ...  list files `owned' by package(s)\n"
+#~ "  dpkg -l|--list [<pattern> ...]          list packages concisely\n"
+#~ "  dpkg -S|--search <pattern> ...          find package(s) owning file(s)\n"
+#~ "  dpkg -C|--audit                         check for broken package(s)\n"
+#~ "  dpkg --abort-after <n>                  abort after encountering <n> "
+#~ "errors\n"
+#~ msgstr ""
+#~ "Usage: \n"
+#~ "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
+#~ "  dpkg --unpack          <.deb file name> ... | -R|--recursive <dir> ...\n"
+#~ "  dpkg -A|--record-avail <.deb file name> ... | -R|--recursive <dir> ...\n"
+#~ "  dpkg --configure           <package name> ... | -a|--pending\n"
+#~ "  dpkg -r|--remove | --purge <package name> ... | -a|--pending\n"
+#~ "  dpkg --get-selections [<pattern> ...]   get list of selections to stdout\n"
+#~ "  dpkg --set-selections                   set package selections from stdin\n"
+#~ "  dpkg --update-avail <Packages-file>     replace available packages info\n"
+#~ "  dpkg --merge-avail <Packages-file>      merge with info from file\n"
+#~ "  dpkg --clear-avail                      erase existing available info\n"
+#~ "  dpkg --forget-old-unavail               forget uninstalled unavailable "
+#~ "pkgs\n"
+#~ "  dpkg -s|--status <package-name> ...     display package status details\n"
+#~ "  dpkg --print-avail <package-name> ...   display available version details\n"
+#~ "  dpkg -L|--listfiles <package-name> ...  list files `owned' by package(s)\n"
+#~ "  dpkg -l|--list [<pattern> ...]          list packages concisely\n"
+#~ "  dpkg -S|--search <pattern> ...          find package(s) owning file(s)\n"
+#~ "  dpkg -C|--audit                         check for broken package(s)\n"
+#~ "  dpkg --print-architecture               print target architecture (uses "
+#~ "GCC)\n"
+#~ "  dpkg --print-gnu-build-architecture     print GNU version of target arch\n"
+#~ "  dpkg --print-installation-architecture  print host architecture (for "
+#~ "inst'n)\n"
+#~ "  dpkg --compare-versions <a> <rel> <b>   compare version numbers - see "
+#~ "below\n"
+#~ "  dpkg --help | --version                 show this help / version number\n"
+#~ "  dpkg --force-help | -Dh|--debug=help    help on forcing resp. debugging\n"
+#~ "  dpkg --licence                          print copyright licencing terms\n"
+#~ "\n"
+#~ "Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
+#~ " -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --help.)\n"
+#~ "\n"
+#~ "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
+#~ "  --assert-working-epoch\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  --admindir=<directory>     Use <directory> instead of %s\n"
+#~ "  --root=<directory>         Install on alternative system rooted elsewhere\n"
+#~ "  --instdir=<directory>      Change inst'n root without changing admin dir\n"
+#~ "  -O|--selected-only         Skip packages not selected for install/upgrade\n"
+#~ "  -E|--skip-same-version     Skip packages whose same version is installed\n"
+#~ "  -G=--refuse-downgrade      Skip packages with earlier version than "
+#~ "installed\n"
+#~ "  -B|--auto-deconfigure      Install even if it would break some other "
+#~ "package\n"
+#~ "  --largemem | --smallmem    Optimise for large (>4Mb) or small (<4Mb) RAM "
+#~ "use\n"
+#~ "  --no-act                   Just say what we would do - don't do it\n"
+#~ "  -D|--debug=<octal>         Enable debugging - see -Dhelp or --debug=help\n"
+#~ "  --ignore-depends=<package>,... Ignore dependencies involving <package>\n"
+#~ "  --force-...                    Override problems - see --force-help\n"
+#~ "  --no-force-...|--refuse-...    Stop when problems encountered\n"
+#~ "\n"
+#~ "Comparison operators for --compare-versions are:\n"
+#~ " lt le eq ne ge gt       (treat no version as earlier than any version);\n"
+#~ " lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+#~ " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
+#~ "\n"
+#~ "Use `dselect' for user-friendly package management.\n"

diff --git a/po/fr.po b/po/fr.po
index 7180fd68dc5d0ad848d82ba076f145853658d9f9..c7aac29dbf7445011aae28f6524ffd343ee9c54f 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.4.0.14\n"
-"POT-Creation-Date: 1999-01-31 05:45-0800\n"
+"POT-Creation-Date: 1999-06-01 00:29+0200\n"
 "PO-Revision-Date: 1997-05-13 22:07 EDT\n"
 "Last-Translator: Christophe Le Bars <clebars@debian.org>\n"
 "Language-Team: French\n"
@@ -713,12 +713,12 @@ msgstr "erreur en lisant du tube de dpkg-deb"
 msgid "error setting timestamps of `%.255s'"
 msgstr "erreur en paramétrant les \"timestamps\" de `%.255s'"
 
-#: main/archives.c:165 main/archives.c:407
+#: main/archives.c:165 main/archives.c:412
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "erreur en paramétrant les droits de `%.255s'"
 
-#: main/archives.c:167 main/archives.c:415
+#: main/archives.c:167 main/archives.c:420
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "erreur en paramétrant les permissions de `%.255s'"
@@ -765,101 +765,101 @@ msgstr ""
 "tentative pour remplacer le répertoire `%.250s' du paquet %.250s avec un "
 "non-répertoire"
 
-#: main/archives.c:360
+#: main/archives.c:365
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr ""
 "tentative pour remplacer `%.250s', qui appartient aussi au paquet %.250s"
 
-#: main/archives.c:388
+#: main/archives.c:393
 #, c-format
 msgid "unable to fdopen for `%.255s'"
 msgstr "impossible de faire \"fdopen\" pour `%.255s'"
 
-#: main/archives.c:397
+#: main/archives.c:402
 #, c-format
 msgid "error reading dpkg-deb during `%.255s'"
 msgstr "erreur de lecture de dpkg-deb pendant `%.255s'"
 
-#: main/archives.c:404
+#: main/archives.c:409
 #, c-format
 msgid "error writing to `%.255s'"
 msgstr "erreur en écrivant dans `%.255s'"
 
-#: main/archives.c:413
+#: main/archives.c:418
 #, c-format
 msgid "error flushing `%.255s'"
 msgstr "erreur en vidant `%.255s'"
 
-#: main/archives.c:418
+#: main/archives.c:423
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "erreur en fermant/écrivant `%.255s'"
 
-#: main/archives.c:423
+#: main/archives.c:428
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "erreur en créant le tube `%.255s'"
 
-#: main/archives.c:429
+#: main/archives.c:434
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "erreur en créant le périphérique `%.255s'"
 
-#: main/archives.c:438
+#: main/archives.c:443
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "erreur en créant le lien physique `%.255s'"
 
-#: main/archives.c:445
+#: main/archives.c:450
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "erreur en créant le lien symbolique `%.255s'"
 
-#: main/archives.c:452
+#: main/archives.c:457
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "erreur en paramétrant les droits du lien symbolique `%.255s'"
 
-#: main/archives.c:458
+#: main/archives.c:463
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "erreur en créant le répertoire `%.255s'"
 
-#: main/archives.c:463
+#: main/archives.c:468
 msgid "bad tar type, but already checked"
 msgstr "mauvais type de tar, mais déjà contrôlé"
 
-#: main/archives.c:493
+#: main/archives.c:498
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 "impossible de déplacer ailleurs `%.255s' pour installer une nouvelle version"
 
-#: main/archives.c:506
+#: main/archives.c:511
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "impossible de faire un lien symbolique de secours pour `%.255s'"
 
-#: main/archives.c:512
+#: main/archives.c:517
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "impossible de modifier les droits du lien symbolique de secours pour `%.255s'"
 
-#: main/archives.c:516
+#: main/archives.c:521
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "impossible de faire un lien symbolique de secours de `%.255s' avant "
 "d'installer une nouvelle version"
 
-#: main/archives.c:522
+#: main/archives.c:527
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "impossible d'installer une nouvelle version de `%.255s'"
 
-#: main/archives.c:536
+#: main/archives.c:541
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -869,7 +869,7 @@ msgstr ""
 "de %s:\n"
 "%s"
 
-#: main/archives.c:543
+#: main/archives.c:548
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -878,7 +878,7 @@ msgstr ""
 "dpkg: avertissement - décision de déconfigurer le paquet\n"
 " essentiel %s pour autoriser la suppression de %s.\n"
 
-#: main/archives.c:547
+#: main/archives.c:552
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -887,7 +887,7 @@ msgstr ""
 "dpkg: non, %s est essentiel, il ne sera pas déconfigurer\n"
 " pour autoriser la suppression de %s.\n"
 
-#: main/archives.c:560
+#: main/archives.c:565
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -896,24 +896,24 @@ msgstr ""
 "dpkg: non, ne peut retirer %s (voir --auto-deconfigure):\n"
 "%s"
 
-#: main/archives.c:594
+#: main/archives.c:599
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: décision pour retirer %s en faveur de %s ...\n"
 
-#: main/archives.c:598
+#: main/archives.c:603
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s n'est pas correctement installé - ses dépendances sont ignorés.\n"
 
-#: main/archives.c:625
+#: main/archives.c:630
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: la suppression de %s peut-être problématique, puisqu'il fournit %s "
 "...\n"
 
-#: main/archives.c:640
+#: main/archives.c:645
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -922,17 +922,17 @@ msgstr ""
 "dpkg: le paquet %s requiert une réinstallation, mais suppressioncomme "
 "demandée.\n"
 
-#: main/archives.c:643
+#: main/archives.c:648
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: le paquet %s requiert une réinstallation, suppression annulée.\n"
 
-#: main/archives.c:652
+#: main/archives.c:657
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: oui, suppression de %s en faveur de %s.\n"
 
-#: main/archives.c:660
+#: main/archives.c:665
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -941,46 +941,46 @@ msgstr ""
 "dpkg: concernant %s contenant %s:\n"
 "%s"
 
-#: main/archives.c:663
+#: main/archives.c:668
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "paquets en conflit - %.250s non installé"
 
-#: main/archives.c:664
+#: main/archives.c:669
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: avertissement - conflit ignoré, poursuite possible !\n"
 
-#: main/archives.c:701
+#: main/archives.c:706
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive a besoin au moins d'un chemin comme argument"
 
-#: main/archives.c:730
+#: main/archives.c:735
 msgid "failed to exec find for --recursive"
 msgstr "échec pour exécuter \"find\" pour --recursive"
 
-#: main/archives.c:734
+#: main/archives.c:739
 msgid "failed to fdopen find's pipe"
 msgstr "échec pour \"fdopen\" le tube de \"find\""
 
-#: main/archives.c:741
+#: main/archives.c:746
 msgid "error reading find's pipe"
 msgstr "erreur en lisant le tube de \"find\""
 
-#: main/archives.c:742
+#: main/archives.c:747
 msgid "error closing find's pipe"
 msgstr "erreur en fermant le tube de \"find\""
 
-#: main/archives.c:745
+#: main/archives.c:750
 msgid "searched, but found no packages (files matching *.deb"
 msgstr "recherché, mais aucun paquet trouvé (fichiers *.deb"
 
-#: main/archives.c:762
+#: main/archives.c:767
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s a besoin au moins d'un fichier archive de paquet comme argument"
 
-#: main/archives.c:809
+#: main/archives.c:814
 msgid "unknown action"
 msgstr "action inconnue"
 
@@ -2048,7 +2048,7 @@ msgstr ""
 "les détails.\n"
 
 #: main/main.c:57
-#, fuzzy
+#, c-format
 msgid ""
 "Usage: \n"
 "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -2071,54 +2071,19 @@ msgid ""
 "  dpkg -C|--audit                         check for broken package(s)\n"
 "  dpkg --abort-after <n>                  abort after encountering <n> "
 "errors\n"
-msgstr ""
-"Syntaxe: \n"
-"  dpkg -i|--install      <nom fichier .deb> ... | -R|--recursive <rép> ...\n"
-"  dpkg --unpack          <nom fichier .deb> ... | -R|--recursive <rép> ...\n"
-"  dpkg -A|--record-avail <nom fichier .deb> ... | -R|--recursive <rép> ...\n"
-"  dpkg --configure           <nom paquet> ... | -a|--pending\n"
-"  dpkg -r|--remove | --purge <nom paquet> ... | -a|--pending\n"
-"  dpkg --get-selections [<motif> ...]     affiche la liste des sélections "
-"sur la sortie standard\n"
-"  dpkg --set-selections                   paramètre la liste des sélections "
-"à partir de l'entrée standard\n"
-"  dpkg --update-avail <fichier Packages>  remplace les informations sur les "
-"paquets disponibles\n"
-"  dpkg --merge-avail <fichier Packages>   fusionne les informations sur les "
-"paquets avec le fichier\n"
-"  dpkg --clear-avail                      efface les informations sur les "
-"paquets\n"
-"  dpkg --forget-old-unavail               oublie les paquets non-installés "
-"et non-disponibles\n"
-"  dpkg -s|--status <nom paquet> ...       affiche les détails de l'état du "
-"paquet\n"
-"  dpkg --print-avail <nom paquet> ...     affiche les détails de la version "
-"disponible\n"
-"  dpkg -L|--listfiles <nom paquet> ...    liste les fichiers appartenant "
-"au(x) paquet(s)\n"
-"  dpkg -l|--list [<motif> ...]            liste les paquets en condensé\n"
-"  dpkg -S|--search <motif> ...            trouve le(s) paquet(s) possédant "
-"le(s) fichier(s)\n"
-"  dpkg -C|--audit                         vérifie la présence de paquet(s) "
-"abîmé(s)\n"
-"  dpkg --print-architecture               affiche l'architecture cible "
-"(utilise GCC)\n"
-"  dpkg --print-gnu-build-architecture     affiche la version GNU de "
-"l'archive cible\n"
-"  dpkg --print-installation-architecture  affiche l'architecture de la "
-"machine (pour l'installation)\n"
-"  dpkg --compare-versions <a> <rel> <b>   compare les nombres de version - "
-"voir ci-dessous\n"
-"  dpkg --help | --version                 affiche cette aide/le numéro de "
-"version\n"
-"  dpkg --force-help | -Dh|--debug=help    aide sur respectivement le "
-"forçage/débogage\n"
-"  dpkg --licence                          affiche les termes de la licence "
-"copyright\n"
+"  dpkg --print-architecture               print target architecture (uses "
+"GCC)\n"
+"  dpkg --print-gnu-build-architecture     print GNU version of target arch\n"
+"  dpkg --print-installation-architecture  print host architecture (for "
+"inst'n)\n"
+"  dpkg --compare-versions <a> <rel> <b>   compare version numbers - see "
+"below\n"
+"  dpkg --help | --version                 show this help / version number\n"
+"  dpkg --force-help | -Dh|--debug=help    help on forcing resp. debugging\n"
+"  dpkg --licence                          print copyright licencing terms\n"
 "\n"
-"Utiliser dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
-" -x|--extract|-X|--vextract|--fsys-tarfile sur les archives (taper %s "
-"--help.)\n"
+"Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
+" -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --help.)\n"
 "\n"
 "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
 "  --assert-working-epoch\n"
@@ -2129,11 +2094,11 @@ msgstr ""
 "  --instdir=<directory>      Change inst'n root without changing admin dir\n"
 "  -O|--selected-only         Skip packages not selected for install/upgrade\n"
 "  -E|--skip-same-version     Skip packages whose same version is installed\n"
-"  -G=--refuse-downgrade      Skip packages with earlier version tha\n"
+"  -G=--refuse-downgrade      Skip packages with earlier version than "
 "installed\n"
-"  -B|--auto-deconfigure      Install even if it would break some othe\n"
+"  -B|--auto-deconfigure      Install even if it would break some other "
 "package\n"
-"  --largemem | --smallmem    Optimise for large (>4Mb) or small (<4Mb) RA\n"
+"  --largemem | --smallmem    Optimise for large (>4Mb) or small (<4Mb) RAM "
 "use\n"
 "  --no-act                   Just say what we would do - don't do it\n"
 "  -D|--debug=<octal>         Enable debugging - see -Dhelp or --debug=help\n"
@@ -2147,6 +2112,7 @@ msgstr ""
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
 "Use `dselect' for user-friendly package management.\n"
+msgstr ""
 
 #: main/main.c:117
 msgid ""
@@ -3772,3 +3738,103 @@ msgstr "%s: 
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: aucun fichiers vérifiés\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: \n"
+#~ "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
+#~ "  dpkg --unpack          <.deb file name> ... | -R|--recursive <dir> ...\n"
+#~ "  dpkg -A|--record-avail <.deb file name> ... | -R|--recursive <dir> ...\n"
+#~ "  dpkg --configure           <package name> ... | -a|--pending\n"
+#~ "  dpkg -r|--remove | --purge <package name> ... | -a|--pending\n"
+#~ "  dpkg --get-selections [<pattern> ...]   get list of selections to stdout\n"
+#~ "  dpkg --set-selections                   set package selections from stdin\n"
+#~ "  dpkg --update-avail <Packages-file>     replace available packages info\n"
+#~ "  dpkg --merge-avail <Packages-file>      merge with info from file\n"
+#~ "  dpkg --clear-avail                      erase existing available info\n"
+#~ "  dpkg --forget-old-unavail               forget uninstalled unavailable "
+#~ "pkgs\n"
+#~ "  dpkg -s|--status <package-name> ...     display package status details\n"
+#~ "  dpkg --print-avail <package-name> ...   display available version details\n"
+#~ "  dpkg -L|--listfiles <package-name> ...  list files `owned' by package(s)\n"
+#~ "  dpkg -l|--list [<pattern> ...]          list packages concisely\n"
+#~ "  dpkg -S|--search <pattern> ...          find package(s) owning file(s)\n"
+#~ "  dpkg -C|--audit                         check for broken package(s)\n"
+#~ "  dpkg --abort-after <n>                  abort after encountering <n> "
+#~ "errors\n"
+#~ msgstr ""
+#~ "Syntaxe: \n"
+#~ "  dpkg -i|--install      <nom fichier .deb> ... | -R|--recursive <rép> ...\n"
+#~ "  dpkg --unpack          <nom fichier .deb> ... | -R|--recursive <rép> ...\n"
+#~ "  dpkg -A|--record-avail <nom fichier .deb> ... | -R|--recursive <rép> ...\n"
+#~ "  dpkg --configure           <nom paquet> ... | -a|--pending\n"
+#~ "  dpkg -r|--remove | --purge <nom paquet> ... | -a|--pending\n"
+#~ "  dpkg --get-selections [<motif> ...]     affiche la liste des sélections "
+#~ "sur la sortie standard\n"
+#~ "  dpkg --set-selections                   paramètre la liste des sélections "
+#~ "à partir de l'entrée standard\n"
+#~ "  dpkg --update-avail <fichier Packages>  remplace les informations sur les "
+#~ "paquets disponibles\n"
+#~ "  dpkg --merge-avail <fichier Packages>   fusionne les informations sur les "
+#~ "paquets avec le fichier\n"
+#~ "  dpkg --clear-avail                      efface les informations sur les "
+#~ "paquets\n"
+#~ "  dpkg --forget-old-unavail               oublie les paquets non-installés "
+#~ "et non-disponibles\n"
+#~ "  dpkg -s|--status <nom paquet> ...       affiche les détails de l'état du "
+#~ "paquet\n"
+#~ "  dpkg --print-avail <nom paquet> ...     affiche les détails de la version "
+#~ "disponible\n"
+#~ "  dpkg -L|--listfiles <nom paquet> ...    liste les fichiers appartenant "
+#~ "au(x) paquet(s)\n"
+#~ "  dpkg -l|--list [<motif> ...]            liste les paquets en condensé\n"
+#~ "  dpkg -S|--search <motif> ...            trouve le(s) paquet(s) possédant "
+#~ "le(s) fichier(s)\n"
+#~ "  dpkg -C|--audit                         vérifie la présence de paquet(s) "
+#~ "abîmé(s)\n"
+#~ "  dpkg --print-architecture               affiche l'architecture cible "
+#~ "(utilise GCC)\n"
+#~ "  dpkg --print-gnu-build-architecture     affiche la version GNU de "
+#~ "l'archive cible\n"
+#~ "  dpkg --print-installation-architecture  affiche l'architecture de la "
+#~ "machine (pour l'installation)\n"
+#~ "  dpkg --compare-versions <a> <rel> <b>   compare les nombres de version - "
+#~ "voir ci-dessous\n"
+#~ "  dpkg --help | --version                 affiche cette aide/le numéro de "
+#~ "version\n"
+#~ "  dpkg --force-help | -Dh|--debug=help    aide sur respectivement le "
+#~ "forçage/débogage\n"
+#~ "  dpkg --licence                          affiche les termes de la licence "
+#~ "copyright\n"
+#~ "\n"
+#~ "Utiliser dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
+#~ " -x|--extract|-X|--vextract|--fsys-tarfile sur les archives (taper %s "
+#~ "--help.)\n"
+#~ "\n"
+#~ "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
+#~ "  --assert-working-epoch\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  --admindir=<directory>     Use <directory> instead of %s\n"
+#~ "  --root=<directory>         Install on alternative system rooted elsewhere\n"
+#~ "  --instdir=<directory>      Change inst'n root without changing admin dir\n"
+#~ "  -O|--selected-only         Skip packages not selected for install/upgrade\n"
+#~ "  -E|--skip-same-version     Skip packages whose same version is installed\n"
+#~ "  -G=--refuse-downgrade      Skip packages with earlier version tha\n"
+#~ "installed\n"
+#~ "  -B|--auto-deconfigure      Install even if it would break some othe\n"
+#~ "package\n"
+#~ "  --largemem | --smallmem    Optimise for large (>4Mb) or small (<4Mb) RA\n"
+#~ "use\n"
+#~ "  --no-act                   Just say what we would do - don't do it\n"
+#~ "  -D|--debug=<octal>         Enable debugging - see -Dhelp or --debug=help\n"
+#~ "  --ignore-depends=<package>,... Ignore dependencies involving <package>\n"
+#~ "  --force-...                    Override problems - see --force-help\n"
+#~ "  --no-force-...|--refuse-...    Stop when problems encountered\n"
+#~ "\n"
+#~ "Comparison operators for --compare-versions are:\n"
+#~ " lt le eq ne ge gt       (treat no version as earlier than any version);\n"
+#~ " lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+#~ " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
+#~ "\n"
+#~ "Use `dselect' for user-friendly package management.\n"

diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index fa30c7feb6890652cc2d62e5987486858d37ef67..01ca69acfc001aeb893d705cf1007b395882c009 100755 (executable)
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -148,9 +148,9 @@ while (<O>) {
     ($sectioncut = $section) =~ s:^[^/]*/::;
     if (length($psubdir{$p}) && $section ne $psubdir{$p} &&
        $sectioncut ne $psubdir{$p}) {
-      if (length($psubdir{$p}) && $section ne $psubdir{$p}) {
+    if (length($psubdir{$p}) && $section ne $psubdir{$p}) {
         print(STDERR " !! Package $p has \`Section: $section',".
-             " but file is in \`$psubdir{$p}' !!\n") || die $!;
+                     " but file is in \`$psubdir{$p}' !!\n") || die $!;
         $ouches++;
       }
     }