Patches applied:

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-28
   restore amd64 support with that name

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-29
   fix s-s-d on the hurd

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-30
   don't wipe helpmsgs.h on make clean

* archtable: Requested the technical committee to make the mentioned
decision -- we're going with amd64 (that'll please my boss :-)
* scripts/dpkg-architecture.pl: Likewise.
* utils/start-stop-daemon.c: Moved pid_is_running inside OSHURD sentry,
provided Hurd version.  Removed dependency on C99 code and replaced
constructor with an init function.
* dselect/Makefile.in: Remove helpmsgs.h from the GENFILES list so
we don't wipe it on "make clean" (it's not generated anymore).

diff --git a/ChangeLog b/ChangeLog
index 74faabba548a380072b7f9df5697be55a0cb07dc..702f86182f57a938785be3583dfd3724c190ae43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 19 23:11:38 BST 2004 Scott James Remnant <scott@netsplit.com>
+
+  * dselect/Makefile.in: Remove helpmsgs.h from the GENFILES list so
+  we don't wipe it on "make clean" (it's not generated anymore).
+
 Fri Jun 18 11:49:21 BST 2004 Ognyan Kulev <ogi@fmi.uni-sofia.bg>
 
   * utils/start-stop-daemon.c: Moved pid_is_running inside OSHURD sentry,

diff --git a/dselect/Makefile.in b/dselect/Makefile.in
index 2e682e2064c4efa65e1ab9a8ed9917f79483b614..fbacabeb757e0a3085afef43b76072d374f168af 100644 (file)
--- a/dselect/Makefile.in
+++ b/dselect/Makefile.in
@@ -14,7 +14,7 @@ CXX_SOURCES   = basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \
 MAN8PAGES      = dselect.8
 
 OBJECTS                = $(patsubst %.cc, %.o, $(CXX_SOURCES))
-GENFILES       = $(OBJECTS) dselect helpmsgs.h curkeys.h
+GENFILES       = $(OBJECTS) dselect curkeys.h
 
 .PHONY: all
 all:: dselect