xorg: Changes to 'debian-unstable'
debian/changelog | 34 ++++
debian/control | 11 +
debian/local/control | 1
debian/local/dexconf | 240 ----------------------------------
debian/local/dexconf.1 | 246 -----------------------------------
debian/local/xorg.conf | 96 -------------
debian/rules | 13 -
debian/xbase-clients.postinst.in | 20 --
debian/xbase-clients.postrm.in | 20 --
debian/xbase-clients.preinst.in | 20 --
debian/xserver-xorg.examples | 1
debian/xserver-xorg.install | 2
debian/xserver-xorg.manpages | 1
debian/xutils.postinst.in | 35 ----
debian/xutils.postrm.in | 31 ----
debian/xutils.preinst.in | 31 ----
xsf-docs/.gitignore | 3
xsf-docs/COPYING | 19 ++
xsf-docs/Makefile | 61 ++++++++
xsf-docs/howtos/configure-input.mdwn | 167 +++++++++++++++++++++++
xsf-docs/howtos/report-bugs.mdwn | 30 ++++
xsf-docs/howtos/triage-bugs.mdwn | 93 +++++++++++++
xsf-docs/howtos/use-gdb.mdwn | 102 ++++++++++++++
xsf-docs/howtos/use-xrandr.mdwn | 173 ++++++++++++++++++++++++
xsf-docs/index.mdwn | 27 +++
xsf-docs/mdwn2html | 48 ++++++
xsf-docs/reference/dependencies.mdwn | 221 +++++++++++++++++++++++++++++++
xsf-docs/upstream-features.mdwn | 16 ++
xsf-docs/xsf.css | 86 ++++++++++++
xsf-docs/xsf.png |binary
xsf-docs/xsf.svg | 234 +++++++++++++++++++++++++++++++++
31 files changed, 1331 insertions(+), 751 deletions(-)
New commits:
commit 0e43f190d0716b77c634751da9407909182533df
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 16:38:45 2011 +0100
Add xauth build-dep, for xvfb-run.
diff --git a/debian/changelog b/debian/changelog
index 68f07a7..1d77da6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xorg (1:7.6+2) unstable; urgency=low
- markdown: .mdwn to .html
- wkhtmltopdf: .html to .pdf
- xvfb: wkhtmltopdf needs a display.
+ - xauth: xvfb-run needs it.
* Remove xbase-clients maintainer scripts: Stop caring about
/etc/X11/app-defaults/Beforelight, which was needed while upgrading
from versions earlier than 1:7.4+2. Now even squeeze has a newer
diff --git a/debian/control b/debian/control
index ca1c01c..2b32214 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
# xsf-docs:
markdown,
wkhtmltopdf,
+ xauth,
xvfb,
Package: x11-common
commit 4346bc7d79bb8c3e08b3b7cd0db765a76aa04606
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 16:32:33 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 982a0d9..68f07a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+2) UNRELEASED; urgency=low
+xorg (1:7.6+2) unstable; urgency=low
* Merge xsf-docs documentation. That's an offline copy of the
documentation available online (http://pkg-xorg.alioth.debian.org/) in
@@ -29,7 +29,7 @@ xorg (1:7.6+2) UNRELEASED; urgency=low
- xorg.conf: No real need for an example, with autodetection. If some
documentation is still needed, it can be added to xsf-docs.
- -- Cyril Brulebois <kibi@debian.org> Sun, 06 Feb 2011 20:22:01 +0100
+ -- Cyril Brulebois <kibi@debian.org> Tue, 08 Feb 2011 16:32:29 +0100
xorg (1:7.6+1) unstable; urgency=low
commit d9b33ad68c13bcb3861db1ec28e71cdb90c9b67f
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 16:23:36 2011 +0100
Mention the directory for xsf-docs.
diff --git a/debian/changelog b/debian/changelog
index ab94888..982a0d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,8 @@ xorg (1:7.6+2) UNRELEASED; urgency=low
* Call make/make clean in xsf-docs/ accordingly. Do the “make” part
under xvfb-run since wkhtmltopdf requires a working display, at least
at the moment.
- * Ship xsf-docs under /usr/share/doc in the xserver-xorg metapackage.
+ * Ship xsf-docs in the xserver-xorg metapackage, under the following
+ directory: /usr/share/doc/xorg
* Add build-deps accordingly:
- markdown: .mdwn to .html
- wkhtmltopdf: .html to .pdf
commit f76bdc79245099474e5d47e21a18b4d79612071b
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 15:49:43 2011 +0100
Remove obsolete material.
- dexconf: Good bye!
- xorg.conf: No real need for an example, with autodetection. If some
documentation is still needed, it can be added to xsf-docs.
diff --git a/debian/changelog b/debian/changelog
index c7bc270..ab94888 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,10 @@ xorg (1:7.6+2) UNRELEASED; urgency=low
* Ship a bug control file for xorg, making it report-with: xserver-xorg,
which gives us the exact version of the server (the bug script isn't
always sufficient), but also the drivers.
+ * Remove obsolete material:
+ - dexconf: Good bye!
+ - xorg.conf: No real need for an example, with autodetection. If some
+ documentation is still needed, it can be added to xsf-docs.
-- Cyril Brulebois <kibi@debian.org> Sun, 06 Feb 2011 20:22:01 +0100
diff --git a/debian/local/dexconf b/debian/local/dexconf
deleted file mode 100644
index 8261cad..0000000
--- a/debian/local/dexconf
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-
-# dexconf: Debian X server configuration file writer
-#
-# This tool is a backend which uses debconf database values. It writes an
-# XFree86 X server configuration file based on the information in the database.
-#
-# Author: Branden Robinson
-
-# Copyright 2000--2004 Progeny Linux Systems, Inc.
-#
-# 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
-
-# source debconf library
-. /usr/share/debconf/confmodule
-
-# display a usage message
-usage () {
- cat <<EOF
-Usage: $PROGNAME [OPTION ...]
- write an Xorg X server configuration file based on debconf database values
-Options:
- -h, --help display this usage message and exit
- -o FILE, --output=FILE write configuration file to FILE
-This help message is intended only as a quick reference. For a description of
-the usage of $PROGNAME, see the $PROGNAME(1) manual page.
-EOF
-}
-
-# the error-out function
-bomb () {
- echo "$PROGNAME: error: $*" | fold -s -w "${COLUMNS:-80}" >&2
- exit 1
-}
-
-# wrapper around db_get to ensure that the info we try to retrieve exists; it
-# is (almost) always a fatal error for the values to be null
-fetch () {
- db_get "$1" || true
- if [ -z "$RET" ]; then
- ERRMSG="cannot generate configuration file; $1 not set. Aborting."
- ERRMSG="$ERRMSG Reconfigure the X server with \"dpkg-reconfigure"
- ERRMSG="$ERRMSG xserver-xorg\" to correct this problem."
- bomb "$ERRMSG"
- fi
-}
-
-# convert a debconf comma-delimited list to a shell whitespace-delimited list
-list_convert () {
- echo $(IFS=", "; set -- $RET; while [ $# -gt 0 ]; do echo \"$1\"; shift; done)
-}
-
-SERVER="xorg"
-XF86CONFIG=/etc/X11/xorg.conf
-PROGNAME=${0##*/}
-SHOWHELP=
-EARLYEXIT=
-
-GETOPT_OUTPUT=$(getopt --options ho: \
- --longoptions help,output: \
- -n "$PROGNAME" -- "$@")
-
-if [ $? -ne 0 ]; then
- bomb "error while getting options; use \"$PROGNAME --help\" for help"
-fi
-
-eval set -- "$GETOPT_OUTPUT"
-
-while :; do
- case "$1" in
- -f|--format)
- bomb "This option, and XFree86 3.x output, are no longer supported."
- ;;
- -h|--help) SHOWHELP=yes EARLYEXIT=yes ;;
- -o|--output) XF86CONFIG="$2"; shift ;;
- --) shift; break ;;
- *)
- bomb "unrecognized option \"$1\"; use \"$PROGNAME --help\" for help"
- ;;
- esac
- shift
-done
-
-if [ -n "$SHOWHELP" ]; then
- usage
-fi
-
-if [ -n "$EARLYEXIT" ]; then
- exit 0
-fi
-
-DEXCONFTMPDIR=
-
-trap 'if [ -e "$DEXCONFTMPDIR/backup" ] && [ -n "$XF86CONFIG" ]; then \
- cat "$DEXCONFTMPDIR/backup" >"$XF86CONFIG"; \
- fi; \
- exec 4<&-; \
- rm -rf "$DEXCONFTMPDIR"; \
- bomb "received signal; aborting"' HUP INT QUIT TERM
-
-
-# Set up a temporary directory for the files we'll be writing.
-TDIR_PARENT="${TMPDIR:-/tmp}"
-TDIR="${TMPDIR:-/tmp}/dexconf-tmp-$$"
-
-if [ ! -d "$TDIR_PARENT" ]; then
- bomb "cannot create temporary work directory; \"$TDIR_PARENT\" does not" \
- "exist or is not a directory"
-fi
-
-if [ ! -w "$TDIR_PARENT" ]; then
- bomb "cannot create temporary work directory in \"$TDIR_PARENT\"; directory" \
- "not writable"
-fi
-
-rm -rf "$TDIR"
-
-if mkdir -m 0700 "$TDIR"; then
- DEXCONFTMPDIR="$TDIR"
-else
- bomb "creation of temporary work directory \"$TDIR\" failed"
-fi
-
-# xorg.conf sections:
-# Files File pathnames NOT USED BY DEXCONF
-# ServerFlags Server flags NOT USED BY DEXCONF
-# Module Dynamic module loading NOT USED BY DEXCONF
-# InputDevice Input device description NOT USED BY DEXCONF
-# Device Graphics device description
-# VideoAdaptor Xv video adaptor description NOT USED BY DEXCONF
-# Monitor Monitor description NOT USED BY DEXCONF
-# Modes Video modes descriptions NOT USED BY DEXCONF
-# Screen Screen configuration NOT USED BY DEXCONF
-# ServerLayout Overall layout NOT USED BY DEXCONF
-# DRI DRI-specific configuration NOT USED BY DEXCONF
-# Vendor Vendor-specific configuration NOT USED BY DEXCONF
-
-### HEADER
-
-# Because debconf hijacks standard output and its confmodule uses file
-# descriptor 3 for its own purposes, we will write our output to file descriptor
-# 4 instead of standard output.
-
-exec 4>"$DEXCONFTMPDIR/Header"
-cat >&4 <<SECTION
-# xorg.conf (X.Org X Window System server configuration file)
-#
-# This file was generated by dexconf, the Debian X Configuration tool, using
-# values from the debconf database.
-#
-# Edit this file with caution, and see the xorg.conf manual page.
-# (Type "man xorg.conf" at the shell prompt.)
-#
-# This file is automatically updated on xserver-xorg package upgrades *only*
-# if it has not been modified since the last upgrade of the xserver-xorg
-# package.
-#
-# If you have edited this file but would like it to be automatically updated
-# again, run the following command:
-# sudo dpkg-reconfigure -phigh xserver-xorg
-SECTION
-
-### DEVICE
-
-db_get xserver-$SERVER/config/device/bus_id
-DEVICE_BUSID="$RET"
-exec 4>"$DEXCONFTMPDIR/Device"
-cat >&4 <<SECTION
-Section "Device"
- Identifier "Configured Video Device"
-SECTION
-if [ -n "$DEVICE_BUSID" ]; then
- printf "\tBusID\t\t\"$DEVICE_BUSID\"\n" >&4
-fi
-printf "EndSection\n" >&4
-
-# Close file descriptor 4 before we delete temporary files
-exec 4<&-
-
-# Tell debconf to stop listening to us.
-db_stop
-
-# Write the configuration file. Put a blank line before every section we write
-# except the first.
-
-OUTFILE="$DEXCONFTMPDIR/dexconf-out"
-umask 022
-: >"$OUTFILE"
-
-SPACER=
-for SECTION in Header Device ; do
- if [ -e "$DEXCONFTMPDIR/$SECTION" ]; then
- eval $SPACER
- cat "$DEXCONFTMPDIR/$SECTION" >>"$OUTFILE"
- SPACER='echo "" >>"$OUTFILE"'
- fi
-done
-
-# Ensure we can write to our destination if it already exits.
-if [ -e "$XF86CONFIG" ]; then
- if [ ! -w "$XF86CONFIG" ]; then
- bomb "unable to write to \"$XF86CONFIG\""
- fi
-fi
-
-BACKUP=
-# Create a backup of the existing configuration file if it already exists.
-if [ -e "$XF86CONFIG" ]; then
- cat "$XF86CONFIG" >"$DEXCONFTMPDIR/backup"
- BACKUP=true
-fi
-
-# Move the new file into place.
-if ! cat "$OUTFILE" >"$XF86CONFIG"; then
- # Failed; try to restore the backup.
- if [ -n "$BACKUP" ]; then
- cat "$DEXCONFTMPDIR/backup" >"$XF86CONFIG"
- fi
-fi
-
-rm -rf "$DEXCONFTMPDIR"
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=80:
diff --git a/debian/local/dexconf.1 b/debian/local/dexconf.1
deleted file mode 100644
index f611168..0000000
--- a/debian/local/dexconf.1
+++ /dev/null
@@ -1,246 +0,0 @@
-.\" This manpage is copyright (C) 2000, 2001, 2003, 2004 Progeny Linux
-.\" Systems, Inc.
-.\" Author: Branden Robinson <branden@progeny.com>
-.\"
-.\" 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
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it. So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH dexconf 1 "2004\-10\-31" "Debian Project"
-.SH NAME
-dexconf \- generate Xorg X server configuration file from debconf data
-.SH SYNOPSIS
-.B dexconf
-[
-.I options
-]
-.SH DESCRIPTION
-.B dexconf
-retrieves values from
-.BR debconf (7)'s
-database and uses them to build an
-.I xorg.conf
-file.
-.PP
-The information that
-.B dexconf
-uses is typically entered via a debconf frontend (or possibly in part by
-hardware autodetection tools).
-Note that
-.B dexconf
-itself does
-.I not
-set any values in the debconf database; it only retrieves them.
-If configuration parameters of the debconf database need to be changed,
-.BR dpkg\-reconfigure (8)
-should be used to do so.
-.PP
-More experienced users should feel free to use
-.BR dexconf \-generated
-configuration files as a starting point for their customizations, since
-individual preferences vary greatly.
-.SH OPTIONS
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-o\ file \fR,\fB\ \-\-output= file
-By default,
-.B dexconf
-writes to
-.IR /etc/X11/xorg.conf
-This option instructs
-.B dexconf
-to write to
-.I file
-instead.
-Note that
-.B dexconf
-unconditionally overwrites its destination file if it has sufficient access
-rights to do so.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-This variable is used to format diagnostic messages so that they fit the
-width of the terminal.
-If not set, a terminal width of 80 columns is assumed.
-.TP
-.B TMPDIR
-.B dexconf
-creates a subdirectory of the directory name stored in this variable, and
-uses that subdirectory as a scratch area.
-If not set,
-.I /tmp
-is used as the parent of the scratch directory.
-.SH "OUTPUT FILES"
-.TP
-.I /etc/X11/xorg.conf
-is the configuration file for the Xorg X server.
-.SH DIAGNOSTICS
-.B dexconf
-produces diagnostic messages upon encountering various error conditions.
-These messages are prefixed with the name of the command and a colon; for
-example:
-.RS
-.BI "dexconf: " message
-.RE
-A list of diagnostic messages currently issued by
-.B dexconf
-follows.
-.TP
-.B This option, and XFree86 3.x output, are no longer supported.
-.B dexconf
-no longer supports the
-.BR \-f ,
-.B \-\-format
-option.
-See the \(lqHISTORY\(rq section below.
-.TP
-.BI "cannot create temporary work directory; " dirname " does not exist or is\
-\& not a directory"
-.B
-dexconf
-was unable to create a scratch directory to work in because the parent
-directory
-.RI ( dirname )
-was not does not exist or is not a directory.
-Create
-.I dirname
-and set its permissions properly, or set the
-.B TMPDIR
-environment variable to the name of an existing directory.
-.TP
-.BI "cannot create temporary work directory in " dirname "; directory not\
-\& writable"
-.B dexconf
-had insufficient permissions to create a directory in
-.IR dirname .
-Change the permissions on
-.I dirname
-or set the
-.B TMPDIR
-environment variable to the of a writeable directory.
-.TP
-.BI "cannot generate configuration file; " question " not set"
-An answer to the indicated
-.I question
-was expected in the debconf database, but none was found.
-.B dexconf
-cannot write a valid configuration file without this information.
-This problem can be rectified by reconfiguring the X server package with
-the
-.BR dpkg\-reconfigure (8)
-command.
-.TP
-.BI "creation of temporary work directory " dirname " failed"
-.B dexconf
-was unable to create a scratch directory
-.RI ( dirname )
-to work in.
-This diagnostic is only issued after
-.B dexconf
-has checked to ensure that the parent directory of
-.I dirname
-is writable, and after the temporary directory to be used has been removed
-(if necessary).
-This diagnostic message could indicate that something on the system is
-attempting to use a temporary\-file race condition to compromise the
-system's integrity.
-.TP
-.B error while getting options
-.B dexconf
-received an error from
-.BR getopt (1)
-while attempting to interpret the command\-line arguments.
-Use only the documented options.
-.TP
-.B received signal; aborting
-.B dexconf
-was sent a fatal signal; see the section on asynchronous events below.
-.TP
-.BI "this program does not know how to configure the " package " X server"
-.B dexconf
-only knows how to write configuration files for XFree86 version
-.RI 4. x
-X servers.
-The value of the
-.B shared/default\-x\-server
-debconf template was set to a package name that
-.B dexconf
-did not recognize.
-A different tool will have to be used to configure the
-selected X server, or
-.BR dpkg\-reconfigure (8)
-will have to be used to change the default X server.
-.TP
-.BI "unable to write to " configfile
-.B dexconf
-was unable to write to
-.I configfile
-because it lacked permissions to do so.
-Run
-.B dexconf
-as a user with permissions to write to
-.IR configfile,
-or specify an alternate file to write with the
-.B \-o
-or
-.B \-\-output
-options.
-.TP
-.BI "unrecognized option " "option"
-An unrecognized option was specified.
-Use only the documented options.
-.SH "ASYNCHRONOUS EVENTS"
-.B dexconf
-traps the HUP, INT, QUIT, and TERM signals.
-.B dexconf
-removes its scratch directory and exits when it receives any of these
-signals.
-.SH "EXIT STATUS"
-.TP
-0
-A configuration file was successfully written.
-.TP
-1
-An error occurred, or
-.B dexconf
-was interrupted.
-See the section on diagnostics above.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xserver\-common"; "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR dexconf ,
-please see
-.I /usr/share/doc/debian/bug\-reporting.txt
-or the
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B dexconf
-was written by Branden Robinson with sponsorship from Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR xorg.conf (5x),
-.BR dpkg\-reconfigure (8),
-.BR debconf (7)
-.\" vim:set et tw=80:
diff --git a/debian/local/xorg.conf b/debian/local/xorg.conf
deleted file mode 100644
index d46634a..0000000
--- a/debian/local/xorg.conf
+++ /dev/null
@@ -1,96 +0,0 @@
-# This is a sample xorg.conf. All sections are commented out, but may
-# be uncommented in order to enable them. You'll almost definitely
-# need to edit the values given here to suit your own system.
-#
-# It is not recommended to uncomment any more than is necessary, as
-# the server will choose good defaults in most cases. Thus, your
-# xorg.conf should only be used to override the server when those
-# defaults are incorrect for your system.
-#
-# For full documentation see xorg.conf(5)
-
-# Section "Files"
-# FontPath "/usr/share/fonts/X11/100dpi"
-# FontPath "/usr/share/fonts/X11/75dpi"
-# FontPath "/usr/share/fonts/X11/cyrillic"
-# FontPath "/usr/share/fonts/X11/misc"
-# FontPath "/usr/share/fonts/Type1"
-# ModulePath "/usr/lib/xorg/modules"
-# EndSection
-
-# Section "ServerFlags"
-# Option "DontZap" "False"
-# Option "DefaultServerLayout" "Layout"
-# Option "AllowMouseOpenFail" "False"
-# Option "AllowEmptyInput" "True"
-# Option "AutoAddDevices" "True"
-# EndSection
-
-# Section "Module"
-# Load "glx"
-# EndSection
-
-# Section "Extensions"
-# Option "Composite" "Enable"
-# EndSection
-
-# Section "InputDevice"
-# Identifier "Keyboard"
-# Driver "kbd"
-# Option "CoreKeyboard"
-# Option "XkbRules" "xorg"
-# Option "XkbModel" "pc105"
-# Option "XkbLayout" "us"
-# EndSection
-
-# Section "InputDevice"
-# Identifier "Mouse"
-# Driver "mouse"
-# Option "CorePointer"
-# Option "Device" "/dev/input/mice"
-# Option "Protocol" "ExplorerPS/2"
-# EndSection
-
-# Section "Device"
-# Identifier "Video Card"
-# Driver "vesa"
-# Option "AccelMethod" "EXA"
-# Option "Monitor-LVDS" "Monitor1"
-# Option "Monitor-VGA" "Monitor2"
-# EndSection
-
-# Section "Device"
-# Identifier "Internal Graphics Card We Disable"
-# Option "Ignore" "true"
-# BusID "PCI:1:0:0"
-# EndSection
-
-# Section "Monitor"
-# Identifier "Monitor1"
-# DisplaySize 304 228
-# EndSection
-
-# Section "Monitor"
-# Identifier "Monitor2"
-# HorizSync 24-82
-# VertRefresh 55-77
-# Option "RightOf" "Monitor1"
-# EndSection
-
-# Section "Screen"
-# Identifier "Screen"
-# Device "Video Card"
-# Monitor "Monitor"
-# DefaultDepth 24
-# SubSection "Display"
-# Depth 24
-# Virtual 3072 1200
-# EndSubSection
-# EndSection
-
-# Section "ServerLayout"
-# Identifier "Layout"
-# Screen "Screen"
-# InputDevice "Keyboard"
-# InputDevice "Mouse"
-# EndSection
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 2a9324c..0d02fbe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,12 +44,7 @@ SCRIPTS=$(shell ls debian/*.config.in debian/*.postinst.in debian/*.postrm.in de
DEFAULT_DCRESOLUTIONS="1920x1440, 1920x1200, 1856x1392, 1792x1344, 1680x1050, 1600x1200, 1440x900, 1400x1050, 1280x1024, 1280x960, 1280x854, 1280x800, 1280x768, 1200x800, 1152x864, 1152x768, 1024x768, 800x600, 640x480"
scripts: scripts-stamp
-scripts-stamp: genscripts validatescripts
- touch $@
-
-validatescripts: genscripts validatescripts-stamp
-validatescripts-stamp: debian/local/dexconf
- sh debian/scripts/validate-posix-sh $<
+scripts-stamp: genscripts
touch $@
build: build-stamp
@@ -134,7 +129,7 @@ endif
binary: binary-indep binary-arch
.PHONY: default
-.PHONY: genscripts cleanscripts scripts validatescripts
+.PHONY: genscripts cleanscripts scripts
.PHONY: updatepo
.PHONY: clean configure install
.PHONY: build build-arch-only build-all
diff --git a/debian/xserver-xorg.examples b/debian/xserver-xorg.examples
deleted file mode 100644
index 7b56391..0000000
--- a/debian/xserver-xorg.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/local/xorg.conf
diff --git a/debian/xserver-xorg.install b/debian/xserver-xorg.install
index f890f5b..9df03a9 100644
--- a/debian/xserver-xorg.install
+++ b/debian/xserver-xorg.install
@@ -1,3 +1,2 @@
debian/local/X usr/bin
-debian/local/dexconf usr/bin
debian/local/control usr/share/bug/xorg
diff --git a/debian/xserver-xorg.manpages b/debian/xserver-xorg.manpages
deleted file mode 100644
index 9df885d..0000000
--- a/debian/xserver-xorg.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/local/dexconf.1
commit b549ef5a95782dafed85fe27b09f6a700c90f197
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 15:33:36 2011 +0100
Ship a bug control file for xorg.
Make it report-with: xserver-xorg, which gives us the exact version of the
server (the bug script isn't always sufficient), but also the drivers.
diff --git a/debian/changelog b/debian/changelog
index 1e95191..c7bc270 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ xorg (1:7.6+2) UNRELEASED; urgency=low
* Tighten the dependency between xorg and xserver-xorg, to prevent from
being able to upgrade xorg only (e.g. to X11R7.6) while still having
xserver-xorg and xserver-xorg-core in a lower version (e.g. X11R7.5).
+ * Ship a bug control file for xorg, making it report-with: xserver-xorg,
+ which gives us the exact version of the server (the bug script isn't
+ always sufficient), but also the drivers.
-- Cyril Brulebois <kibi@debian.org> Sun, 06 Feb 2011 20:22:01 +0100
diff --git a/debian/local/control b/debian/local/control
new file mode 100644
index 0000000..c151f51
--- /dev/null
+++ b/debian/local/control
@@ -0,0 +1 @@
+report-with: xserver-xorg
diff --git a/debian/xserver-xorg.install b/debian/xserver-xorg.install
index 6b050ed..f890f5b 100644
--- a/debian/xserver-xorg.install
+++ b/debian/xserver-xorg.install
@@ -1,2 +1,3 @@
debian/local/X usr/bin
debian/local/dexconf usr/bin
+debian/local/control usr/share/bug/xorg
commit 0aa09bcff1de54282cb9637e559360a896bfd0d2
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 15:17:27 2011 +0100
Tighten the dependency between xorg and xserver-xorg.
This prevents from being able to upgrade xorg only (e.g. to X11R7.6) while
still having xserver-xorg and xserver-xorg-core in a lower version (e.g.
X11R7.5).
diff --git a/debian/changelog b/debian/changelog
index f26e235..1e95191 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ xorg (1:7.6+2) UNRELEASED; urgency=low
version.
* Ditto for xutils: Stop caring about /etc/X11/rstart, 1:7.3+11 was a
long time ago.
+ * Tighten the dependency between xorg and xserver-xorg, to prevent from
+ being able to upgrade xorg only (e.g. to X11R7.6) while still having
+ xserver-xorg and xserver-xorg-core in a lower version (e.g. X11R7.5).
-- Cyril Brulebois <kibi@debian.org> Sun, 06 Feb 2011 20:22:01 +0100
diff --git a/debian/control b/debian/control
index 8c60f8b..ca1c01c 100644
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,7 @@ Description: the X.Org X server -- input driver metapackage
Package: xorg
Architecture: any
Depends:
- xserver-xorg,
+ xserver-xorg (>= ${binary:Version}),
libgl1-mesa-glx | libgl1,
libgl1-mesa-dri,
libglu1-mesa,
commit 01dde16f91fc8e797c71bd40b9217fd5fb8d265d
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 15:03:56 2011 +0100
Ship xsf-docs in xserver-xorg instead of xorg.
xserver-xorg is more used than xorg as dependency of other packages, so
let's ship xsf-docs in the most widely installed.
diff --git a/debian/changelog b/debian/changelog
index 5497e27..f26e235 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ xorg (1:7.6+2) UNRELEASED; urgency=low
* Call make/make clean in xsf-docs/ accordingly. Do the “make” part
under xvfb-run since wkhtmltopdf requires a working display, at least
at the moment.
- * Ship xsf-docs under /usr/share/doc in the xorg metapackage.
+ * Ship xsf-docs under /usr/share/doc in the xserver-xorg metapackage.
* Add build-deps accordingly:
- markdown: .mdwn to .html
- wkhtmltopdf: .html to .pdf
diff --git a/debian/rules b/debian/rules
index 5e03da2..2a9324c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ install-stamp: build-stamp
dh_testdir
dh_testroot
dh_prep
- $(MAKE) -C xsf-docs install DESTDIR=$(CURDIR)/debian/xorg/usr/share/doc/xorg
+ $(MAKE) -C xsf-docs install DESTDIR=$(CURDIR)/debian/xserver-xorg/usr/share/doc/xorg
touch $@
binary-indep: DH_OPTIONS=-i
commit c23d6ff8befa4cf8c9c6c75f279611859925ce2b
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Feb 7 09:43:57 2011 +0100
Add build-deps needed for xsf-docs.
diff --git a/debian/changelog b/debian/changelog
index e054b02..5497e27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ xorg (1:7.6+2) UNRELEASED; urgency=low
under xvfb-run since wkhtmltopdf requires a working display, at least
at the moment.
* Ship xsf-docs under /usr/share/doc in the xorg metapackage.
+ * Add build-deps accordingly:
+ - markdown: .mdwn to .html
+ - wkhtmltopdf: .html to .pdf
+ - xvfb: wkhtmltopdf needs a display.
* Remove xbase-clients maintainer scripts: Stop caring about
/etc/X11/app-defaults/Beforelight, which was needed while upgrading
from versions earlier than 1:7.4+2. Now even squeeze has a newer
diff --git a/debian/control b/debian/control
index 397828a..8c60f8b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,13 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Standards-Version: 3.9.1
-Build-Depends: po-debconf, debhelper (>= 7)
+Build-Depends:
+ debhelper (>= 7),
+ po-debconf,
+# xsf-docs:
+ markdown,
+ wkhtmltopdf,
+ xvfb,
Package: x11-common
Architecture: all
commit 6bc685065274dea266a5554d9963b1f937aabbf3
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Feb 7 08:27:24 2011 +0100
Ditto for xutils: Stop caring about /etc/X11/rstart.
Indeed, 1:7.3+11 was a long time ago.
diff --git a/debian/changelog b/debian/changelog
index 0299060..e054b02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ xorg (1:7.6+2) UNRELEASED; urgency=low
/etc/X11/app-defaults/Beforelight, which was needed while upgrading
from versions earlier than 1:7.4+2. Now even squeeze has a newer
version.
+ * Ditto for xutils: Stop caring about /etc/X11/rstart, 1:7.3+11 was a
+ long time ago.
-- Cyril Brulebois <kibi@debian.org> Sun, 06 Feb 2011 20:22:01 +0100
diff --git a/debian/xutils.postinst.in b/debian/xutils.postinst.in
deleted file mode 100644
index 78b3123..0000000
--- a/debian/xutils.postinst.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=xutils
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
-configure)
- if dpkg --compare-versions "$2" lt-nl "1:7.3+11"; then
- remove_conffile_commit "/etc/X11/rstart/commands/x11r6/@List"
- remove_conffile_commit "/etc/X11/rstart/commands/x11r6/LoadMonitor"
- remove_conffile_commit "/etc/X11/rstart/commands/x11r6/Terminal"
- remove_conffile_commit "/etc/X11/rstart/commands/@List"
- remove_conffile_commit "/etc/X11/rstart/commands/ListContexts"
- remove_conffile_commit "/etc/X11/rstart/commands/ListGenericCommands"
- remove_conffile_commit "/etc/X11/rstart/contexts/@List"
- remove_conffile_commit "/etc/X11/rstart/contexts/default"
- remove_conffile_commit "/etc/X11/rstart/contexts/x11r6"
- remove_conffile_commit "/etc/X11/rstart/config"
- remove_conffile_commit "/etc/X11/rstart/rstartd.real"
- rmdir /etc/X11/rstart/commands/x11r6/ 2>/dev/null || true
- rmdir /etc/X11/rstart/commands/ 2>/dev/null || true
- rmdir /etc/X11/rstart/contexts/ 2>/dev/null || true
- rmdir /etc/X11/rstart/ 2>/dev/null || true
- fi
-esac
-
-#DEBHELPER#
Reply to: