diff -u nis-3.17/debian/reportbug-script nis-3.17/debian/reportbug-script
--- nis-3.17/debian/reportbug-script
+++ nis-3.17/debian/reportbug-script
@@ -7,7 +7,9 @@
 yesno "May I include your NIS domain name in the bug report? [Y/n] " yep
 
 if [ "$REPLY" = "yep" ]; then
-  echo -e "\nNIS domain: $(/bin/domainname) \n" >&3
+  echo >&3
+  echo "NIS domain: $(/bin/domainname) " >&3
+  echo
 fi
 
 if [ -x /usr/bin/nm-tool ]; then
diff -u nis-3.17/debian/prerm nis-3.17/debian/prerm
--- nis-3.17/debian/prerm
+++ nis-3.17/debian/prerm
@@ -17,14 +17,14 @@
 			echo WARNING: init script for NIS has been removed - daemons may not be stopped.
 		fi
 
-                # /sbin/unix_chkpwd is installed setgid shadow by default; for NIS we need
-                # setuid root, so the postinst installed a statoverride. (See
-                # #155583) Remove that override again here.
+		# /sbin/unix_chkpwd is installed setgid shadow by default; for
+		# NIS we need setuid root, so the postinst installed a
+		# statoverride.  Remove that override again here.
                 if OVR=$(dpkg-statoverride --list /sbin/unix_chkpwd) && \
-                    [ "$OVR" == "root root 4755 /sbin/unix_chkpwd" ]; then
-                    dpkg-statoverride --remove /sbin/unix_chkpwd
-                    chown root:shadow /sbin/unix_chkpwd
-                    chmod 2755 /sbin/unix_chkpwd
+                   [ "$OVR" = "root root 4755 /sbin/unix_chkpwd" ]; then
+			dpkg-statoverride --remove /sbin/unix_chkpwd
+			chown root:shadow /sbin/unix_chkpwd
+			chmod 2755 /sbin/unix_chkpwd
                 fi
 		;;
 	failed-upgrade)
diff -u nis-3.17/debian/nis.default nis-3.17/debian/nis.default
--- nis-3.17/debian/nis.default
+++ nis-3.17/debian/nis.default
@@ -25,7 +25,7 @@
 YPSERVARGS=
 
 # Additional options to be given to ypbind when it is started.  
-YPBINDARGS=
+YPBINDARGS=-no-dbus
 
 # Additional options to be given to yppasswdd when it is started.  Note
 # that if -p is set then the YPPWDDIR above should be empty.
diff -u nis-3.17/debian/nis.debian.howto nis-3.17/debian/nis.debian.howto
--- nis-3.17/debian/nis.debian.howto
+++ nis-3.17/debian/nis.debian.howto
@@ -16,9 +16,12 @@
 
   1.2 The installation procedure will ask for your NIS domainname. This
       is just a name which describes the group of systems that use NIS, it
-      is not a hostname. It is stored in the config file /etc/defaultdomain,
-      in case you ever want to change it. Unlike DNS hostnames and
-      domainnames, the NIS domainname is case-sensitive!
+      is not a hostname. Please consult your network administrator to
+      find the appropriate setting for your network.
+
+      The domainname will be stored in the config file /etc/defaultdomain, in
+      case you ever want to change it. Unlike DNS hostnames and domainnames,
+      the NIS domainname is case-sensitive!
 
   1.3 If your NIS server is not "local" to your network, you will have to do
       some finetuning. The ypbind process has a configuration file called
diff -u nis-3.17/debian/changelog nis-3.17/debian/changelog
--- nis-3.17/debian/changelog
+++ nis-3.17/debian/changelog
@@ -1,3 +1,38 @@
+nis (3.17-17ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #299174)
+    - Replace "multiuser" deprecated init mode in debian/postinst with manual
+    arguments. Adapt the corresponding change in LSB init script header and
+    runtime dependency in debian/control
+    - Fix FTBFS because of NM 0.7 in intrepid editing ypbind-mt-1.20.1/src/
+    ypbind_dbus_nm.c
+
+ -- Didier Roche <didrocks@ubuntu.com>  Mon, 17 Nov 2008 20:18:37 +0100
+
+nis (3.17-17) unstable; urgency=low
+
+  * Force locale for ypcat to C in order to work around errors from
+    fprintf() with multi-byte characters (closes: #487104).
+
+ -- Mark Brown <broonie@debian.org>  Tue, 26 Aug 2008 20:24:44 +0100
+
+nis (3.17-16) unstable; urgency=low
+
+  * Apply patch from Ubuntu to support unix_chkpwd not being root now that
+    the change in PAM has finally been made (closes: #492426).
+  * Disable Network Manager by default again since the experience in Ubuntu
+    suggests that it is still reporting bogus states.
+
+ -- Mark Brown <broonie@debian.org>  Sat, 26 Jul 2008 10:27:58 +0100
+
+nis (3.17-15) unstable; urgency=low
+
+  * Tweak reportbug script to avoid echo -e (closes: #489643).
+  * Add a note about consulting your network administrator to the text
+    about configuring the NIS domainname for clients (closes: #484780).
+
+ -- Mark Brown <broonie@debian.org>  Sat, 19 Jul 2008 16:19:04 +0100
+
 nis (3.17-14ubuntu2) intrepid; urgency=low
 
   * Replace "multiuser" deprecated init mode in debian/postinst with manual
only in patch2:
unchanged:
--- nis-3.17.orig/yp-tools-2.9/src/ypcat.c
+++ nis-3.17/yp-tools-2.9/src/ypcat.c
@@ -120,8 +120,8 @@
   char *domainname = NULL;
   char *hostname = NULL;
 
-  setlocale (LC_MESSAGES, "");
-  setlocale (LC_CTYPE, "");
+  setlocale (LC_MESSAGES, "C");
+  setlocale (LC_CTYPE, "C");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);