* The following miscellaneous changes have been made.
  Patch: misc-unseparated.diff

  * Some documentation references to /usr/local/ have been changed to /usr.
    
  * Emacs runs debian-startup.

    Emacs runs debian-startup during the startup process unless
    site-run-file is false.
    
  * The default for message-sendmail-f-is-evil has been changed to t.

    This is correct for Debian systems where we know the MTA should be
    trusted.
    
  * mail-from-style changed from 'angles to 'system-default by default.
    
  * debian-emacs-flavor is a global variable bound to 'emacs21.
    Author: Rob Browning <rlb@defaultvalue.org>
    
  * Info-default-directory-list includes /usr/share/info/emacs-MAJOR
    Author: Rob Browning <rlb@defaultvalue.org>

    Info-default-directory-list was modified to reflect the install
    location of the info files.  This location allows multiple emacsen
    to coexist on the same Debian system.
    
  * The build process was modified to accommodate Debian packaging.
    Author: Rob Browning <rlb@defaultvalue.org>

    Emacs has to be able to install into a directory that will not be
    the eventual run directory without embedding the install directory
    in any of the resulting files.

diff -urNad /home/rlb/deb/emacs21/trunk/Makefile.in trunk/Makefile.in
--- /home/rlb/deb/emacs21/trunk/Makefile.in	2003-09-11 01:16:07.000000000 -0500
+++ trunk/Makefile.in	2003-09-11 01:16:53.000000000 -0500
@@ -474,11 +474,16 @@
 	  $(srcdir)/mkinstalldirs ${datadir}; \
 	  chmod a+r ${datadir};\
 	fi
+	test "${debepkgdir}"
 	$(srcdir)/mkinstalldirs ${COPYDESTS} ${infodir} ${man1dir} \
 	  ${bindir} ${docdir} ${libexecdir} \
 	  ${datadir}/emacs/site-lisp \
 	  ${datadir}/emacs/${version}/site-lisp \
-	  `echo ${locallisppath} | sed 's/:/ /g'`
+	  `echo ${debepkgdir}${locallisppath} | sed 's|:| ${debepkgdir}|g'`
+
+# debepkgdir (above) is set in debian/rules
+
+#	  `echo debian/tmp-emacs${locallisppath} | sed 's/:/ debian\/tmp-emacs/g'`
 
 ### Delete all the installed files that the `install' target would
 ### create (but not the noninstalled files such as `make all' would
diff -urNad /home/rlb/deb/emacs21/trunk/etc/NEWS trunk/etc/NEWS
--- /home/rlb/deb/emacs21/trunk/etc/NEWS	2003-09-11 01:16:07.000000000 -0500
+++ trunk/etc/NEWS	2003-09-11 01:16:53.000000000 -0500
@@ -6,6 +6,11 @@
 For older news, see the file ONEWS
 
 
+* Debian specific changes to Emacs
+
+Please see /usr/share/doc/emacs21-common/README.Debian.gz.
+
+
 * Installation changes in Emacs 21.3
 
 ** Support for GNU/Linux on little-endian MIPS and on IBM S390 has
diff -urNad /home/rlb/deb/emacs21/trunk/etc/emacs.1 trunk/etc/emacs.1
--- /home/rlb/deb/emacs21/trunk/etc/emacs.1	2003-09-11 01:16:07.000000000 -0500
+++ trunk/etc/emacs.1	2003-09-11 01:16:53.000000000 -0500
@@ -169,7 +169,7 @@
 window in reverse video.
 .TP
 .B \-i
-Use the "kitchen sink" bitmap icon when iconifying the
+Use the Emacs icon when iconifying the
 .I Emacs
 window.
 .TP
@@ -221,7 +221,7 @@
 .IR X (1)
 for more information.
 The width and height are specified in characters; the default is 80 by
-24.
+40.
 .PP
 .TP 8
 .BI \-fg " color"
@@ -411,29 +411,29 @@
 manual is also included in the Emacs source distribution.
 .PP
 .SH FILES
-/usr/local/info - files for the Info documentation browser
+/usr/info - files for the Info documentation browser
 (a subsystem of Emacs) to refer to.  Currently not much of Unix
 is documented here, but the complete text of the Emacs reference
 manual is included in a convenient tree structured form.
 
-/usr/local/share/emacs/$VERSION/src - C source files and object files
+/usr/share/emacs/$VERSION/src - C source files and object files
 
-/usr/local/share/emacs/$VERSION/lisp - Lisp source files and compiled files
+/usr/share/emacs/$VERSION/lisp - Lisp source files and compiled files
 that define most editing commands.  Some are preloaded;
 others are autoloaded from this directory when used.
   
-/usr/local/share/emacs/$VERSION/etc - various programs that are used with
+/usr/share/emacs/$VERSION/etc - various programs that are used with
 GNU Emacs, and some files of information.
 
-/usr/local/share/emacs/$VERSION/etc/DOC.* - contains the documentation
+/usr/share/emacs/$VERSION/etc/DOC.* - contains the documentation
 strings for the Lisp primitives and preloaded Lisp functions
 of GNU Emacs.  They are stored here to reduce the size of
 Emacs proper.
 
-/usr/local/share/emacs/$VERSION/etc/OTHER.EMACSES discusses GNU Emacs
+/usr/share/emacs/$VERSION/etc/OTHER.EMACSES discusses GNU Emacs
 vs. other versions of Emacs.
 .br
-/usr/local/share/emacs/$VERSION/etc/SERVICE lists people offering
+/usr/share/emacs/$VERSION/etc/SERVICE lists people offering
 various services to assist users of GNU Emacs, including education,
 troubleshooting, porting and customization.
 .br
@@ -441,7 +441,7 @@
 programs in the Emacs Lisp extension language, which has not yet been fully
 documented.
 
-/usr/local/com/emacs/lock - holds lock files that are made for all
+/usr/com/emacs/lock - holds lock files that are made for all
 files being modified in Emacs, to prevent simultaneous modification
 of one file by two users.
 
@@ -468,7 +468,7 @@
 Send requests to be added to mailing lists to the special list
 info-gnu-emacs-request@prep.ai.mit.edu (or the corresponding UUCP
 address).  For more information about Emacs mailing lists, see the
-file /usr/local/emacs/etc/MAILINGLISTS.  Bugs tend actually to be
+file /usr/emacs/etc/MAILINGLISTS.  Bugs tend actually to be
 fixed if they can be isolated, so it is in your interest to report
 them in such a way that they can be easily reproduced.
 .PP
diff -urNad /home/rlb/deb/emacs21/trunk/lisp/gnus/message.el trunk/lisp/gnus/message.el
--- /home/rlb/deb/emacs21/trunk/lisp/gnus/message.el	2003-09-11 01:16:07.000000000 -0500
+++ trunk/lisp/gnus/message.el	2003-09-11 01:16:53.000000000 -0500
@@ -402,9 +402,14 @@
 		 (const use)
 		 (const ask)))
 
-(defcustom message-sendmail-f-is-evil nil
-  "*Non-nil means don't add \"-f username\" to the sendmail command line.
-Doing so would be even more evil than leaving it out."
+;; message-sendmail-f-is-evil is nil here in the upstream source, but
+;; sendmail works right under Debian Linux, so we want t. [was
+;; orignally reported for emacs 19 as debian#7051]
+(defcustom message-sendmail-f-is-evil t
+  "*Non-nil means don't add \"-f username\" to the sendmail command
+line, because adding it would be more evil than leaving it out.  Under
+Debian/GNU/Linux, sendmail works right, so it should be safe for this
+to be set to true."
   :group 'message-sending
   :type 'boolean)
 
diff -urNad /home/rlb/deb/emacs21/trunk/lisp/mail/sendmail.el trunk/lisp/mail/sendmail.el
--- /home/rlb/deb/emacs21/trunk/lisp/mail/sendmail.el	2003-09-11 01:16:07.000000000 -0500
+++ trunk/lisp/mail/sendmail.el	2003-09-11 01:16:53.000000000 -0500
@@ -43,7 +43,7 @@
   :group 'mail)
 
 ;;;###autoload
-(defcustom mail-from-style 'angles "\
+(defcustom mail-from-style 'system-default "\
 *Specifies how \"From:\" fields look.
 
 If `nil', they contain just the return address like:
diff -urNad /home/rlb/deb/emacs21/trunk/lisp/site-init.el trunk/lisp/site-init.el
--- /home/rlb/deb/emacs21/trunk/lisp/site-init.el	1969-12-31 18:00:00.000000000 -0600
+++ trunk/lisp/site-init.el	2003-09-11 01:16:53.000000000 -0500
@@ -0,0 +1,3 @@
+(setq Info-default-directory-list
+      ;; the command line info doesn't seem to need this, but emacs does.
+      (append Info-default-directory-list '("/usr/share/info/emacs-21/")))
diff -urNad /home/rlb/deb/emacs21/trunk/lisp/startup.el trunk/lisp/startup.el
--- /home/rlb/deb/emacs21/trunk/lisp/startup.el	2003-09-11 01:16:07.000000000 -0500
+++ trunk/lisp/startup.el	2003-09-11 01:16:53.000000000 -0500
@@ -339,6 +339,10 @@
 
 (defvar normal-top-level-add-subdirs-inode-list nil)
 
+(defconst debian-emacs-flavor 'emacs21
+  "A symbol representing the particular debian flavor of emacs running.
+Something like 'emacs20, 'xemacs20, etc.")
+
 (defun normal-top-level-add-subdirs-to-load-path ()
   "Add all subdirectories of current directory to `load-path'.
 More precisely, this uses only the subdirectories whose names
@@ -848,8 +852,18 @@
     ;; Run the site-start library if it exists.  The point of this file is
     ;; that it is run before .emacs.  There is no point in doing this after
     ;; .emacs; that is useless.
-    (if site-run-file 
-	(load site-run-file t t))
+    ;; (if site-run-file 
+    ;;     (load site-run-file t t))
+
+    ;; Debian version of site-start.
+    (if site-run-file
+        (progn
+          ;; Load all the debian package snippets.
+          ;; It's in here because we want -q to kill it too.
+          (if (load "debian-startup" t t nil)
+              (debian-startup debian-emacs-flavor))
+          ;; Now the normal site file...
+          (load site-run-file t t nil)))
 
     ;; Sites should not disable this.  Only individuals should disable
     ;; the startup message.
diff -urNad /home/rlb/deb/emacs21/trunk/lisp/vc-hooks.el trunk/lisp/vc-hooks.el
--- /home/rlb/deb/emacs21/trunk/lisp/vc-hooks.el	2003-09-11 01:16:07.000000000 -0500
+++ trunk/lisp/vc-hooks.el	2003-09-11 01:16:53.000000000 -0500
@@ -54,8 +54,8 @@
   :group 'vc)
 
 (defcustom vc-path
-  (if (file-directory-p "/usr/sccs")
-      '("/usr/sccs")
+  (if (file-directory-p "/usr/lib/cssc")
+      '("/usr/lib/cssc")
     nil)
   "*List of extra directories to search for version control commands."
   :type '(repeat directory)