X Strike Force X.Org X11 SVN commit: r191 - in trunk/debian: . local local/Xresources local/Xsession.d patches scripts
Author: dnusinow
Date: 2005-06-11 09:07:52 -0500 (Sat, 11 Jun 2005)
New Revision: 191
Added:
trunk/debian/local/Xresources/x-common
trunk/debian/local/Xsession.d/20x-common_process-args
trunk/debian/local/Xsession.d/30x-common_xresources
trunk/debian/local/Xsession.d/50x-common_determine-startup
trunk/debian/local/Xsession.d/90x-common_ssh-agent
trunk/debian/local/Xsession.d/99x-common_start
trunk/debian/x-common.README.Debian
trunk/debian/x-common.config.in
trunk/debian/x-common.dirs
trunk/debian/x-common.doc-base.debian-faq
trunk/debian/x-common.docs
trunk/debian/x-common.docs.s390
trunk/debian/x-common.examples
trunk/debian/x-common.init
trunk/debian/x-common.install
trunk/debian/x-common.links
trunk/debian/x-common.postinst.in
trunk/debian/x-common.postrm.in
trunk/debian/x-common.preinst.in
trunk/debian/x-common.templates
Removed:
trunk/debian/local/Xresources/xorg-common
trunk/debian/local/Xsession.d/20xorg-common_process-args
trunk/debian/local/Xsession.d/30xorg-common_xresources
trunk/debian/local/Xsession.d/50xorg-common_determine-startup
trunk/debian/local/Xsession.d/90xorg-common_ssh-agent
trunk/debian/local/Xsession.d/99xorg-common_start
trunk/debian/xorg-common.README.Debian
trunk/debian/xorg-common.config.in
trunk/debian/xorg-common.dirs
trunk/debian/xorg-common.doc-base.debian-faq
trunk/debian/xorg-common.docs
trunk/debian/xorg-common.docs.s390
trunk/debian/xorg-common.examples
trunk/debian/xorg-common.init
trunk/debian/xorg-common.install
trunk/debian/xorg-common.links
trunk/debian/xorg-common.postinst.in
trunk/debian/xorg-common.postrm.in
trunk/debian/xorg-common.preinst.in
trunk/debian/xorg-common.templates
Modified:
trunk/debian/MANIFEST.amd64.in
trunk/debian/MANIFEST.hppa.in
trunk/debian/MANIFEST.i386.in
trunk/debian/MANIFEST.ia64.in
trunk/debian/MANIFEST.powerpc.in
trunk/debian/MANIFEST.sparc.in
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/control
trunk/debian/local/xsession
trunk/debian/patches/910_debian_Xserver_RTFF.diff
trunk/debian/rules
trunk/debian/scripts/mir-false-positives
trunk/debian/xfree86-common.preinst.in
Log:
Change xorg-common package to x-common package. This includes:
- Renaming all xorg-common package files to x-common
- MANIFEST* updates
- Updates to the local directory
- Various updates to references to documentation contained in this package
- Template update for the package
- NOTE: This breaks the translations!
- Update to 910_debian_Xserver_RTFF.diff patch
- Update to debian/rules
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/MANIFEST.amd64.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,12 +1,12 @@
etc/X11/Xresources/xbase-clients
-etc/X11/Xresources/xorg-common
+etc/X11/Xresources/x-common
etc/X11/Xsession
-etc/X11/Xsession.d/20xorg-common_process-args
-etc/X11/Xsession.d/30xorg-common_xresources
-etc/X11/Xsession.d/50xorg-common_determine-startup
-etc/X11/Xsession.d/90xorg-common_ssh-agent
+etc/X11/Xsession.d/20x-common_process-args
+etc/X11/Xsession.d/30x-common_xresources
+etc/X11/Xsession.d/50x-common_determine-startup
+etc/X11/Xsession.d/90x-common_ssh-agent
etc/X11/Xsession.d/92xprint-xpserverlist.sh
-etc/X11/Xsession.d/99xorg-common_start
+etc/X11/Xsession.d/99x-common_start
etc/X11/Xsession.options
etc/X11/app-defaults/Beforelight
etc/X11/app-defaults/Bitmap
Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/MANIFEST.hppa.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,12 +1,12 @@
etc/X11/Xresources/xbase-clients
-etc/X11/Xresources/xorg-common
+etc/X11/Xresources/x-common
etc/X11/Xsession
-etc/X11/Xsession.d/20xorg-common_process-args
-etc/X11/Xsession.d/30xorg-common_xresources
-etc/X11/Xsession.d/50xorg-common_determine-startup
-etc/X11/Xsession.d/90xorg-common_ssh-agent
+etc/X11/Xsession.d/20x-common_process-args
+etc/X11/Xsession.d/30x-common_xresources
+etc/X11/Xsession.d/50x-common_determine-startup
+etc/X11/Xsession.d/90x-common_ssh-agent
etc/X11/Xsession.d/92xprint-xpserverlist.sh
-etc/X11/Xsession.d/99xorg-common_start
+etc/X11/Xsession.d/99x-common_start
etc/X11/Xsession.options
etc/X11/app-defaults/Beforelight
etc/X11/app-defaults/Bitmap
Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/MANIFEST.i386.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,12 +1,12 @@
etc/X11/Xresources/xbase-clients
-etc/X11/Xresources/xorg-common
+etc/X11/Xresources/x-common
etc/X11/Xsession
-etc/X11/Xsession.d/20xorg-common_process-args
-etc/X11/Xsession.d/30xorg-common_xresources
-etc/X11/Xsession.d/50xorg-common_determine-startup
-etc/X11/Xsession.d/90xorg-common_ssh-agent
+etc/X11/Xsession.d/20x-common_process-args
+etc/X11/Xsession.d/30x-common_xresources
+etc/X11/Xsession.d/50x-common_determine-startup
+etc/X11/Xsession.d/90x-common_ssh-agent
etc/X11/Xsession.d/92xprint-xpserverlist.sh
-etc/X11/Xsession.d/99xorg-common_start
+etc/X11/Xsession.d/99x-common_start
etc/X11/Xsession.options
etc/X11/app-defaults/Beforelight
etc/X11/app-defaults/Bitmap
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/MANIFEST.ia64.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,12 +1,12 @@
etc/X11/Xresources/xbase-clients
-etc/X11/Xresources/xorg-common
+etc/X11/Xresources/x-common
etc/X11/Xsession
-etc/X11/Xsession.d/20xorg-common_process-args
-etc/X11/Xsession.d/30xorg-common_xresources
-etc/X11/Xsession.d/50xorg-common_determine-startup
-etc/X11/Xsession.d/90xorg-common_ssh-agent
+etc/X11/Xsession.d/20x-common_process-args
+etc/X11/Xsession.d/30x-common_xresources
+etc/X11/Xsession.d/50x-common_determine-startup
+etc/X11/Xsession.d/90x-common_ssh-agent
etc/X11/Xsession.d/92xprint-xpserverlist.sh
-etc/X11/Xsession.d/99xorg-common_start
+etc/X11/Xsession.d/99x-common_start
etc/X11/Xsession.options
etc/X11/app-defaults/Beforelight
etc/X11/app-defaults/Bitmap
Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/MANIFEST.powerpc.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,12 +1,12 @@
etc/X11/Xresources/xbase-clients
-etc/X11/Xresources/xorg-common
+etc/X11/Xresources/x-common
etc/X11/Xsession
-etc/X11/Xsession.d/20xorg-common_process-args
-etc/X11/Xsession.d/30xorg-common_xresources
-etc/X11/Xsession.d/50xorg-common_determine-startup
-etc/X11/Xsession.d/90xorg-common_ssh-agent
+etc/X11/Xsession.d/20x-common_process-args
+etc/X11/Xsession.d/30x-common_xresources
+etc/X11/Xsession.d/50x-common_determine-startup
+etc/X11/Xsession.d/90x-common_ssh-agent
etc/X11/Xsession.d/92xprint-xpserverlist.sh
-etc/X11/Xsession.d/99xorg-common_start
+etc/X11/Xsession.d/99x-common_start
etc/X11/Xsession.options
etc/X11/app-defaults/Beforelight
etc/X11/app-defaults/Bitmap
Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/MANIFEST.sparc.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,12 +1,12 @@
etc/X11/Xresources/xbase-clients
-etc/X11/Xresources/xorg-common
+etc/X11/Xresources/x-common
etc/X11/Xsession
-etc/X11/Xsession.d/20xorg-common_process-args
-etc/X11/Xsession.d/30xorg-common_xresources
-etc/X11/Xsession.d/50xorg-common_determine-startup
-etc/X11/Xsession.d/90xorg-common_ssh-agent
+etc/X11/Xsession.d/20x-common_process-args
+etc/X11/Xsession.d/30x-common_xresources
+etc/X11/Xsession.d/50x-common_determine-startup
+etc/X11/Xsession.d/90x-common_ssh-agent
etc/X11/Xsession.d/92xprint-xpserverlist.sh
-etc/X11/Xsession.d/99xorg-common_start
+etc/X11/Xsession.d/99x-common_start
etc/X11/Xsession.options
etc/X11/app-defaults/Beforelight
etc/X11/app-defaults/Bitmap
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/TODO 2005-06-11 14:07:52 UTC (rev 191)
@@ -9,12 +9,6 @@
-------------------------------------
* Document non-freeness of rman (PolyglotMan) in debian/copyright.
-* Rename {xfree86,xorg}-common to x11-common -- the purpose of the package is to
- provide the prerequisites for any X11 installation on a Debian system.
- (For now, that includes the /usr/*/X11 symlinks, but the package will still be
- useful -- if not the source of as many reverse dependencies -- even if the X11
- installation moves to /usr.) [David]
-
* Trash patch #999 (disable x11perf), revert changes to MANIFESTs and
xbase-clients's .install files (revert r175), and increment versioned
build-dependency on render-dev/libxrender-dev so that we demand Render/Xrender
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/changelog 2005-06-11 14:07:52 UTC (rev 191)
@@ -83,6 +83,8 @@
* Update FAQ to refer to X.Org instead of freedesktop.org where appropriate.
(Closes: #309811)
+ * Change xorg-common to x-common
+
Changes by Branden Robinson:
* Initial release, based upon upstream CVS tag XORG-6_8_2. See
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/control 2005-06-11 14:07:52 UTC (rev 191)
@@ -533,7 +533,7 @@
Package: libx11-6
Section: libs
Architecture: any
-Depends: xorg-common (>> 4.3.0), xlibs-data, ${shlibs:Depends}, ${misc:Depends}
+Depends: x-common (>> 4.3.0), xlibs-data, ${shlibs:Depends}, ${misc:Depends}
Conflicts: xlibs (<< 4.3.0)
Replaces: xlibs (<< 4.3.0)
Description: X Window System protocol client library
@@ -2149,7 +2149,7 @@
This package requires the xutils package to prepare the font directories
for use by an X server or X font server.
-Package: xorg-common
+Package: x-common
Architecture: all
Depends: debconf (>= 1.2.9), debianutils (>= 1.13), lsb-base (>= 1.3-9ubuntu2)
Suggests: x-window-system-core | x-window-system
@@ -2157,7 +2157,7 @@
Replaces: xbase (<< 3.3.2.3a-9), xlib6g-dev (<< 4.0), xmanpages (<< 3.3.4), xstd, xserver-common (<< 4.0), xfree86-common (<< 6.8.0)
Provides: xfree86-common
Description: X Window System (X.Org) infrastructure
- xorg-common contains the filesystem infrastructure required for further
+ x-common contains the filesystem infrastructure required for further
installation of the X Window System in any configuration.
.
Those wishing an X server only (with remote font services and clients) will
@@ -2185,7 +2185,7 @@
the standard implementation by vendors and distributors.
.
Still confused? Install this package and then read the files in
- /usr/share/doc/xorg-common/ for assistance.
+ /usr/share/doc/x-common/ for assistance.
Package: xfs
Architecture: any
@@ -2507,7 +2507,7 @@
Package: xserver-common
Architecture: any
-Depends: debconf (>= 1.0.21), xorg-common (>= 6.8.1), ${shlibs:Depends}, ${misc:Depends}
+Depends: debconf (>= 1.0.21), x-common (>= 6.8.1), ${shlibs:Depends}, ${misc:Depends}
Suggests: xserver-xorg | xserver, xfonts-base, xfonts-100dpi | xfonts-75dpi, xfonts-scalable, configlet-frontends
Conflicts: xbase (<< 3.3.2.3a-2), xsun-utils, xbase-clients (<< 3.3.6-1), suidmanager (<< 0.50), configlet (<= 0.9.22), xserver-3dlabs (<< 3.3.6-35), xserver-8514 (<< 3.3.6-35), xserver-agx (<< 3.3.6-35), xserver-common-v3 (<< 3.3.6-35), xserver-fbdev (<< 3.3.6-35), xserver-i128 (<< 3.3.6-35), xserver-mach32 (<< 3.3.6-35), xserver-mach64 (<< 3.3.6-35), xserver-mach8 (<< 3.3.6-35), xserver-mono (<< 3.3.6-35), xserver-p9000 (<< 3.3.6-35), xserver-s3 (<< 3.3.6-35), xserver-s3v (<< 3.3.6-35), xserver-svga (<< 3.3.6-35), xserver-tga (<< 3.3.6-35), xserver-vga16 (<< 3.3.6-35), xserver-w32 (<< 3.3.6-35), xserver-xsun (<< 3.3.6-35), xserver-xsun-mono (<< 3.3.6-35), xserver-xsun24 (<< 3.3.6-35), xserver-rage128, xserver-sis
Replaces: xbase (<< 3.3.2.3a-2), xserver-vga16 (<< 3.3.2.3a-2), xserver-agx (<< 3.3.2.3a-9), xserver-mach32 (<< 3.3.2.3a-9), xserver-mach64 (<< 3.3.2.3a-9), xserver-p9000 (<< 3.3.2.3a-9), xserver-s3 (<< 3.3.2.3a-9), xserver-s3v (<< 3.3.2.3a-9), xserver-tga (<< 3.3.2.3a-9), xserver-w32 (<< 3.3.2.3a-9), xsun-utils
@@ -2668,7 +2668,7 @@
Package: xutils
Architecture: any
-Depends: xorg-common (>= 6.8.1), cpp, ${shlibs:Depends}, ${misc:Depends}
+Depends: x-common (>= 6.8.1), cpp, ${shlibs:Depends}, ${misc:Depends}
Suggests: ssh | rsh-server, ssh | rsh-client, xlibs-data
Conflicts: rstart, rstartd, xbase-clients (<< 6.8.2-4), xserver-common (<< 4.0), xbase (<< 3.3.2.3a-2), cpp-3.3 (<< 1:3.3.3-0pre1)
Replaces: rstart, rstartd, xbase-clients (<< 6.8.2-4), xserver-common (<< 4.0), xfonts-base (<< 4.3.0.dfsg.1-6ubuntu1), xbase (<< 3.3.2.3a-2), xlibs-dev (<< 4.1.0-12), xlib6g-dev (<< 4.0), dpsclient, xcontrib
@@ -2794,9 +2794,9 @@
Package: xfree86-common
Architecture: all
-Depends: xorg-common
+Depends: x-common
Description: X Window System infrastructure transitional package
- This package smooths upgrades from Debian 3.1 by depending on xorg-common.
+ This package smooths upgrades from Debian 3.1 by depending on x-common.
This transitional package is only depended upon by packages that install
files into /usr/X11R6 but have not yet corrected their dependencies.
Copied: trunk/debian/local/Xresources/x-common (from rev 190, trunk/debian/local/Xresources/xorg-common)
Deleted: trunk/debian/local/Xresources/xorg-common
===================================================================
--- trunk/debian/local/Xresources/xorg-common 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/local/Xresources/xorg-common 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,10 +0,0 @@
-! $Id$
-
-! load color-specific resources for clients that have them
-#ifdef COLOR
-*customization: -color
-#endif
-
-! make Xaw (Athena widget set) clients understand the delete key
-! this causes problems with some non-Xaw apps, use with care
-! *Text.translations: #override ~Shift ~Meta <Key>Delete: delete-next-character()
Copied: trunk/debian/local/Xsession.d/20x-common_process-args (from rev 190, trunk/debian/local/Xsession.d/20xorg-common_process-args)
===================================================================
--- trunk/debian/local/Xsession.d/20xorg-common_process-args 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/local/Xsession.d/20x-common_process-args 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,58 @@
+# $Id$
+
+# This file is sourced by Xsession(5), not executed.
+
+# Determine how many arguments were provided.
+case $# in
+ 0)
+ # No arguments given; use default behavior.
+ ;;
+ 1)
+ # One argument given; see what it was.
+ case "$1" in
+ failsafe)
+ # Failsafe session was requested.
+ if grep -qs ^allow-failsafe "$OPTIONFILE"; then
+ if [ -e /usr/bin/x-terminal-emulator ]; then
+ if [ -x /usr/bin/x-terminal-emulator ]; then
+ exec x-terminal-emulator -geometry +1+1
+ else
+ # fatal error
+ errormsg "unable to launch failsafe X session ---" \
+ "x-terminal-emulator not executable; aborting."
+ fi
+ else
+ # fatal error
+ errormsg "unable to launch failsafe X session ---" \
+ "x-terminal-emulator not found; aborting."
+ fi
+ fi
+ ;;
+ default)
+ # Default behavior was requested.
+ ;;
+ *)
+ # Specific program was requested.
+ STARTUP_FULL_PATH=$(which $1 || true)
+ if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then
+ if [ -x "$STARTUP_FULL_PATH" ]; then
+ STARTUP="$1"
+ else
+ message "unable to launch \"$1\" X session ---" \
+ "\"$1\" not executable; falling back to default session."
+ fi
+ else
+ message "unable to launch \"$1\" X session ---" \
+ "\"$1\" not found; falling back to default session."
+ fi
+ ;;
+ esac
+ ;;
+ *)
+ # More than one argument given; we don't know what to do.
+ message "unsupported number of arguments ($#); falling back to default" \
+ "session."
+ ;;
+esac
+
+# vim:set ai et sts=2 sw=2 tw=80:
Deleted: trunk/debian/local/Xsession.d/20xorg-common_process-args
===================================================================
--- trunk/debian/local/Xsession.d/20xorg-common_process-args 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/local/Xsession.d/20xorg-common_process-args 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,58 +0,0 @@
-# $Id: 20xfree86-common_process-args 1427 2004-05-21 06:34:57Z branden $
-
-# This file is sourced by Xsession(5), not executed.
-
-# Determine how many arguments were provided.
-case $# in
- 0)
- # No arguments given; use default behavior.
- ;;
- 1)
- # One argument given; see what it was.
- case "$1" in
- failsafe)
- # Failsafe session was requested.
- if grep -qs ^allow-failsafe "$OPTIONFILE"; then
- if [ -e /usr/bin/x-terminal-emulator ]; then
- if [ -x /usr/bin/x-terminal-emulator ]; then
- exec x-terminal-emulator -geometry +1+1
- else
- # fatal error
- errormsg "unable to launch failsafe X session ---" \
- "x-terminal-emulator not executable; aborting."
- fi
- else
- # fatal error
- errormsg "unable to launch failsafe X session ---" \
- "x-terminal-emulator not found; aborting."
- fi
- fi
- ;;
- default)
- # Default behavior was requested.
- ;;
- *)
- # Specific program was requested.
- STARTUP_FULL_PATH=$(which $1 || true)
- if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then
- if [ -x "$STARTUP_FULL_PATH" ]; then
- STARTUP="$1"
- else
- message "unable to launch \"$1\" X session ---" \
- "\"$1\" not executable; falling back to default session."
- fi
- else
- message "unable to launch \"$1\" X session ---" \
- "\"$1\" not found; falling back to default session."
- fi
- ;;
- esac
- ;;
- *)
- # More than one argument given; we don't know what to do.
- message "unsupported number of arguments ($#); falling back to default" \
- "session."
- ;;
-esac
-
-# vim:set ai et sts=2 sw=2 tw=80:
Copied: trunk/debian/local/Xsession.d/30x-common_xresources (from rev 190, trunk/debian/local/Xsession.d/30xorg-common_xresources)
===================================================================
--- trunk/debian/local/Xsession.d/30xorg-common_xresources 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/local/Xsession.d/30x-common_xresources 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,28 @@
+# $Id$
+
+# This file is sourced by Xsession(5), not executed.
+
+# If xrdb (from xbase-clients) is installed, merge system-wide X resources.
+# Then merge the user's X resources, if the options file is so configured.
+if which xrdb >/dev/null 2>&1; then
+ if [ -d "$SYSRESOURCES" ]; then
+ RESOURCEFILES=$(run-parts --list $SYSRESOURCES)
+ if [ -n "$RESOURCEFILES" ]; then
+ for RESOURCEFILE in $RESOURCEFILES; do
+ xrdb -merge $RESOURCEFILE
+ done
+ fi
+ fi
+
+ if grep -qs ^allow-user-resources "$OPTIONFILE"; then
+ if [ -f "$USRRESOURCES" ]; then
+ xrdb -merge $USRRESOURCES
+ fi
+ fi
+else
+ # Comment out this command if you desire a legacy-free X environment, and find
+ # the warning spurious.
+ message "warning: xrdb command not found; X resources not merged."
+fi
+
+# vim:set ai et sts=2 sw=2 tw=80:
Deleted: trunk/debian/local/Xsession.d/30xorg-common_xresources
===================================================================
--- trunk/debian/local/Xsession.d/30xorg-common_xresources 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/local/Xsession.d/30xorg-common_xresources 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,28 +0,0 @@
-# $Id: 30xfree86-common_xresources 2083 2004-12-19 01:53:31Z branden $
-
-# This file is sourced by Xsession(5), not executed.
-
-# If xrdb (from xbase-clients) is installed, merge system-wide X resources.
-# Then merge the user's X resources, if the options file is so configured.
-if which xrdb >/dev/null 2>&1; then
- if [ -d "$SYSRESOURCES" ]; then
- RESOURCEFILES=$(run-parts --list $SYSRESOURCES)
- if [ -n "$RESOURCEFILES" ]; then
- for RESOURCEFILE in $RESOURCEFILES; do
- xrdb -merge $RESOURCEFILE
- done
- fi
- fi
-
- if grep -qs ^allow-user-resources "$OPTIONFILE"; then
- if [ -f "$USRRESOURCES" ]; then
- xrdb -merge $USRRESOURCES
- fi
- fi
-else
- # Comment out this command if you desire a legacy-free X environment, and find
- # the warning spurious.
- message "warning: xrdb command not found; X resources not merged."
-fi
-
-# vim:set ai et sts=2 sw=2 tw=80:
Copied: trunk/debian/local/Xsession.d/50x-common_determine-startup (from rev 190, trunk/debian/local/Xsession.d/50xorg-common_determine-startup)
===================================================================
--- trunk/debian/local/Xsession.d/50xorg-common_determine-startup 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/local/Xsession.d/50x-common_determine-startup 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,46 @@
+# $Id$
+
+# This file is sourced by Xsession(5), not executed.
+
+# If no X session startup program was passed to the Xsession script as an
+# argument (e.g., by the display manager), or if that program was not
+# executable, fall back to looking for a user's custom X session script, if
+# allowed by the options file.
+if [ -z "$STARTUP" ]; then
+ if grep -qs ^allow-user-xsession "$OPTIONFILE"; then
+ for STARTUPFILE in "$USERXSESSION" "$ALTUSERXSESSION"; do
+ if [ -e "$STARTUPFILE" ]; then
+ if [ -x "$STARTUPFILE" ]; then
+ STARTUP="$STARTUPFILE"
+ else
+ STARTUP="sh $STARTUPFILE"
+ fi
+ break
+ fi
+ done
+ fi
+fi
+
+# If there is still nothing to use for a startup program, try the system
+# default session manager, window manager, and terminal emulator.
+if [ -z "$STARTUP" ]; then
+ if [ -x /usr/bin/x-session-manager ]; then
+ STARTUP=x-session-manager
+ elif [ -x /usr/bin/x-window-manager ]; then
+ STARTUP=x-window-manager
+ elif [ -x /usr/bin/x-terminal-emulator ]; then
+ STARTUP=x-terminal-emulator
+ fi
+fi
+
+# If we still have not found a startup program, give up.
+if [ -z "$STARTUP" ]; then
+ ERRMSG="unable to start X session ---"
+ if grep -qs ^allow-user-xsession "$OPTIONFILE"; then
+ ERRMSG="$ERRMSG no \"$USERXSESSION\" file, no \"$ALTUSERXSESSION\" file,"
+ fi
+ errormsg "$ERRMSG no session managers, no window managers, and no terminal" \
+ "emulators found; aborting."
+fi
+
+# vim:set ai et sts=2 sw=2 tw=80:
Deleted: trunk/debian/local/Xsession.d/50xorg-common_determine-startup
===================================================================
--- trunk/debian/local/Xsession.d/50xorg-common_determine-startup 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/local/Xsession.d/50xorg-common_determine-startup 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,46 +0,0 @@
-# $Id: 50xfree86-common_determine-startup 1327 2004-04-28 15:46:17Z branden $
-
-# This file is sourced by Xsession(5), not executed.
-
-# If no X session startup program was passed to the Xsession script as an
-# argument (e.g., by the display manager), or if that program was not
-# executable, fall back to looking for a user's custom X session script, if
-# allowed by the options file.
-if [ -z "$STARTUP" ]; then
- if grep -qs ^allow-user-xsession "$OPTIONFILE"; then
- for STARTUPFILE in "$USERXSESSION" "$ALTUSERXSESSION"; do
- if [ -e "$STARTUPFILE" ]; then
- if [ -x "$STARTUPFILE" ]; then
- STARTUP="$STARTUPFILE"
- else
- STARTUP="sh $STARTUPFILE"
- fi
- break
- fi
- done
- fi
-fi
-
-# If there is still nothing to use for a startup program, try the system
-# default session manager, window manager, and terminal emulator.
-if [ -z "$STARTUP" ]; then
- if [ -x /usr/bin/x-session-manager ]; then
- STARTUP=x-session-manager
- elif [ -x /usr/bin/x-window-manager ]; then
- STARTUP=x-window-manager
- elif [ -x /usr/bin/x-terminal-emulator ]; then
- STARTUP=x-terminal-emulator
- fi
-fi
-
-# If we still have not found a startup program, give up.
-if [ -z "$STARTUP" ]; then
- ERRMSG="unable to start X session ---"
- if grep -qs ^allow-user-xsession "$OPTIONFILE"; then
- ERRMSG="$ERRMSG no \"$USERXSESSION\" file, no \"$ALTUSERXSESSION\" file,"
- fi
- errormsg "$ERRMSG no session managers, no window managers, and no terminal" \
- "emulators found; aborting."
-fi
-
-# vim:set ai et sts=2 sw=2 tw=80:
Copied: trunk/debian/local/Xsession.d/90x-common_ssh-agent (from rev 190, trunk/debian/local/Xsession.d/90xorg-common_ssh-agent)
===================================================================
--- trunk/debian/local/Xsession.d/90xorg-common_ssh-agent 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/local/Xsession.d/90x-common_ssh-agent 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,24 @@
+# $Id$
+
+# This file is sourced by Xsession(5), not executed.
+
+STARTSSH=
+SSHAGENT=/usr/bin/ssh-agent
+SSHAGENTARGS=
+
+if grep -qs ^use-ssh-agent "$OPTIONFILE"; then
+ if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \
+ && [ -z "$SSH2_AUTH_SOCK" ]; then
+ STARTSSH=yes
+ if [ -f /usr/bin/ssh-add1 ] && cmp -s $SSHAGENT /usr/bin/ssh-agent2; then
+ # use ssh-agent2's ssh-agent1 compatibility mode
+ SSHAGENTARGS=-1
+ fi
+ fi
+fi
+
+if [ -n "$STARTSSH" ]; then
+ STARTUP="$SSHAGENT $SSHAGENTARGS $STARTUP"
+fi
+
+# vim:set ai et sts=2 sw=2 tw=80:
Deleted: trunk/debian/local/Xsession.d/90xorg-common_ssh-agent
===================================================================
--- trunk/debian/local/Xsession.d/90xorg-common_ssh-agent 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/local/Xsession.d/90xorg-common_ssh-agent 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,24 +0,0 @@
-# $Id: 90xfree86-common_ssh-agent 1329 2004-04-28 16:16:44Z branden $
-
-# This file is sourced by Xsession(5), not executed.
-
-STARTSSH=
-SSHAGENT=/usr/bin/ssh-agent
-SSHAGENTARGS=
-
-if grep -qs ^use-ssh-agent "$OPTIONFILE"; then
- if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \
- && [ -z "$SSH2_AUTH_SOCK" ]; then
- STARTSSH=yes
- if [ -f /usr/bin/ssh-add1 ] && cmp -s $SSHAGENT /usr/bin/ssh-agent2; then
- # use ssh-agent2's ssh-agent1 compatibility mode
- SSHAGENTARGS=-1
- fi
- fi
-fi
-
-if [ -n "$STARTSSH" ]; then
- STARTUP="$SSHAGENT $SSHAGENTARGS $STARTUP"
-fi
-
-# vim:set ai et sts=2 sw=2 tw=80:
Copied: trunk/debian/local/Xsession.d/99x-common_start (from rev 190, trunk/debian/local/Xsession.d/99xorg-common_start)
===================================================================
--- trunk/debian/local/Xsession.d/99xorg-common_start 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/local/Xsession.d/99x-common_start 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,7 @@
+# $Id$
+
+# This file is sourced by Xsession(5), not executed.
+
+exec $STARTUP
+
+# vim:set ai et sts=2 sw=2 tw=80:
Deleted: trunk/debian/local/Xsession.d/99xorg-common_start
===================================================================
--- trunk/debian/local/Xsession.d/99xorg-common_start 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/local/Xsession.d/99xorg-common_start 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,7 +0,0 @@
-# $Id: 99xfree86-common_start 1327 2004-04-28 15:46:17Z branden $
-
-# This file is sourced by Xsession(5), not executed.
-
-exec $STARTUP
-
-# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/local/xsession
===================================================================
--- trunk/debian/local/xsession 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/local/xsession 2005-06-11 14:07:52 UTC (rev 191)
@@ -5,7 +5,7 @@
# Sample .xsession file, by Branden Robinson
# This file is in the public domain.
# To use this file:
-# cp -i /usr/share/doc/xorg-common/examples/xsession $HOME/.xsession
+# cp -i /usr/share/doc/x-common/examples/xsession $HOME/.xsession
# Users are strongly encouraged to edit this file to their tastes.
Modified: trunk/debian/patches/910_debian_Xserver_RTFF.diff
===================================================================
--- trunk/debian/patches/910_debian_Xserver_RTFF.diff 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/patches/910_debian_Xserver_RTFF.diff 2005-06-11 14:07:52 UTC (rev 191)
@@ -41,7 +41,7 @@
+"Other useful commands to run include:\n"
+"$ dpkg --status xserver-common\n"
+"$ dpkg --status xfonts-base\n"
-+"$ zmore /usr/share/doc/xorg-common/FAQ.gz", defaultTextFont);
++"$ zmore /usr/share/doc/x-common/FAQ.gz", defaultTextFont);
+#else
FatalError("could not open default font '%s'", defaultTextFont);
+#endif
@@ -60,7 +60,7 @@
+"Useful commands to run include:\n"
+"$ dpkg --status xserver-common\n"
+"$ dpkg --status xfonts-base\n"
-+"$ zmore /usr/share/doc/xorg-common/FAQ.gz", defaultCursorFont);
++"$ zmore /usr/share/doc/x-common/FAQ.gz", defaultCursorFont);
+#else
FatalError("could not open default cursor font '%s'",
defaultCursorFont);
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/rules 2005-06-11 14:07:52 UTC (rev 191)
@@ -327,7 +327,7 @@
install -m 644 debian/local/Xsession.options.5 $(DEBTREEDIR)/usr/share/man/man5
install -m 644 $(DEBTREEDIR)/etc/X11/twm/system.twmrc $(DEBTREEDIR)/etc/X11/twm/system.twmrc-menu
install -m 755 -d $(DEBTREEDIR)/etc/X11/Xresources
- install -m 644 debian/local/Xresources/xorg-common $(DEBTREEDIR)/etc/X11/Xresources/xorg-common
+ install -m 644 debian/local/Xresources/x-common $(DEBTREEDIR)/etc/X11/Xresources/x-common
install -m 644 debian/local/Xresources/xbase-clients $(DEBTREEDIR)/etc/X11/Xresources/xbase-clients
install -m 755 -d $(DEBTREEDIR)/etc/X11/Xsession.d
install -m 644 debian/local/Xsession.d/* $(DEBTREEDIR)/etc/X11/Xsession.d
Modified: trunk/debian/scripts/mir-false-positives
===================================================================
--- trunk/debian/scripts/mir-false-positives 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/scripts/mir-false-positives 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,4 +1,4 @@
-# $Id: mir-false-positives 1706 2004-07-29 19:16:40Z branden $
+# $Id$
# This file is used by manifest-install-reconcile.
@@ -55,22 +55,22 @@
usr/share/doc/xbase-clients/example/Xmodmap alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
usr/share/doc/xbase-clients/example/xmodmap.std alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc
# We ship all available upstream changelogs per Debian Policy.
-usr/share/doc/xorg-common/CHANGELOG alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-usr/share/doc/xorg-common/CHANGELOG.ND alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-usr/share/doc/xorg-common/CHANGELOG.R5 alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/share/doc/x-common/CHANGELOG alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/share/doc/x-common/CHANGELOG.ND alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/share/doc/x-common/CHANGELOG.R5 alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
# We ship the Debian X FAQ.
-usr/share/doc/xorg-common/FAQ.gz alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-usr/share/doc/xorg-common/FAQ.xhtml alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/share/doc/x-common/FAQ.gz alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/share/doc/x-common/FAQ.xhtml alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
#
-usr/share/doc/xorg-common/README alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/share/doc/x-common/README alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
# This is a Debian-specific file.
-usr/share/doc/xorg-common/README.Debian-upgrade alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-usr/share/doc/xorg-common/README.dps alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-usr/share/doc/xorg-common/README.fonts alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-usr/share/doc/xorg-common/RELNOTES alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-usr/share/doc/xorg-common/Versions alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-usr/share/doc/xorg-common/changelog.Debian.old alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-usr/share/doc/xorg-common/example/xsession alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/share/doc/x-common/README.Debian-upgrade alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/share/doc/x-common/README.dps alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/share/doc/x-common/README.fonts alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/share/doc/x-common/RELNOTES alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/share/doc/x-common/Versions alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/share/doc/x-common/changelog.Debian.old alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/share/doc/x-common/example/xsession alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
usr/share/doc/xserver-xorg/DESIGN alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc
usr/share/doc/xserver-xorg/README.DECtga alpha
usr/share/doc/xserver-xorg/README.DGA alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc
Copied: trunk/debian/x-common.README.Debian (from rev 190, trunk/debian/xorg-common.README.Debian)
===================================================================
--- trunk/debian/xorg-common.README.Debian 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/x-common.README.Debian 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,90 @@
+Debian README for xfree86-common package
+========================================
+
+The xfree86-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/xfree86-common/FAQ.gz.
+You can view this file with your favorite pager program after decompressing
+it. For example:
+ $ zcat /usr/share/doc/xfree86-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/xfree86-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 XFree86 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 xfree86-common package is the foundation on which those two packages
+themselves depend.
+
+In addition to manual pages and documentation, the xfree86-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 xfree86-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
+xfree86-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$
+
+vim:set ai et sts=4 sw=4 tw=80:
Copied: trunk/debian/x-common.config.in (from rev 190, trunk/debian/xorg-common.config.in)
===================================================================
--- trunk/debian/xorg-common.config.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/x-common.config.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,31 @@
+#!/bin/sh
+# Debian xfree86-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$
+
+set -e
+
+# source debconf library
+. /usr/share/debconf/confmodule
+
+THIS_PACKAGE=x-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 x-common/experimental_packages \
+ x-common/nag
+ run db_input high x-common/nag
+ run db_go
+ run db_unregister x-common/nag
+fi
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=0:
Copied: trunk/debian/x-common.dirs (from rev 190, trunk/debian/xorg-common.dirs)
Copied: trunk/debian/x-common.doc-base.debian-faq (from rev 190, trunk/debian/xorg-common.doc-base.debian-faq)
===================================================================
--- trunk/debian/xorg-common.doc-base.debian-faq 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/x-common.doc-base.debian-faq 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,14 @@
+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/x-common/FAQ.gz
+
+Format: HTML
+Index: /usr/share/doc/x-common/FAQ.xhtml
+Files: /usr/share/doc/x-common/FAQ.xhtml
Copied: trunk/debian/x-common.docs (from rev 190, trunk/debian/xorg-common.docs)
Copied: trunk/debian/x-common.docs.s390 (from rev 190, trunk/debian/xorg-common.docs.s390)
Copied: trunk/debian/x-common.examples (from rev 190, trunk/debian/xorg-common.examples)
Copied: trunk/debian/x-common.init (from rev 190, trunk/debian/xorg-common.init)
===================================================================
--- trunk/debian/xorg-common.init 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/x-common.init 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# $Id$
+
+# 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/x-common start
+ ;;
+
+ stop)
+ :
+ ;;
+
+ *)
+ #log_success_msg "Usage: /etc/init.d/x-common {start|stop|restart|reload|force-reload}"
+ echo "Usage: /etc/init.d/x-common {start|stop|restart|reload|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=80:
Copied: trunk/debian/x-common.install (from rev 190, trunk/debian/xorg-common.install)
===================================================================
--- trunk/debian/xorg-common.install 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/x-common.install 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,17 @@
+etc/X11/Xresources/x-common
+etc/X11/Xsession
+etc/X11/Xsession.d/20x-common_process-args
+etc/X11/Xsession.d/30x-common_xresources
+etc/X11/Xsession.d/50x-common_determine-startup
+etc/X11/Xsession.d/90x-common_ssh-agent
+etc/X11/Xsession.d/99x-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
Copied: trunk/debian/x-common.links (from rev 190, trunk/debian/xorg-common.links)
Copied: trunk/debian/x-common.postinst.in (from rev 190, trunk/debian/xorg-common.postinst.in)
===================================================================
--- trunk/debian/xorg-common.postinst.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/x-common.postinst.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,40 @@
+#!/bin/sh
+# Debian xfree86-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$
+
+set -e
+
+THIS_PACKAGE=x-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
+
+if [ -e /etc/init.d/x-common ]; then
+ update-rc.d x-common start 70 S .
+fi
+
+#DEBHELPER#
+
+invoke-rc.d x-common start || true
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=80:
Copied: trunk/debian/x-common.postrm.in (from rev 190, trunk/debian/xorg-common.postrm.in)
===================================================================
--- trunk/debian/xorg-common.postrm.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/x-common.postrm.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,32 @@
+#!/bin/sh
+# Debian xfree86-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$
+
+set -e
+
+THIS_PACKAGE=x-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 x-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:
Copied: trunk/debian/x-common.preinst.in (from rev 190, trunk/debian/xorg-common.preinst.in)
===================================================================
--- trunk/debian/xorg-common.preinst.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/x-common.preinst.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,54 @@
+#!/bin/sh
+# Debian xfree86-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$
+
+set -e
+
+THIS_PACKAGE=x-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 x-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
+
+ 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:
Copied: trunk/debian/x-common.templates (from rev 190, trunk/debian/xorg-common.templates)
===================================================================
--- trunk/debian/xorg-common.templates 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/x-common.templates 2005-06-11 14:07:52 UTC (rev 191)
@@ -0,0 +1,24 @@
+Template: x-common/experimental_packages
+Type: note
+_Description: experimental version of XFree86 packages
+ You are using an experimental version of XFree86 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 XFree86 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 xfree86-common/unstable
+ or
+ apt-get install xfree86-common/stable
+ You may need to specify downgrades for several packages.
Modified: trunk/debian/xfree86-common.preinst.in
===================================================================
--- trunk/debian/xfree86-common.preinst.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xfree86-common.preinst.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -5,7 +5,7 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xfree86-common.preinst.in 1044 2004-02-16 17:40:33Z branden $
+# $Id$
set -e
@@ -22,7 +22,7 @@
# installed.
if [ -e /etc/X11/Xresources ] && ! [ -d /etc/X11/Xresources ]; then
ERRMSG="/etc/X11/Xresources exists and is not a directory;"
- ERRMSG="$ERRMSG the xorg-common package cannot be installed until this"
+ ERRMSG="$ERRMSG the x-common package cannot be installed until this"
if [ -f /etc/X11/Xresources ]; then
ERRMSG="$ERRMSG file"
else
Deleted: trunk/debian/xorg-common.README.Debian
===================================================================
--- trunk/debian/xorg-common.README.Debian 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.README.Debian 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,90 +0,0 @@
-Debian README for xfree86-common package
-========================================
-
-The xfree86-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/xfree86-common/FAQ.gz.
-You can view this file with your favorite pager program after decompressing
-it. For example:
- $ zcat /usr/share/doc/xfree86-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/xfree86-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 XFree86 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 xfree86-common package is the foundation on which those two packages
-themselves depend.
-
-In addition to manual pages and documentation, the xfree86-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 xfree86-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
-xfree86-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: xfree86-common.README.Debian 1244 2004-04-13 22:02:31Z branden $
-
-vim:set ai et sts=4 sw=4 tw=80:
Deleted: trunk/debian/xorg-common.config.in
===================================================================
--- trunk/debian/xorg-common.config.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.config.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Debian xfree86-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: xfree86-common.config.in 1254 2004-04-14 19:14:43Z branden $
-
-set -e
-
-# source debconf library
-. /usr/share/debconf/confmodule
-
-THIS_PACKAGE=xorg-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 xorg-common/experimental_packages \
- xorg-common/nag
- run db_input high xorg-common/nag
- run db_go
- run db_unregister xorg-common/nag
-fi
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:
Deleted: trunk/debian/xorg-common.dirs
===================================================================
--- trunk/debian/xorg-common.dirs 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.dirs 2005-06-11 14:07:52 UTC (rev 191)
@@ -1 +0,0 @@
-etc/X11/Xresources
Deleted: trunk/debian/xorg-common.doc-base.debian-faq
===================================================================
--- trunk/debian/xorg-common.doc-base.debian-faq 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.doc-base.debian-faq 2005-06-11 14:07:52 UTC (rev 191)
@@ -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/xorg-common/FAQ.gz
-
-Format: HTML
-Index: /usr/share/doc/xorg-common/FAQ.xhtml
-Files: /usr/share/doc/xorg-common/FAQ.xhtml
Deleted: trunk/debian/xorg-common.docs
===================================================================
--- trunk/debian/xorg-common.docs 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.docs 2005-06-11 14:07:52 UTC (rev 191)
@@ -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
-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: trunk/debian/xorg-common.docs.s390
===================================================================
--- trunk/debian/xorg-common.docs.s390 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.docs.s390 2005-06-11 14:07:52 UTC (rev 191)
@@ -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: trunk/debian/xorg-common.examples
===================================================================
--- trunk/debian/xorg-common.examples 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.examples 2005-06-11 14:07:52 UTC (rev 191)
@@ -1 +0,0 @@
-debian/local/xsession
Deleted: trunk/debian/xorg-common.init
===================================================================
--- trunk/debian/xorg-common.init 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.init 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# $Id: xfree86-common.init 2139 2005-01-18 00:03:58Z branden $
-
-# 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/xorg-common start
- ;;
-
- stop)
- :
- ;;
-
- *)
- #log_success_msg "Usage: /etc/init.d/xorg-common {start|stop|restart|reload|force-reload}"
- echo "Usage: /etc/init.d/xorg-common {start|stop|restart|reload|force-reload}"
- exit 1
- ;;
-esac
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=80:
Deleted: trunk/debian/xorg-common.install
===================================================================
--- trunk/debian/xorg-common.install 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.install 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,17 +0,0 @@
-etc/X11/Xresources/xorg-common
-etc/X11/Xsession
-etc/X11/Xsession.d/20xorg-common_process-args
-etc/X11/Xsession.d/30xorg-common_xresources
-etc/X11/Xsession.d/50xorg-common_determine-startup
-etc/X11/Xsession.d/90xorg-common_ssh-agent
-etc/X11/Xsession.d/99xorg-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: trunk/debian/xorg-common.links
===================================================================
--- trunk/debian/xorg-common.links 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.links 2005-06-11 14:07:52 UTC (rev 191)
@@ -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: trunk/debian/xorg-common.postinst.in
===================================================================
--- trunk/debian/xorg-common.postinst.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.postinst.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,40 +0,0 @@
-#!/bin/sh
-# Debian xfree86-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: xfree86-common.postinst.in 1433 2004-05-21 17:59:20Z branden $
-
-set -e
-
-THIS_PACKAGE=xorg-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
-
-if [ -e /etc/init.d/xorg-common ]; then
- update-rc.d xorg-common start 70 S .
-fi
-
-#DEBHELPER#
-
-invoke-rc.d xorg-common start || true
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=80:
Deleted: trunk/debian/xorg-common.postrm.in
===================================================================
--- trunk/debian/xorg-common.postrm.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.postrm.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,32 +0,0 @@
-#!/bin/sh
-# Debian xfree86-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: xfree86-common.postrm.in 1259 2004-04-14 20:51:34Z branden $
-
-set -e
-
-THIS_PACKAGE=xorg-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 xorg-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: trunk/debian/xorg-common.preinst.in
===================================================================
--- trunk/debian/xorg-common.preinst.in 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.preinst.in 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,54 +0,0 @@
-#!/bin/sh
-# Debian xfree86-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: xfree86-common.preinst.in 1044 2004-02-16 17:40:33Z branden $
-
-set -e
-
-THIS_PACKAGE=xorg-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 xorg-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
-
- 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: trunk/debian/xorg-common.templates
===================================================================
--- trunk/debian/xorg-common.templates 2005-06-11 08:49:53 UTC (rev 190)
+++ trunk/debian/xorg-common.templates 2005-06-11 14:07:52 UTC (rev 191)
@@ -1,24 +0,0 @@
-Template: xorg-common/experimental_packages
-Type: note
-_Description: experimental version of XFree86 packages
- You are using an experimental version of XFree86 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 XFree86 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 xfree86-common/unstable
- or
- apt-get install xfree86-common/stable
- You may need to specify downgrades for several packages.
Reply to: