scripts/dpkg-divert.pl: fix typo in usage message

main/help.c: mangle argv[0] in do_script to always be the full path
include/dpkg-db.h: include string.h so things compile on ia64
scripts/dpkg-architecture.pl: add ia64

diff --git a/ChangeLog b/ChangeLog
index 67c199e29841fe7e7274f3344ae6d8f248efce95..36454462332241c6ca52a993774a1b733e2d250c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Feb 23 10:22:02 CET 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-divert.pl: fix typo in usage message
+  * main/help.c: mangle argv[0] in do_script to always be the full path
+  * include/dpkg-db.h: include string.h so things compile on ia64 
+  * scripts/dpkg-architecture.pl: add ia64
+
 Thu Feb 15 11:24:46 EST 2001 Ben Collins <bcollins@debian.org>
 
   * utils/Makefile.in: Do not use libopt.a, since libdpkg.a not includes those

diff --git a/debian/changelog b/debian/changelog
index 1b541ef315747491e88a89ee40259737313d462a..3812892e6f80036ee8fe18d9b745591fa5818b61 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ dpkg (1.9.0) unstable; urgency=low
     Closes: Bug#82797
   * Fix manpage for dpkg-gencontrol. Fies: Bug#84625
   * Use POSIX glob instead of regexp in debian/rules. Closes: Bug#84582
+  * fix typo in usage message for dpkg-divert, Closes: Bug#85977
+  * Use full path for argv[0] when calling scripts. Closes: Bug#68783
+  * Add ia64 support to dpkg-architecture.
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/include/dpkg-db.h b/include/dpkg-db.h
index f9342048b7a3184ac2f191d0798fa1c750c6439f..8ac50578a511538bfd01bed3657952eeee7f25bd 100644 (file)
--- a/include/dpkg-db.h
+++ b/include/dpkg-db.h
@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 struct versionrevision {
   unsigned long epoch;

diff --git a/main/help.c b/main/help.c
index 452456b9de2098ac2f55bd3d44fae613e5ffe73c..858012bcfc3b493e36970eff93d17aa0fd74d8eb 100644 (file)
--- a/main/help.c
+++ b/main/help.c
@@ -260,6 +260,7 @@ static int do_script(const char *pkg, const char *scriptname, const char *script
   c1= m_fork();
   if (!c1) {
     scriptexec= preexecscript(scriptpath,arglist);
+    arglist[0]=scriptexec;
     execv(scriptexec,arglist);
     ohshite(desc,name);
   }

diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index 61c9655ce43e7ecdeed1f0f8eba0d1aaf77113ce..33e6be35ca11c0f09c65979bf233ae25e9789a37 100755 (executable)
--- a/scripts/dpkg-architecture.pl
+++ b/scripts/dpkg-architecture.pl
@@ -61,6 +61,7 @@ require 'controllib.pl';
            'hppa',      'hppa-linux',
            'hurd-i386', 'i386-gnu',
            's390',      's390-linux',
+           'ia64',      'ia64-linux',
            'openbsd-i386', 'i386-openbsd'
            'freebsd-i386', 'i386-freebsd');
 

diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl
index 03c591c9d542f33dc30d5cc2eef66b918e12a8b4..8093a3dabeef9c4d593dc420c9dad7ba5b16798e 100755 (executable)
--- a/scripts/dpkg-divert.pl
+++ b/scripts/dpkg-divert.pl
@@ -25,7 +25,7 @@ Usage:
  dpkg-divert [options] [--add] <file>               - add a diversion
  dpkg-divert [options] --remove <file>              - remove the diversion
  dpkg-divert [options] --list [<glob-pattern>]      - show file diversions
- dpkg-divert [options] --truname <file>             - return the diverted file
+ dpkg-divert [options] --truename <file>            - return the diverted file
 
 Options: 
     --package <package>        name of the package whose copy of <file>

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 4ca6c953d9c4446078e1f5c266b9b6cf62dacbf5..0f1e2e27314a7072fcde0ca1a17a132683f52c98 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -936,8 +936,8 @@ sub extracttar {
     defined($c2= fork) || &syserr("fork for tar -xkf -");
     if (!$c2) {
         open(STDIN,"<&GZIP") || &syserr("reopen gzip for tar -xkf -");
-        chdir("$dirchdir") || &syserr("cannot chdir to \`$dirchdir' for tar extract");
         &cpiostderr;
+        chdir("$dirchdir") || &syserr("cannot chdir to \`$dirchdir' for tar extract");
         exec('tar','-xkf','-'); &syserr("exec tar -xkf -");
     }
     close(GZIP);