From f7a14ff346f07ff7ca5fff985d106115504360fa Mon Sep 17 00:00:00 2001
From: Rob Browning <rlb@defaultvalue.org>
Date: Thu, 10 Aug 2017 15:48:54 -0500
Subject: [PATCH] Move mail-host-address and gnus-nntpserver-file to new
 00debian.el

---
 debian/00debian.el | 14 ++++++++++++++
 debian/rules       |  3 +++
 2 files changed, 17 insertions(+)
 create mode 100644 debian/00debian.el

diff --git a/debian/00debian.el b/debian/00debian.el
new file mode 100644
index 00000000000..0d2390846f1
--- /dev/null
+++ b/debian/00debian.el
@@ -0,0 +1,14 @@
+
+;; Set the default mail server and news server as specified by Debian
+;; policy.
+
+(setq gnus-nntpserver-file "/etc/news/server")
+
+(setq mail-host-address (let ((name (expand-file-name "/etc/mailname")))
+                          (if (not (file-readable-p name))
+                              nil
+                            (with-temp-buffer
+                              (insert-file-contents-literally name)
+                              (while (search-forward "\n" nil t)
+                                (replace-match "" nil t))
+                              (buffer-string)))))
diff --git a/debian/rules b/debian/rules
index 40c567f18c1..ccd454ccdfe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -395,6 +395,9 @@ override_dh_auto_install: $(autogen_install_files)
 	  install -d $(pkgdir_common)/etc/emacs/site-start.d
 	  install -d $(pkgdir_common)/usr/share/emacs/site-lisp
 
+	install -m 0644 debian/00debian.el \
+	  $(pkgdir_common)/etc/emacs/site-start.d/
+
 	  cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
 	    && convert hicolor/16x16/apps/emacs.{png,xpm}
 	  cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
-- 
2.30.2