[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r1105 - branches/modular/debian/x11-common/debian



Author: dnusinow
Date: 2006-01-22 20:31:33 -0500 (Sun, 22 Jan 2006)
New Revision: 1105

Removed:
   branches/modular/debian/x11-common/debian/x11-common.README.Debian
   branches/modular/debian/x11-common/debian/x11-common.config.in
   branches/modular/debian/x11-common/debian/x11-common.dirs
   branches/modular/debian/x11-common/debian/x11-common.doc-base.debian-faq
   branches/modular/debian/x11-common/debian/x11-common.docs
   branches/modular/debian/x11-common/debian/x11-common.docs.s390
   branches/modular/debian/x11-common/debian/x11-common.examples
   branches/modular/debian/x11-common/debian/x11-common.init
   branches/modular/debian/x11-common/debian/x11-common.install
   branches/modular/debian/x11-common/debian/x11-common.links
   branches/modular/debian/x11-common/debian/x11-common.postinst.in
   branches/modular/debian/x11-common/debian/x11-common.postrm.in
   branches/modular/debian/x11-common/debian/x11-common.preinst.in
   branches/modular/debian/x11-common/debian/x11-common.templates
Modified:
   branches/modular/debian/x11-common/debian/changelog
Log:
Remove extra packaging to be added later and set for experimental

Modified: branches/modular/debian/x11-common/debian/changelog
===================================================================
--- branches/modular/debian/x11-common/debian/changelog	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/changelog	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1,8 +1,8 @@
-x11-common (1:1.09) UNRELEASED; urgency=low
+x11-common (1:1.09) experimental; urgency=low
 
   * First upload to Debian. Renamed to x11-common.
 
- -- David Nusinow <dnusinow@debian.org>  Thu, 27 Oct 2005 23:44:07 -0400
+ -- David Nusinow <dnusinow@debian.org>  Sun, 22 Jan 2006 20:31:04 -0500
 
 x-common (1.08) breezy; urgency=low
 

Deleted: branches/modular/debian/x11-common/debian/x11-common.README.Debian
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.README.Debian	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.README.Debian	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1,90 +0,0 @@
-Debian README for x11-common package
-========================================
-
-The x11-common package provides the infrastructure common to all Debian X
-installations.
-
-Newcomers to the X Window System should first read the Debian X FAQ
-(Frequently Asked Questions list): /usr/share/doc/x11-common/FAQ.gz.
-You can view this file with your favorite pager program after decompressing
-it.  For example:
-    $ zcat /usr/share/doc/x11-common/FAQ.gz | pager
-
-Those who have upgraded their Debian X packages from version 3.3.2.3-2 or
-earlier (Debian 2.0), will want to read the information in
-/usr/share/doc/x11-common/README.Debian-upgrade.
-
-Note that as of version 3.3.6-4, support for the /etc/X11/window-managers
-file has been removed; the default window manager is now determined by
-using the Debian alternatives mechanism.  See update-alternatives(8) for
-more information.
-
-Use "dpkg --print-avail <package>" to read the extended descriptions of
-the X.Org packages and get some idea of their contents.
-
-There are three common types of X Window System installation:
-
-1) standalone X workstation -- the X server and most X clients run on the
-same physical hardware.  Thus both the xlibs and xserver-common packages
-will be present.
-
-2) X terminal -- only an X server is present; all X clients are run on
-remote hardware.  The xlibs package need not be present, but the
-xserver-common package will be.  For Debian policy reasons, xlibs is of
-"standard" priority and thus most likely will be installed, unless the
-administrator has taken deliberate steps to remove it.  Nevertheless, if
-the machine in question is configured strictly as an X terminal, the X
-libraries present on the machine will not be used.
-
-3) X client server -- here the different usages of "client" and "server" in
-common computing parlance and the X sense can be somewhat confusing.
-Essentially, this is the counterpart to 2) above.  This is a machine on
-which X clients run, but they are displayed only to remote machines; this
-machine's own video hardware (if any) is not used by the X Window System.
-Therefore, the xlibs package will be present (since in practice all X
-clients written in C require the X libraries), but the xserver-common
-package will not be.
-
-One can conclude from the above that any Debian machine which has anything to
-do with the X Window System will have xlibs and/or xserver-common installed.
-The x11-common package is the foundation on which those two packages
-themselves depend.
-
-In addition to manual pages and documentation, the x11-common
-package contains the following:
-
-1) the basic X directory hierarchy and symbolic links into it -- /usr/X11R6
-is the canonical location for the X Window System according to the FHS
-(Filesystem Hierarchy Standard).  By providing both this hierarchy and the
-symbolic links pointing into it (/usr/bin/X11, /usr/lib/X11, et al.), any
-future changes in the filesystem location or structure of the X Window System
-can be centrally managed.
-
-2) the /etc/X11/Xresources directory, and the x11-common file within it
--- historically in Debian systems, /etc/X11/Xresources has been a plain file,
-whose contents were processed by an X resource database merge (a.k.a. xrdb
--merge) when an X session was launched (whether by startx or xdm).  This
-arrangement made it difficult for other packages to specify system-wide but
-user-modifiable X resources.  Now, however, /etc/X11/Xresources is a directory.
-/etc/X11/Xsession (see below) performs an xrdb -merge on each of the files
-within this directory; it is thus easy for individual packages to allow for
-system-wide user-customizable X resources.  It is strongly suggested that
-packages wishing to take advantage of this place a file in /etc/X11/Xresources
-with the same name as the package in question, to prevent name collisions.  The
-x11-common file here should be used for very high-level, global resource
-settings (such as setting the color customization, setting properties of Athena
-widgets, etc.).  See the X(1) manual page for more information on X resources.
-
-3) /etc/X11/Xsession -- this is a shell script executed each time an X session
-is started, whether by startx or xdm.  Since it resides in /etc, the system
-administrator is free to edit it, but for convenience some aspects of its
-behavior are easily customizable via the /etc/X11/Xsession.options file.
-See the Xsession(5) manual page for more information.
-
-4) /etc/X11/Xsession.options -- a plain text file containing configuration
-options for the /etc/X11/Xsession file.  See the Xsession.options(5)
-manual page for more information.
-
-$Id: x11-common.README.Debian 405 2005-07-24 04:46:38Z dnusinow $
-
-vim:set ai et sts=4 sw=4 tw=80:

Deleted: branches/modular/debian/x11-common/debian/x11-common.config.in
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.config.in	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.config.in	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Debian x11-common package configuration script
-# Copyright 2002, 2003 Branden Robinson.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-# $Id: x11-common.config.in 405 2005-07-24 04:46:38Z dnusinow $
-
-set -e
-
-# source debconf library
-. /usr/share/debconf/confmodule
-
-THIS_PACKAGE=x11-common
-THIS_SCRIPT=config
-
-#INCLUDE_SHELL_LIB#
-
-# is this an unofficial Debian package?
-if [ -z "$OFFICIAL_BUILD" ]; then
-  observe "unofficial build detected; issuing debconf note as warning"
-  run db_register x11-common/experimental_packages \
-                           x11-common/nag
-  run db_input high x11-common/nag
-  run db_go
-  run db_unregister x11-common/nag
-fi
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:

Deleted: branches/modular/debian/x11-common/debian/x11-common.dirs
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.dirs	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.dirs	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1 +0,0 @@
-etc/X11/Xresources

Deleted: branches/modular/debian/x11-common/debian/x11-common.doc-base.debian-faq
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.doc-base.debian-faq	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.doc-base.debian-faq	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1,14 +0,0 @@
-Document: debian-x-faq
-Title: Debian X Window System Frequently Asked Questions (FAQ)
-Author: Branden Robinson
-Abstract: This document is intended to provide answers to the questions
- most often asked by users of the X Window System on the Debian Operating
- System.
-Section: Apps/System
-
-Format: text
-Files: /usr/share/doc/x11-common/FAQ.gz
-
-Format: HTML
-Index: /usr/share/doc/x11-common/FAQ.xhtml
-Files: /usr/share/doc/x11-common/FAQ.xhtml

Deleted: branches/modular/debian/x11-common/debian/x11-common.docs
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.docs	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.docs	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1,14 +0,0 @@
-build-tree/xc/ChangeLog
-build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG
-build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.ND
-build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.R5
-debian/changelog.Debian.old
-debian/changelog.Ubuntu
-debian/local/FAQ
-debian/local/FAQ.xhtml
-debian/local/README.Debian-upgrade
-debian/tmp/usr/X11R6/lib/X11/doc/README
-debian/tmp/usr/X11R6/lib/X11/doc/README.dps
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
-debian/tmp/usr/X11R6/lib/X11/doc/RELNOTES
-debian/tmp/usr/X11R6/lib/X11/doc/Versions

Deleted: branches/modular/debian/x11-common/debian/x11-common.docs.s390
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.docs.s390	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.docs.s390	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1,13 +0,0 @@
-build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG
-build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.ND
-build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.R5
-build-tree/xc/programs/Xserver/hw/xfree86/doc/README.dps
-build-tree/xc/programs/Xserver/hw/xfree86/doc/RELNOTES
-build-tree/xc/programs/Xserver/hw/xfree86/doc/Versions
-debian/changelog.Debian.old
-debian/changelog.Ubuntu
-debian/local/FAQ
-debian/local/FAQ.xhtml
-debian/local/README.Debian-upgrade
-debian/tmp/usr/X11R6/lib/X11/doc/README
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts

Deleted: branches/modular/debian/x11-common/debian/x11-common.examples
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.examples	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.examples	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1 +0,0 @@
-debian/local/xsession

Deleted: branches/modular/debian/x11-common/debian/x11-common.init
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.init	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.init	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# $Id: x11-common.init 305 2005-07-03 18:51:43Z dnusinow $
-
-# Copyright 2003, 2004 Branden Robinson <branden@debian.org>.
-#
-# This is free software; you may redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2,
-# or (at your option) any later version.
-#
-# This is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License with
-# the Debian operating system, in /usr/share/common-licenses/GPL;  if
-# not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
-
-set -e
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-SOCKET_DIR=/tmp/.X11-unix
-ICE_DIR=/tmp/.ICE-unix
-
-#. /lib/lsb/init-functions
-#. /etc/default/rcS
-
-do_restorecon () {
-  # Restore file security context (SELinux).
-  if which restorecon >/dev/null 2>&1; then
-    restorecon "$1"
-  fi
-}
-
-set_up_socket_dir () {
-  if [ "$VERBOSE" != no ]; then
-    #log_begin_msg "Setting up X server socket directory $SOCKET_DIR..."
-    echo -n "Setting up X server socket directory $SOCKET_DIR..."
-  else
-    #log_begin_msg "Setting up X server socket directory..."
-    echo -n "Setting up X server socket directory..."
-  fi
-  if [ -e $SOCKET_DIR ] && [ ! -d $SOCKET_DIR ]; then
-    mv $SOCKET_DIR $SOCKET_DIR.$$
-  fi
-  mkdir -p $SOCKET_DIR
-  chown 0:0 $SOCKET_DIR
-  chmod 1777 $SOCKET_DIR
-  do_restorecon $SOCKET_DIR
-  #log_end_msg 0
-  echo "done."
-}
-
-set_up_ice_dir () {
-  if [ "$VERBOSE" != no ]; then
-    #log_begin_msg "Setting up ICE socket directory $ICE_DIR..."
-    echo -n "Setting up ICE socket directory $ICE_DIR..."
-  else
-    #log_begin_msg "Setting up ICE socket directory..."
-    echo -n "Setting up ICE socket directory..."
-  fi
-  if [ -e $ICE_DIR ] && [ ! -d $ICE_DIR ]; then
-    mv $ICE_DIR $ICE_DIR.$$
-  fi
-  mkdir -p $ICE_DIR
-  chown 0:0 $ICE_DIR
-  chmod 1777 $ICE_DIR
-  do_restorecon $ICE_DIR
-  #log_end_msg 0
-  echo "done."
-}
-
-case "$1" in
-  start)
-    set_up_socket_dir
-    set_up_ice_dir
-  ;;
-
-  restart|reload|force-reload)
-    /etc/init.d/x11-common start
-  ;;
-
-  stop)
-   :
-  ;;
-
-  *)
-    #log_success_msg "Usage: /etc/init.d/x11-common {start|stop|restart|reload|force-reload}"
-    echo "Usage: /etc/init.d/x11-common {start|stop|restart|reload|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=80:

Deleted: branches/modular/debian/x11-common/debian/x11-common.install
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.install	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.install	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1,17 +0,0 @@
-etc/X11/Xresources/x11-common
-etc/X11/Xsession
-etc/X11/Xsession.d/20x11-common_process-args
-etc/X11/Xsession.d/30x11-common_xresources
-etc/X11/Xsession.d/50x11-common_determine-startup
-etc/X11/Xsession.d/90x11-common_ssh-agent
-etc/X11/Xsession.d/99x11-common_start
-etc/X11/Xsession.options
-etc/X11/rgb.txt
-usr/X11R6/man/man7/X.7x
-usr/X11R6/man/man7/X.Org.7x
-usr/X11R6/man/man7/XConsortium.7x
-usr/X11R6/man/man7/XProjectTeam.7x
-usr/X11R6/man/man7/XStandards.7x
-usr/X11R6/man/man7/Xsecurity.7x
-usr/share/man/man5/Xsession.5
-usr/share/man/man5/Xsession.options.5

Deleted: branches/modular/debian/x11-common/debian/x11-common.links
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.links	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.links	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1,4 +0,0 @@
-etc/X11/rgb.txt usr/X11R6/lib/X11/rgb.txt
-usr/X11R6/bin usr/bin/X11
-usr/X11R6/include/X11 usr/include/X11
-usr/X11R6/lib/X11 usr/lib/X11

Deleted: branches/modular/debian/x11-common/debian/x11-common.postinst.in
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.postinst.in	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.postinst.in	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1,51 +0,0 @@
-#!/bin/sh
-# Debian x11-common package post-installation script
-# Copyright 1998-2001, 2003 Branden Robinson.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id: x11-common.postinst.in 631 2005-09-28 01:56:15Z dnusinow $
-
-set -e
-
-THIS_PACKAGE=x11-common
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-check_symlinks_and_bomb /usr/bin/X11 \
-                        /usr/include/X11 \
-                        /usr/lib/X11
-
-# ensure that /etc/X11/Xresources is now a directory (see preinst)
-if [ ! -d /etc/X11/Xresources ]; then
-  die "/etc/X11/Xresources is not a directory; either the package didn't ship" \
-      "the directory (a bug in the package), or dpkg failed to unpack it to" \
-      "the filesystem (a bug in dpkg)"
-fi
-
-remove_conffile_commit /etc/X11/Xsession.d/40xfree86-common_xmodmap
-
-remove_conffile_commit /etc/X11/Xresources/xfree86-common 
-remove_conffile_commit /etc/X11/Xsession 
-remove_conffile_commit /etc/X11/Xsession.d/20xfree86-common_process-args 
-remove_conffile_commit /etc/X11/Xsession.d/30xfree86-common_xresources 
-remove_conffile_commit /etc/X11/Xsession.d/50xfree86-common_determine-startup 
-remove_conffile_commit /etc/X11/Xsession.d/90xfree86-common_ssh-agent 
-remove_conffile_commit /etc/X11/Xsession.d/99xfree86-common_start 
-remove_conffile_commit /etc/X11/Xsession.options 
-remove_conffile_commit /etc/X11/rgb.txt 
-remove_conffile_commit /etc/init.d/xfree86-common 
-
-if [ -e /etc/init.d/x11-common ]; then
-  update-rc.d x11-common start 70 S .
-fi
-
-#DEBHELPER#
-
-invoke-rc.d x11-common start || true
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=80:

Deleted: branches/modular/debian/x11-common/debian/x11-common.postrm.in
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.postrm.in	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.postrm.in	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1,32 +0,0 @@
-#!/bin/sh
-# Debian x11-common package post-removal script
-# Copyright 1998-2001, 2003 Branden Robinson.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id: x11-common.postrm.in 405 2005-07-24 04:46:38Z dnusinow $
-
-set -e
-
-THIS_PACKAGE=x11-common
-THIS_SCRIPT=postrm
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
-  remove_conffile_rollback /etc/X11/Xsession.d/40xfree86-common_xmodmap
-fi
-
-#DEBHELPER#
-
-if [ "$1" = "purge" ]; then
-  update-rc.d x11-common remove
-  for DIR in /etc/X11/Xresources /etc/X11/Xsession.d /etc/X11; do
-    rmdir "$DIR" 2> /dev/null || true
-  done
-fi
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=80:

Deleted: branches/modular/debian/x11-common/debian/x11-common.preinst.in
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.preinst.in	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.preinst.in	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1,82 +0,0 @@
-#!/bin/sh
-# Debian x11-common package pre-installation script
-# Copyright 1998-2001, 2003 Branden Robinson.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id: x11-common.preinst.in 742 2005-10-23 21:38:06Z dnusinow $
-
-set -e
-
-THIS_PACKAGE=x11-common
-THIS_SCRIPT=preinst
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
-  # In xbase 3.3.2.3a-2 (October 1998), /etc/X11/Xresources became a directory.
-  # Prior to that, it was a conffile.  Because it may have been customized by
-  # the administrator and we must avoid clobbering it, refuse to install if
-  # /etc/X11/Xresources exists and is not a directory when this package is
-  # installed.
-  if [ -e /etc/X11/Xresources ] && [ ! -d /etc/X11/Xresources ]; then
-    ERRMSG="/etc/X11/Xresources exists and is not a directory;"
-    ERRMSG="$ERRMSG the x11-common package cannot be installed until this"
-    if [ -f /etc/X11/Xresources ]; then
-      ERRMSG="$ERRMSG file"
-    else
-      ERRMSG="$ERRMSG thing"
-    fi
-    ERRMSG="$ERRMSG is removed"
-    die "$ERRMSG"
-  fi
-
-  if dpkg --compare-versions "$2" lt "3.3.6-5"; then
-    observe "removing obsolete /etc/X11/window-managers file"
-    rm -f /etc/X11/window-managers
-  fi
-
-  if dpkg --compare-versions "$2" lt "4.1.0-7"; then
-    remove_conffile_prepare /etc/X11/Xsession.d/40xfree86-common_xmodmap \
-      b370a42803aec72f27da67ca6a225402
-  fi
-
-  # Pre-X.Org packages were named xfree86-common. dpkg doesn't understand that 
-  # the conffiles are being transferred, so we'll check to see if they haven't
-  # been modified from the stable sarge version. If they have been modified, we 
-  # don't do anything, but if they are untouched then we remove them to let the 
-  # upgrade continue without errors
-  if [ "$2" = "" ]; then
-    remove_conffile_prepare /etc/X11/Xresources/xfree86-common \
-       a0f3911120c49038cb87607e3c545b90
-    remove_conffile_prepare /etc/X11/Xsession \
-       196e175a2cd90326da746f5287fd7a2e
-    remove_conffile_prepare /etc/X11/Xsession.d/20xfree86-common_process-args \
-       234df7ef4e57d97a446c6b81d5dc6ddd
-    remove_conffile_prepare /etc/X11/Xsession.d/30xfree86-common_xresources \
-       e148b414b3f7433ffd9314b86aff3350
-    remove_conffile_prepare /etc/X11/Xsession.d/50xfree86-common_determine-startup \
-       b93298febffc253a5d90431677cc7c75
-    remove_conffile_prepare /etc/X11/Xsession.d/90xfree86-common_ssh-agent \
-       0c2826f6163c7219ebbf91abfa251a20
-    remove_conffile_prepare /etc/X11/Xsession.d/99xfree86-common_start \
-       84ffa95821ba703d6bc203afbfd4bcac
-    remove_conffile_prepare /etc/X11/Xsession.options \
-       e675efbb486930e08bc779cbeb53a44e
-    remove_conffile_prepare /etc/X11/rgb.txt \
-       4896b3e3380a6a2af1920709bc31b140
-    remove_conffile_prepare /etc/init.d/xfree86-common \
-       034165e48abb370e9c3e276850755219
-  fi
-
-  check_symlinks_and_warn /usr/bin/X11 \
-                          /usr/include/X11 \
-                          /usr/lib/X11
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:

Deleted: branches/modular/debian/x11-common/debian/x11-common.templates
===================================================================
--- branches/modular/debian/x11-common/debian/x11-common.templates	2006-01-22 19:50:19 UTC (rev 1104)
+++ branches/modular/debian/x11-common/debian/x11-common.templates	2006-01-23 01:31:33 UTC (rev 1105)
@@ -1,24 +0,0 @@
-Template: x11-common/experimental_packages
-Type: note
-_Description: experimental version of X.Org packages
- You are using an experimental version of X.Org packages for Debian.  Please
- do not file bugs with the Debian Bug Tracking System against this version of
- the packages, since they have not been released to the Debian distribution
- yet.
- .
- If you experience problems with these packages or would like to submit
- patches, please send mail to the Debian X mailing list.  You can read more
- about this mailing list on the World Wide Web:
-   http://lists.debian.org/debian-x/
- .
- If you do not want to be running experimental X packages, you need to do two
- things:
-   1) Ensure that you do not have experimental package repositiories in
-      your /etc/apt/sources.list file;
-   2) Instruct apt to downgrade X.Org to an appropriate released version;
-      you can do this by appending a package suite name to the package name
-      with "apt-get" -- for example:
-        apt-get install x11-common/unstable
-     or
-        apt-get install x11-common/stable
-     You may need to specify downgrades for several packages.



Reply to: