4 files changed, 13 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 2011b09f..6d7351af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,10 +48,14 @@ hurd (20100701-1) unstable; urgency=low
   * debian/control: Update Vcs fields to point to the new git repositories.
   * debian/patches/console_ignore_bdf_err.patch: New patch to ignore erroneous
     number of glyphs in bdf files.
-  * debian/rules: Remove debian/ChangeLog on clean.
+  * debian/rules: Remove debian/ChangeLog generation.
   * debian/local/runsystem: Pass -g option to the console to maximize glyph
     usage for chinese.
   * debian/patches/init_fix.patch: New upstream patch to fix halt/reboot.
+  * debian/hurd.lintian-overrides: New overrides to announce which servers are
+    supposed to be statically linked, and accept hurd to be essential.
+  * debian/hurd-udeb.lintian-overrides: New overrides to validate
+    hurd-i386-specific paths.
 
   [ Guillem Jover ]
   * Update make-new-tarball.sh to exclude git instead of CVS paths.
diff --git a/debian/hurd-udeb.lintian-overrides b/debian/hurd-udeb.lintian-overrides
new file mode 100644
index 00000000..5953ec00
--- /dev/null
+++ b/debian/hurd-udeb.lintian-overrides
@@ -0,0 +1,3 @@
+non-standard-toplevel-dir hurd/
+non-standard-toplevel-dir libexec/
+non-standard-toplevel-dir servers/
diff --git a/debian/hurd.lintian-overrides b/debian/hurd.lintian-overrides
new file mode 100644
index 00000000..0a9d7844
--- /dev/null
+++ b/debian/hurd.lintian-overrides
@@ -0,0 +1,5 @@
+new-essential-package
+statically-linked-binary ./hurd/mach-defpager
+statically-linked-binary ./hurd/ext2fs.static
+statically-linked-binary ./hurd/iso9660fs.static
+statically-linked-binary ./hurd/ufs.static
diff --git a/debian/rules b/debian/rules
index fdf4a26f..0a906634 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,22 +28,15 @@ DEB_CONFIGURE_LIBEXECDIR ="\$${prefix}/libexec"
 DEB_CONFIGURE_USER_FLAGS := --disable-profile --enable-static-progs='ext2fs,ufs,iso9660fs'
 DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var
 DEB_DH_STRIP_ARGS := --dbg-package=hurd-dbg
-DEB_INSTALL_CHANGELOGS_ALL := $(CURDIR)/debian/ChangeLog
 DEB_DH_MAKESHLIBS_ARGS_hurd := --add-udeb="hurd-udeb"
 
 # Enable part store support (not yet in configure.in)
 HAVE_PARTED = yes
 export HAVE_PARTED
 
-clean::
-	rm -f $(CURDIR)/debian/ChangeLog
-
 build/hurd::
 	cd $(DEB_BUILDDIR)/doc && texi2html -split chapter ../../doc/hurd.texi
 
-	# assemble all ChangeLogs to one big file
-	cd $(DEB_SRCDIR); for i in `find hurd/ -name "ChangeLog"`; do echo $$i:; cat $$i; echo;  done > $(CURDIR)/debian/ChangeLog
-
 install/hurd::
 	# runsystem is managed by update-alternatives
 	mv debian/tmp/libexec/runsystem debian/tmp/libexec/runsystem.gnu