diff -u nullidentd-1.0/debian/control nullidentd-1.0/debian/control
--- nullidentd-1.0/debian/control
+++ nullidentd-1.0/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: John H. Robinson, IV <jaqque@debian.org>
 Build-Depends: debhelper
-Standards-Version: 3.6.1
+Standards-Version: 3.8.0.1
 
 Package: nullidentd
 Provides: ident-server
diff -u nullidentd-1.0/debian/postrm nullidentd-1.0/debian/postrm
--- nullidentd-1.0/debian/postrm
+++ nullidentd-1.0/debian/postrm
@@ -16,11 +16,20 @@
 #        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
 # for details, see /usr/doc/packaging-manual/
 
-if [ "$1" = "purge" ]; then
-	if [ -f /usr/sbin/update-inetd ]; then
-		update-inetd --remove "/usr/sbin/nullidentd"
-	fi
-fi
+case "$1" in
+	remove|purge)
+		# If we leave an entry behind, it can conflict with a future
+		# ident server.
+		if [ -f /usr/sbin/update-inetd ]; then
+			update-inetd --pattern '/usr/sbin/nullidentd' \
+				--remove '(#<off># |)ident\t' 
+		fi
+	;;
+		
+	*)
+	;;
+esac
+
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
diff -u nullidentd-1.0/debian/changelog nullidentd-1.0/debian/changelog
--- nullidentd-1.0/debian/changelog
+++ nullidentd-1.0/debian/changelog
@@ -1,3 +1,22 @@
+nullidentd (1.0-4ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #254524):
+    - debian/control: Add openbsd-inetd | inet-superserver dependencies
+      as nullidentd needs an inet server to work
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Sun, 03 Aug 2008 20:06:02 -0500
+
+nullidentd (1.0-4) unstable; urgency=low
+
+  * Standards version 3.8.0.1
+  * debhelper version 7
+  * lintian clean
+  * Properly remove inetd entries on remove/purge (Closes: #279237, #330491)
+  * Disables auth entries prior to installation (Closes: #474145)
+  * Removes ident entries prior to installation (Closes: #226953)
+
+ -- John H. Robinson, IV <jaqque@debian.org>  Tue,  8 Jul 2008 10:42:14 -0700
+
 nullidentd (1.0-3.1ubuntu1) gutsy; urgency=low
 
   * Merge from Debian unstable, remaining changes:
diff -u nullidentd-1.0/debian/rules nullidentd-1.0/debian/rules
--- nullidentd-1.0/debian/rules
+++ nullidentd-1.0/debian/rules
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=1
-
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -24,7 +21,7 @@
 	rm -f build-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	$(MAKE) clean
 
 	dh_clean
 
@@ -35,7 +32,7 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp.
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp
+	$(MAKE) install DESTDIR=`pwd`/debian/nullidentd
 
 
 # Build architecture-independent files here.
reverted:
--- nullidentd-1.0/debian/prerm
+++ nullidentd-1.0.orig/debian/prerm
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
-	update-inetd --pattern "/usr/sbin/nullidentd" --disable ident
-fi
-
-#DEBHELPER#
diff -u nullidentd-1.0/debian/postinst nullidentd-1.0/debian/postinst
--- nullidentd-1.0/debian/postinst
+++ nullidentd-1.0/debian/postinst
@@ -24,17 +24,14 @@
 
 case "$1" in
     configure)
-	update-inetd --disable ident # don't destroy other's config
-	update-inetd --group INFO --add 'ident\t\tstream\ttcp\tnowait\tnobody\t/usr/sbin/nullidentd\tnullidentd'
-	update-inetd --pattern "/usr/sbin/nullidentd" --enable ident
-
+		update-inetd --multi --disable auth
+		# update-inetd will see previous ident entries, and use them instead.
+		update-inetd --multi --remove '(#<off># |)ident\t'
+		update-inetd --group INFO --add 'ident\t\tstream\ttcp\tnowait\tnobody\t/usr/sbin/nullidentd\tnullidentd'
     ;;
 
-
-
     abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
+	;;
 
     *)
         echo "postinst called with unknown argument \`$1'" >&2
only in patch2:
unchanged:
--- nullidentd-1.0.orig/debian/compat
+++ nullidentd-1.0/debian/compat
@@ -0,0 +1 @@
+7