Bug#318688: Modifies conffile?

[Justin Pryzby <justinpryzby@users.sourceforge.net>]

Package: x11-common
Version: 6.8.2.dfsg.1-6
Severity: normal
File: /etc/Xsession
File: /etc/Xsession.options

I was prompted with the following 2 diffs today while dist-upgrading
to current testing; I made none of the listed changes.


--- /etc/X11/Xsession.options	2002-04-16 08:29:11.000000000 -0400
+++ /etc/X11/Xsession.options.dpkg-new	2005-08-31 11:57:20.000000000 -0400
@@ -1,4 +1,4 @@
-# /etc/X11/Xsession.options
+# $Id: Xsession.options 189 2005-06-11 00:04:27Z branden $
 #
 # configuration options for /etc/X11/Xsession
 # See Xsession.options(5) for an explanation of the available options.
@@ -6,3 +6,4 @@
 allow-user-resources
 allow-user-xsession
 use-ssh-agent
+use-session-dbus



--- /etc/X11/Xsession	2005-02-18 16:32:40.000000000 -0500
+++ /etc/X11/Xsession.dpkg-new	2005-08-31 11:57:20.000000000 -0400
@@ -4,7 +4,7 @@
 #
 # global Xsession file -- used by display managers and xinit (startx)
 
-# $Id: Xsession 2186 2005-02-11 07:11:05Z branden $
+# $Id: Xsession 405 2005-07-24 04:46:38Z dnusinow $
 
 set -e
 
@@ -42,11 +42,29 @@
   # the user would have dismissed the error we want reported before seeing the
   # request to report it.
   errormsg "$*" \
-           "Please report the installed version of the \"xfree86-common\"" \
+           "Please report the installed version of the \"x11-common\"" \
            "package and the complete text of this error message to" \
            "<debian-x@lists.debian.org>."
 }
 
+run_parts () {
+  # until run-parts --noexec is implemented
+  if [ -z "$1" ]; then
+    internal_errormsg "run_parts() called without an argument."
+  fi
+  if [ ! -d "$1" ]; then
+    internal_errormsg "run_parts() called, but \"$1\" does not exist or is" \
+                      "not a directory."
+  fi
+  for F in $(ls $1); do
+    if expr "$F" : '[[:alnum:]_-]\+$' > /dev/null 2>&1; then
+      if [ -f "$1/$F" ]; then
+        echo "$1/$F"
+      fi
+    fi
+  done
+}
+
 # initialize variables for use by all session scripts
 
 OPTIONFILE=/etc/X11/Xsession.options
@@ -94,11 +112,11 @@
 fi
 rm -f "$WRITE_TEST"
 
-# Use run-parts to source every file in the session directory; we source
+# use run-parts to source every file in the session directory; we source
 # instead of executing so that the variables and functions defined above
 # are available to the scripts, and so that they can pass variables to each
-# other.
-SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
+# other
+SESSIONFILES=$(run_parts $SYSSESSIONDIR)
 if [ -n "$SESSIONFILES" ]; then
   for SESSIONFILE in $SESSIONFILES; do
     . $SESSIONFILE