From 2c4812d850e5c2c2a12e1fb1f487bbc030d635bc Mon Sep 17 00:00:00 2001
From: Adam Heath <doogie@debian.org>
Date: Sat, 24 Aug 2002 19:54:18 +0000
Subject: [PATCH] * archtable: Add i386-gnu0.3. * main/Makefile.in,
 utils/Makefile.in: Fix handling of static compiles,   with regard to zlib.

---
 ChangeLog         | 6 ++++++
 archtable         | 1 +
 debian/changelog  | 3 +++
 main/Makefile.in  | 1 +
 utils/Makefile.in | 1 +
 5 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 420f0e53..ebce2bde 100644
--- 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 51df54c0..0e77c593 100644
--- 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 f6adda4e..71865632 100644
--- 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 be91254a..fcaabc0b 100644
--- 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 f2395865..c4e486ee 100644
--- 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)
-- 
2.39.5