x11-common installs dup files

[Rui Matos]

On edgy with packages
xinit 1.0.1-0ubuntu3
x11-common 7.0.22ubuntu1

I get the same files (tough with different names, thus dpkg doesn't complain):

/etc/X11/Xsession.d$ ls
20x11-common_process-args 50xorg-common_determine-startup 90xorg-common_ssh-agent
20xorg-common_process-args 55gnome-session_gnomerc 99x11-common_start
30x11-common_xresources 60gconf2_merge-tree.dpkg-bak 99xorg-common_start
30xorg-common_xresources 75dbus_dbus-launch
50x11-common_determine-startup 90x11-common_ssh-agent

[Tollef Fog Heen (tfheen)]

This is known and on my list of things to fix, but thanks for the bug report anyway.

[Jan Mynarik (jan-mynarik)]

Probably the whole x11-common should be built from other source than old xorg source package. I know you knew it but wrote it anyway, sorry ;-)

[Andreas Simon (andreas-w-simon)]

I just want to note that this is also the case in current Feisty with xinit 1.0.2-0ubuntu3 and x11-common 7.1.1ubuntu6.

[Timo Aaltonen (tjaalton)]

this should be fixed in Feisty:

xinit (1.0.2-0ubuntu2) edgy; urgency=low

  * Removed debian/xsession/Xsession.d from list of files directories
    installed (funny part is - this directory was already present on our
    previous package, but "magically" was not installed)
  * Removed debian/xsession/Xsession.5 from list of manpages installed

 -- Rodrigo Parra Novo <email address hidden> Mon, 7 Aug 2006 10:32:32 -0300

[Jan Mynarik (jan-mynarik)]

Not sure it was xinit package that has the fix but definitely there are no duplicate files anymore.

[Timo Aaltonen (tjaalton)]

ok, I'll mark this as fixed.. if someone still sees this with Feisty, please reopen.

[Boris de Laage (bbloup)]

mmm, I still see this with Feisty...

ii x11-common 7.2-0ubuntu11
ii xinit 1.0.2-0ubuntu3

[Timo Aaltonen (tjaalton)]

boris: you have the dupes after a clean install?

[Boris de Laage (bbloup)]

Was not a clean install, was a dist-upgrade. Files still belong to
both x11-common & xinit packages :

--
Boris de Laage <email address hidden> - GnuPG key 0x177DD1ED

[Jan Mynarik (jan-mynarik)]

I had a similar problem when a file belonged to a package (according to dpkg -S) but it wasn't a part of current version. Try to manually remove (sudo rm) all duplicate files (from both x11-common and xinit packages) and then reinstall both packages (sudo apt-get install --reinstall x11-common xinit). This should probably remove duplicate files for you and install the right ones.

[Boris de Laage (bbloup)]

Yes, it worked. Thanx.

--
Boris de Laage <email address hidden> - GnuPG key 0x177DD1ED

[Brian Fallik (bfallik)]

Using the method described above (rm; a-g install --reinstall...), I
now have none of the config files installed into /etc/x11/Xsession.d.

$ ls /etc/X11/Xsession.d
55gnome-session_gnomeric 75dbus_dbus-launch 90tpb

However, dpkg -L suggests that x11-common has installed them. No
amount of dpkg -i, apt-get, or aptitude seems to create these file.
Any ideas? X now boots me into "failsafe terminal mode".

If I manually extract the deb and copy these files in, X gets very sad.

[Timo Aaltonen (tjaalton)]

the package scripts should deal with migrating conffiles, since they aren't removed on upgrade.

[Timo Aaltonen (tjaalton)]

I'll bite the bullet and try to fix this before hardy is released.

[Mark Wilkinson (mhw)]

An additional duplication: x11-common and xinit both install a copy of /etc/X11/Xsession but they supply different versions of the file, so the version that's actually used depends on the installation order.

$ grep '/etc/X11/Xsession ' /var/lib/dpkg/status
 /etc/X11/Xsession 1fd6001d0552b870f416dde954e0f060
 /etc/X11/Xsession bc9abf656f3a702294d490eb1554359b
$

The first one is the instance of the file from the xinit package, the second one from x11-common. On my clean install of Feisty I finished up with the version from the xinit package installed, but this version seems to predate the one in x11-common. Here's a diff:

$ diff -u [x11-common]/Xsession /etc/X11/Xsession
--- /m/migrate/d600/etc/X11/Xsession 2006-10-12 16:33:54.000000000 +0100
+++ /etc/X11/Xsession 2006-08-07 20:02:19.000000000 +0100
@@ -4,7 +4,7 @@
 #
 # global Xsession file -- used by display managers and xinit (startx)

-# $Id: Xsession 967 2005-12-27 07:20:55Z dnusinow $
+# $Id: Xsession 1507M 2004-09-13 07:36:26Z (local) $

 set -e

@@ -42,7 +42,7 @@
   # 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 \"x11-common\"" \
+ "Please report the installed version of the \"xfree86-common\"" \
            "package and the complete text of this error message to" \
            "<email address hidden>."
 }
@@ -56,7 +56,7 @@
     internal_errormsg "run_parts() called, but \"$1\" does not exist or is" \
                       "not a directory."
   fi
- for F in $(/bin/ls $1); do
+ for F in $(ls $1); do
     if expr "$F" : '[[:alnum:]_-]\+$' > /dev/null 2>&1; then
       if [ -f "$1/$F" ]; then
         echo "$1/$F"
@@ -78,7 +78,7 @@
 ERRFILE=$HOME/.xsession-errors

 # attempt to create an error file; abort if we cannot
-if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] &&
+if touch "$ERRFILE" 2> /dev/null && [ -w "$ERRFILE" ] &&
   [ ! -L "$ERRFILE" ]; then
   chmod 600 "$ERRFILE"
 elif ERRFILE=$(tempfile 2> /dev/null); then
@@ -91,12 +91,6 @@
   errormsg "unable to create X session log/error file; aborting."
 fi

-# truncate ERRFILE if it is too big to avoid disk usage DoS
-if [ "`stat -c%s \"$ERRFILE\"`" -gt 500000 ]; then
- T=`mktemp -p "$HOME"`
- tail -c 500000 "$ERRFILE" > "$T" && mv -f "$T" "$ERRFILE" || rm -f "$T"
-fi
-
 exec >>"$ERRFILE" 2>&1

 echo "$PROGNAME: X session started for $LOGNAME at $(date)"
@@ -124,11 +118,9 @@
 # other
 SESSIONFILES=$(run_parts $SYSSESSIONDIR)
 if [ -n "$SESSIONFILES" ]; then
- set +e
   for SESSIONFILE in $SESSIONFILES; do
     . $SESSIONFILE
   done
- set -e
 fi

 exit 0
$

[Timo Aaltonen (tjaalton)]

xinit does not supply /etc/X11/Xsession anymore.

[Timo Aaltonen (tjaalton)]

This should be fixed in intrepid by xorg-1:7.4~2ubuntu1.