Here is a set of patches from the current NMU series to the dpkg-iwj tree:
archtable-i686 add i686 to the archtable file. This should also be done for sparc64 btw, but I seem to have misplaced that patch :( control-debian change Debian Linux to Debian, since dpkg is also used on the HURD list-noavail Also use msbr_noavail flag when doing --list overwrite-dir Improve handling of directories that are being replaced by something else. shlibs-libc6 Update the shlibs.default file for libc6, it only had defaults for libc5 (and very old ones for those as well) Wichert.
diff -ur dpkg-iwj/archtable dpkg-wta/archtable --- dpkg-iwj/archtable Sun Oct 25 23:23:32 1998 +++ dpkg-wta/archtable Sat Jul 31 13:20:39 1999 @@ -16,6 +16,7 @@ i386 i386 i486 i486 i386 i486 i586 i386 i486 +i686 i386 i486 pentium i386 i486 sparc sparc sparc alpha alpha alpha
diff -ur dpkg-iwj/debian/control dpkg-wta/debian/control
--- dpkg-iwj/debian/control Thu Jul 22 02:53:20 1999
+++ dpkg-wta/debian/control Sat Jul 31 13:20:51 1999
@@ -8,7 +8,7 @@
Architecture: any
Essential: yes
Pre-Depends: ${shlibs:Pre-Depends}
-Description: Package maintenance system for Debian Linux
+Description: Package maintenance system for Debian
This package contains the programs which handle the installation and
removal of packages on your system.
.
@@ -26,7 +26,7 @@
Recommends: cpio (>= 2.4.2-2), patch (>= 2.2)
Conflicts: dpkgname
Replaces: dpkgname, dpkg (<< 1.4.0)
-Description: Package building tools for Debian Linux
+Description: Package building tools for Debian
This package contains the tools (including dpkg-source) required to
unpack, build and upload Debian source packages. It also contains
the programmers' and Debian policy manuals, which are the
diff -ur dpkg-iwj/main/enquiry.c dpkg-wta/main/enquiry.c --- dpkg-iwj/main/enquiry.c Sun Jul 25 17:28:40 1999 +++ dpkg-wta/main/enquiry.c Sat Jul 31 13:17:27 1999 @@ -88,7 +88,7 @@ const char *thisarg; int np, i, head, found; - modstatdb_init(admindir,msdbrw_readonly); + modstatdb_init(admindir,msdbrw_readonly|msdbrw_noavail); np= countpackages(); pkgl= m_malloc(sizeof(struct pkginfo*)*np);
diff -ur dpkg-iwj/main/archives.c dpkg-wta/main/archives.c
--- dpkg-iwj/main/archives.c Thu Jul 22 02:53:21 1999
+++ dpkg-wta/main/archives.c Sat Jul 31 15:13:25 1999
@@ -358,7 +358,12 @@
"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 -ur dpkg-iwj/debian/shlibs.default.i386 dpkg-wta/debian/shlibs.default.i386 --- dpkg-iwj/debian/shlibs.default.i386 Sun Oct 25 23:23:50 1998 +++ dpkg-wta/debian/shlibs.default.i386 Sat Jul 31 13:21:59 1999 @@ -1,14 +1,15 @@ -libc 5 libc5 (>= 5.2.18) -libm 5 libc5 (>= 5.2.18) -libncurses 3.0 ncurses3.0 -libICE 6 elf-x11r6lib -libPEX5 6 elf-x11r6lib -libSM 6 elf-x11r6lib -libX11 6 elf-x11r6lib -libXIE 6 elf-x11r6lib -libXaw 6 elf-x11r6lib -libXext 6 elf-x11r6lib -libXi 6 elf-x11r6lib -libXmu 6 elf-x11r6lib -libXt 6 elf-x11r6lib -libXtst 6 elf-x11r6lib +libc 6 libc6 +libm 6 libc6 +libncurses 4 libncurses4 +libICE 6 xlib6g (>= 3.3-5) +libPEX5 6 xlib6g (>= 3.3-5) +libSM 6 xlib6g (>= 3.3-5) +libX11 6 xlib6g (>= 3.3-5) +libXIE 6 xlib6g (>= 3.3-5) +libXaw 6 xlib6g (>= 3.3-5) +libXext 6 xlib6g (>= 3.3-5) +libXi 6 xlib6g (>= 3.3-5) +libXmu 6 xlib6g (>= 3.3-5) +libXt 6 xlib6g (>= 3.3-5) +libXtst 6 xlib6g (>= 3.3-5) +libXp 6 xlib6g (>= 3.3-5)
pgpzJLHLyzZtt.pgp
Description: PGP signature
