* archtable: Add i386-gnu0.3.

* main/Makefile.in, utils/Makefile.in: Fix handling of static compiles,
  with regard to zlib.

diff --git a/ChangeLog b/ChangeLog
index 420f0e53e703544861028698a04226aadbb5d226..ebce2bde96eaf96c496d153aa5670531a0329581 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Aug 24 14:47:56 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * archtable: Add i386-gnu0.3.
+  * main/Makefile.in, utils/Makefile.in: Fix handling of static compiles,
+    with regard to zlib.
+
 Sat Aug 24 14:41:45 CDT 2002 Adam Heath <doogie@debian.org>
 
   * lib/fields.c: Allow spaces between the end of a version, and the

diff --git a/archtable b/archtable
index 51df54c04edbd0f6c81bf76b07dee3636094a507..0e77c5938753b3d7fa7d07696023cbe6e7ba1529 100644 (file)
--- a/archtable
+++ b/archtable
@@ -33,6 +33,7 @@ mipsel-linux-gnu      mipsel          mipsel
 mipseb-linux-gnu       mips            mips
 i386-gnu               hurd-i386       undefined
 i386-gnu0.2            hurd-i386       undefined
+i386-gnu0.3            hurd-i386       undefined
 ia64-linux-gnu         ia64            ia64
 ia64-unknown-linux     ia64            ia64
 sh3-linux-gnu          sh3             sh3

diff --git a/debian/changelog b/debian/changelog
index f6adda4ed938ff4dfb0790820f73ce5717f40b40..718656328271684ff3f0ead7667e96edfee17fac 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ dpkg (1.10.5) unstable; urgency=low
   * Fix segfault when --auto-deconfigure is given.  Closes: #157762.
   * Allow spaces between the end of a version, and the trailing ')'.
     Closes: #154898.
+  * Fixes for HURD:  Closes: #156545
+    * Add i386-gnu0.3 to archtable.
+    * Fix handling of static compiles, with regard to zlib.
 
  -- Adam Heath <doogie@debian.org>  UNRELEASED
 

diff --git a/main/Makefile.in b/main/Makefile.in
index be91254a71476de0b04dc8433fee42edef36036c..fcaabc0b3694a30af41018a1576b012a92559ec6 100644 (file)
--- a/main/Makefile.in
+++ b/main/Makefile.in
@@ -61,6 +61,7 @@ install-doc:
        done
 
 dpkg-static: LDFLAGS += -static
+dpkg-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC)
 dpkg dpkg-static: $(OBJECTS) ../lib/libdpkg.a
        $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS)
 

diff --git a/utils/Makefile.in b/utils/Makefile.in
index f2395865424275b741b3b45db4d7888cd76993ee..c4e486eea351c0b552dd804caa17f5f01e59739b 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -75,5 +75,6 @@ start-stop-daemon: $(SSD_OBJECTS) ../lib/libdpkg.a
        $(CC) $(LDFLAGS) -o $@ $(SSD_OBJECTS) $(LIBS) $(SSD_LIBS)
 
 md5sum-static: LDFLAGS += -static
+md5sum-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC)
 md5sum md5sum-static: $(MD5_OBJECTS) ../lib/libdpkg.a
        $(CC) $(LDFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS)