debian/README.source | 73 ++ debian/TODO | 4 debian/changelog | 169 +++++ debian/control | 23 debian/local/Xsession.5 | 24 debian/local/Xwrapper.config.5 | 11 debian/local/debian-setup-keyboard | 21 debian/local/debian-x11-keymap.fdi | 10 debian/local/dexconf | 14 debian/local/rgb.txt | 754 ++++++++++++++++++++++++++ debian/local/xorg.conf | 96 +++ debian/local/xserver-wrapper.c | 41 - debian/po/POTFILES.in | 1 debian/po/ar.po | 970 ++++++++++++++-------------------- debian/po/ast.po | 494 +++++++++++++++++ debian/po/be.po | 977 ++++++++++++++-------------------- debian/po/bg.po | 962 +++++++++++++-------------------- debian/po/bn.po | 175 ++++++ debian/po/bs.po | 996 ++++++++++++++--------------------- debian/po/ca.po | 1023 +++++++++++++++--------------------- debian/po/cs.po | 924 +++++++++++++------------------- debian/po/da.po | 976 ++++++++++++++-------------------- debian/po/de.po | 976 ++++++++++++++-------------------- debian/po/dz.po | 950 +++++++++++++-------------------- debian/po/el.po | 1050 +++++++++++++++---------------------- debian/po/eo.po | 472 ++++++++++++++++ debian/po/es.po | 1004 ++++++++++++++--------------------- debian/po/eu.po | 1001 ++++++++++++++--------------------- debian/po/fi.po | 946 +++++++++++++-------------------- debian/po/fr.po | 1038 +++++++++++++++--------------------- debian/po/gl.po | 960 +++++++++++++-------------------- debian/po/gu.po | 789 ++++++++++++++------------- debian/po/he.po | 955 +++++++++++++-------------------- debian/po/hr.po | 941 +++++++++++++-------------------- debian/po/hu.po | 927 +++++++++++++------------------- debian/po/id.po | 923 +++++++++++++------------------- debian/po/it.po | 957 ++++++++++++++------------------- debian/po/ja.po | 977 ++++++++++++++-------------------- debian/po/kk.po | 449 +++++++++++++++ debian/po/km.po | 932 +++++++++++++------------------- debian/po/ko.po | 961 +++++++++++++-------------------- debian/po/ku.po | 476 ---------------- debian/po/lt.po | 920 +++++++++++++------------------- debian/po/ml.po | 1002 ++++++++++++++--------------------- debian/po/mr.po | 956 +++++++++++++-------------------- debian/po/nb.po | 955 +++++++++++++-------------------- debian/po/ne.po | 962 +++++++++++++-------------------- debian/po/nl.po | 954 +++++++++++++-------------------- debian/po/nn.po | 973 ++++++++++++++-------------------- debian/po/pl.po | 945 +++++++++++++-------------------- debian/po/pt.po | 978 ++++++++++++++-------------------- debian/po/pt_BR.po | 977 ++++++++++++++-------------------- debian/po/ro.po | 1015 ++++++++++++++--------------------- debian/po/ru.po | 949 +++++++++++++-------------------- debian/po/sk.po | 933 +++++++++++++------------------- debian/po/sq.po | 983 ++++++++++++++-------------------- debian/po/sv.po | 1018 ++++++++++++++--------------------- debian/po/ta.po | 919 +++++++++++++------------------- debian/po/templates.pot | 469 ---------------- debian/po/th.po | 895 ++++++++++++------------------- debian/po/tr.po | 941 +++++++++++++-------------------- debian/po/vi.po | 986 ++++++++++++++-------------------- debian/po/wo.po | 1017 ++++++++++++++--------------------- debian/po/zh_CN.po | 857 ++++++++++++------------------ debian/po/zh_TW.po | 867 ++++++++++++------------------ debian/rules | 9 debian/scripts/vars | 15 debian/scripts/vars.alpha | 2 debian/scripts/vars.amd64 | 5 debian/scripts/vars.arm | 2 debian/scripts/vars.armeb | 2 debian/scripts/vars.armel | 2 debian/scripts/vars.hppa | 4 debian/scripts/vars.i386 | 5 debian/scripts/vars.ia64 | 5 debian/scripts/vars.m32r | 2 debian/scripts/vars.m68k | 2 debian/scripts/vars.mips | 2 debian/scripts/vars.mipsel | 2 debian/scripts/vars.powerpc | 2 debian/scripts/vars.ppc64 | 2 debian/scripts/vars.s390 | 3 debian/scripts/vars.sh4 | 2 debian/scripts/vars.sparc | 2 debian/x11-common.config.in | 77 -- debian/x11-common.install | 1 debian/x11-common.links | 2 debian/x11-common.postinst.in | 37 - debian/x11-common.preinst.in | 76 -- debian/x11-common.templates | 44 - debian/xbase-clients.postinst.in | 20 debian/xbase-clients.postrm.in | 20 debian/xbase-clients.preinst.in | 20 debian/xserver-xorg.NEWS | 32 + debian/xserver-xorg.examples | 1 debian/xserver-xorg.install | 2 debian/xserver-xorg.postinst.in | 927 +------------------------------- debian/xserver-xorg.postrm.in | 40 - debian/xserver-xorg.preinst.in | 77 -- debian/xserver-xorg.templates | 181 ------ debian/xsfbs/repack.sh | 32 + debian/xsfbs/xsfbs.sh | 78 -- 102 files changed, 21208 insertions(+), 28422 deletions(-)
New commits: commit 3c79e669b33b2f8f0421eace28834a66ea98ec6e Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Thu Jun 18 01:45:10 2009 +0300 Update the changelog fix a couple of minor merge errors too. diff --git a/debian/changelog b/debian/changelog index 5fae1ea..93291f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,45 @@ +xorg (1:7.4+3ubuntu1) UNRELEASED; urgency=low + + * Merge from Debian unstable. Remaining changes: + - apport/xorg-server-core.py, x11-common.install, x11-common.links: + + apport hook for xorg-server crashes + - control: + + Add xqbiff (<= 0.75-4) to the list of x11-common Conflicts. + + Add a dependency to x11-common for each binary built to save + disk/livecd space. + + Move xfonts-scalable to Recommends. + - local/Failsafe/*, x11-common.install: + + Bulletproof-X. + - local/Xsession: + + If ~/.xsession-errors is bigger than 0.5MiB, truncate it to the last + 0.5MiB to avoid having it grow indefinitively. (This does not happen + with gdm anyway since gdm cleans the file on login). + - local/dexconf: + + Add extra bits for ps3fb xorg.conf. + + dexconf: Bring Device back to the Screen-section, nvidia-settings + and aticonfig need that. + + Add customizations to detect if running in KVM/VBOX environment + and specify the driver, H/V rates, DefaultDepth, etc. + - local/xserver-wrapper.c: + + Stop handling -config specifically in the wrapper, as Xorg now + handles this itself. + - rules: + + Symlink the doc directories to x11-common, explicitly remove the + doc directories on upgrade for the now symlinked doc + directories, to save disk/livecd space. + - scripts/vars.*: + + Don't include radeonhd in video-all. + - scripts/vars.i386: + + Add geode to video-all. + - scripts/vars.lpia: + + Copied from vars.i386. + - x11-common.postinst.in, postrm.in, preinst.in: + + Remove old configuration files. + - xserver-xorg.postinst.in: + + Migrate psb users to vesa. + + -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 18 Jun 2009 01:19:44 +0300 + xorg (1:7.4+3) unstable; urgency=low * Call db_stop at the end of xserver-xorg.postinst, otherwise debconf gets diff --git a/debian/control b/debian/control index 10b3cf6..c4a5a24 100644 --- a/debian/control +++ b/debian/control @@ -210,7 +210,7 @@ Description: miscellaneous X clients - metapackage Package: xutils Section: x11 Architecture: all -Depends: x11-xfs-utils, x11-utils, x11-xserver-utils, x11-session-utils, xfonts-utils, xutils-dev, x11-common +Depends: x11-xfs-utils, x11-utils, x11-xserver-utils, x11-session-utils, xfonts-utils, x11-common Description: X Window System utility programs metapackage xutils provides a set of utility programs shipped with the X Window System. Many of these programs are useful even on a system that does not have any X diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64 index 4ac03e7..d1db431 100755 --- a/debian/scripts/vars.amd64 +++ b/debian/scripts/vars.amd64 @@ -30,6 +30,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-v4l, \ xserver-xorg-video-vmware" + XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ xserver-xorg-input-synaptics, \ xserver-xorg-input-wacom" commit 88aa2e16c6910be094ed7163bf7c9f11500a3e77 Author: Julien Cristau <jcris...@debian.org> Date: Wed Jun 10 16:50:30 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 85c431b..b70d93f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -xorg (1:7.4+3) UNRELEASED; urgency=low +xorg (1:7.4+3) unstable; urgency=low * Call db_stop at the end of xserver-xorg.postinst, otherwise debconf gets confused and makes the postinst hang after restarting hal (closes: #532623). - -- Julien Cristau <jcris...@debian.org> Wed, 10 Jun 2009 16:42:48 +0200 + -- Julien Cristau <jcris...@debian.org> Wed, 10 Jun 2009 16:50:27 +0200 xorg (1:7.4+2) unstable; urgency=low commit d943f22265046a02f5be8c9ee616369f5b24b57c Author: Julien Cristau <jcris...@debian.org> Date: Wed Jun 10 16:50:01 2009 +0200 Call db_stop at the end of xserver-xorg.postinst If we don't do that, debconf gets confused and makes the postinst hang after restarting hal (closes: #532623). diff --git a/debian/changelog b/debian/changelog index 60c66c6..85c431b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xorg (1:7.4+3) UNRELEASED; urgency=low + + * Call db_stop at the end of xserver-xorg.postinst, otherwise debconf gets + confused and makes the postinst hang after restarting hal + (closes: #532623). + + -- Julien Cristau <jcris...@debian.org> Wed, 10 Jun 2009 16:42:48 +0200 + xorg (1:7.4+2) unstable; urgency=low [ David Nusinow ] diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in index 4ddc049..f7ae600 100644 --- a/debian/xserver-xorg.postinst.in +++ b/debian/xserver-xorg.postinst.in @@ -151,6 +151,8 @@ case "$1" in ;; esac +db_stop + exit 0 # vim:set ai et sts=2 sw=2 tw=0: commit 68eec02013edf476e2a8fb5c8dca41c2026d97eb Author: Julien Cristau <jcris...@debian.org> Date: Tue Jun 9 17:32:20 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 1d34b1b..60c66c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg (1:7.4+2) UNRELEASED; urgency=low +xorg (1:7.4+2) unstable; urgency=low [ David Nusinow ] * Don't discuss removal of xserver-xorg in its description. @@ -52,7 +52,7 @@ xorg (1:7.4+2) UNRELEASED; urgency=low * Bengali added * Slovak updated (closes: #523448). - -- David Nusinow <dnusi...@debian.org> Sat, 18 Apr 2009 17:14:13 -0400 + -- Julien Cristau <jcris...@debian.org> Tue, 09 Jun 2009 17:32:10 +0200 xorg (1:7.4+1) unstable; urgency=low commit 8bf2f1ee374e4d4fe231633a55502914623a4dd6 Author: Julien Cristau <jcris...@debian.org> Date: Tue Jun 9 17:31:35 2009 +0200 Redirect stdout when restarting hal, to avoid messing with debconf diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in index b37cdb0..4ddc049 100644 --- a/debian/xserver-xorg.postinst.in +++ b/debian/xserver-xorg.postinst.in @@ -146,7 +146,7 @@ case "$1" in update-rc.d xserver-xorg remove || true fi if dpkg --compare-versions "$2" lt "1:7.4"; then - invoke-rc.d hal restart + invoke-rc.d hal restart >/dev/null fi ;; esac commit 1f771fd351e078fe8e8ec278083c562442c3e189 Author: Julien Cristau <jcris...@debian.org> Date: Tue Jun 9 17:19:30 2009 +0200 Stop depending on sparc-utils. xserver-xorg.postinst doesn't run any detection programs anymore. diff --git a/debian/changelog b/debian/changelog index 2385f9d..1d34b1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,8 @@ xorg (1:7.4+2) UNRELEASED; urgency=low * xserver-xorg.{preinst,postinst,postrm}: stop using /var/lib/x11. * control: xserver-xorg doesn't provide infrastructure for managing xorg.conf anymore, remove that from the description. + * Stop depending on sparc-utils. xserver-xorg.postinst doesn't run any + detection programs anymore. [ Debconf translations ] * Bengali added diff --git a/debian/control b/debian/control index cb71e6d..a80473b 100644 --- a/debian/control +++ b/debian/control @@ -118,7 +118,7 @@ Description: the X.Org X server -- input driver metapackage Package: xorg Architecture: any -Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libgl1-mesa-dri, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), x11-apps, x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, xauth, xinit, xfonts-utils, xkb-data, xorg-docs-core, xterm | x-terminal-emulator, sparc-utils [sparc] +Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libgl1-mesa-dri, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), x11-apps, x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, xauth, xinit, xfonts-utils, xkb-data, xorg-docs-core, xterm | x-terminal-emulator Provides: x-window-system, x-window-system-core Suggests: xorg-docs Description: X.Org X Window System commit d8421fcfe0bd6d9b04b72d728bd5f45f22a113e6 Author: Julien Cristau <jcris...@debian.org> Date: Tue Jun 9 17:17:01 2009 +0200 Don't pretend that xserver-xorg manages xorg.conf xserver-xorg doesn't provide infrastructure for managing xorg.conf anymore, remove that from the description. diff --git a/debian/changelog b/debian/changelog index 96b436f..2385f9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,8 @@ xorg (1:7.4+2) UNRELEASED; urgency=low don't need to keep a checksum of the config file to know whether the user customized it. * xserver-xorg.{preinst,postinst,postrm}: stop using /var/lib/x11. + * control: xserver-xorg doesn't provide infrastructure for managing + xorg.conf anymore, remove that from the description. [ Debconf translations ] * Bengali added diff --git a/debian/control b/debian/control index c8e4589..cb71e6d 100644 --- a/debian/control +++ b/debian/control @@ -96,8 +96,7 @@ Depends: Recommends: libgl1-mesa-dri, udev Description: the X.Org X server This package depends on the full suite of the server and drivers for the - X.Org X server, as well as providing a configuration infrastructure to manage - xorg.conf. It does not provide the actual server itself. + X.Org X server. It does not provide the actual server itself. Package: xserver-xorg-video-all Architecture: any commit c32d88eb6a321ea5a6490b58335c2b70e5a2b9ae Author: Julien Cristau <jcris...@debian.org> Date: Tue Jun 9 16:09:15 2009 +0200 xserver-xorg.{preinst,postinst,postrm}: stop using /var/lib/x11. The server symlink is not managed by multiple packages anymore, so keeping a checksum and list of handlers is unnecessary. We also don't manage xorg.conf anymore, so we can remove this stuff on upgrade and purge. diff --git a/debian/changelog b/debian/changelog index 8e5656e..96b436f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,7 @@ xorg (1:7.4+2) UNRELEASED; urgency=low creating an empty xorg.conf in preinst. Now that we don't run dexconf, we don't need to keep a checksum of the config file to know whether the user customized it. + * xserver-xorg.{preinst,postinst,postrm}: stop using /var/lib/x11. [ Debconf translations ] * Bengali added diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in index e00c621..b37cdb0 100644 --- a/debian/xserver-xorg.postinst.in +++ b/debian/xserver-xorg.postinst.in @@ -54,13 +54,8 @@ debug_echo "Configuring $THIS_PACKAGE." #DEBHELPER# -# register this package as a (potential) handler of the X server symlink -if ! fgrep -qsx "$THIS_PACKAGE" "$SERVER_SYMLINK_ROSTER"; then - echo "$THIS_PACKAGE" >> "$SERVER_SYMLINK_ROSTER" -fi - -# only mess with the server symlink file if it is a symbolic link or does -# not exist. otherwise, assume that's the way the user wants it. +# only mess with the server symlink file if it does not exist. otherwise, +# assume that's the way the user wants it. if ! [ -e "$SERVER_SYMLINK" ]; then ln -s "$THIS_SERVER" "$SERVER_SYMLINK" # recover from an old bug @@ -72,7 +67,6 @@ fi if [ -n "$UPGRADE" ]; then if dpkg --compare-versions "$2" le "1:7.3+5"; then # Clean up our old crap - rm -f "$SERVER_SYMLINK_CHECKSUM" "$SERVER_SYMLINK_ROSTER" for QUESTION in "shared/default-x-server" \ "xserver-xorg/autodetect_mouse" \ "xserver-xorg/autodetect_monitor" \ @@ -119,6 +113,7 @@ if [ -n "$UPGRADE" ]; then db_unregister xserver-xorg/config/device/bus_id || true db_unregister xserver-xorg/config/device/bus_id_error || true rm -f "$XORGCONFIG_ROSTER" "$XORGCONFIG_CHECKSUM" + rm -f "$SERVER_SYMLINK_CHECKSUM" "$SERVER_SYMLINK_ROSTER" fi fi diff --git a/debian/xserver-xorg.postrm.in b/debian/xserver-xorg.postrm.in index 6fd7df4..4fd7aca 100644 --- a/debian/xserver-xorg.postrm.in +++ b/debian/xserver-xorg.postrm.in @@ -29,43 +29,9 @@ THIS_SERVER=/usr/bin/Xorg # clean up non-conffile configuration files and related materials on purge if [ "$1" = "purge" ]; then rm -f "$SERVER_SYMLINK" - - # de-register this file as a handler of the Xorg 4.x X server configuration - # file - if [ -e "$XORGCONFIG_ROSTER" ]; then - # check existing roster file for our package name - if fgrep -qx "$THIS_PACKAGE" "$XORGCONFIG_ROSTER"; then - # construct temporary roster file with our package name removed, ignoring - # failure - fgrep -vx "$THIS_PACKAGE" "$XORGCONFIG_ROSTER" > \ - "$XORGCONFIG_ROSTER.dpkg-tmp" || true - # is there anything left? - if [ -s "$XORGCONFIG_ROSTER.dpkg-tmp" ]; then - # yes, replace the roster file - mv "$XORGCONFIG_ROSTER.dpkg-tmp" "$XORGCONFIG_ROSTER" - else - # no; remove both the roster and our temporary copy - rm -f "$XORGCONFIG_ROSTER" "$XORGCONFIG_ROSTER.dpkg-tmp" - # remove Xorg X server configuration file if it was still - # managed by the package - if [ -e "$XORGCONFIG_CHECKSUM" ]; then - # does it exist? - if [ -e "$XORGCONFIG" ]; then - # does the current MD5 checksum match the stored checksum? - if [ "$(md5sum "$XORGCONFIG")" \ - = "$(cat "$XORGCONFIG_CHECKSUM")" ]; then - # yes; remove the config file - rm -f "$XORGCONFIG" - fi - fi - # remove the checksum file; any remaining XFree86 4.x X server - # configuration file still on the system at this point is no longer - # being managed (local user customization) - rm -f "$XORGCONFIG_CHECKSUM" - fi - fi - fi - fi + rm -f "$XORGCONFIG_CHECKSUM" "$XORGCONFIG_ROSTER" + rm -f "$SERVER_SYMLINK_CHECKSUM" "$SERVER_SYMLINK_ROSTER" + rm -f "$XORGCONFIG" for DIR in "$CONFIG_DIR" "$CONFIG_AUX_DIR"; do rmdir "$DIR" 2> /dev/null || true diff --git a/debian/xserver-xorg.preinst.in b/debian/xserver-xorg.preinst.in index eae0d2b..ac45c24 100644 --- a/debian/xserver-xorg.preinst.in +++ b/debian/xserver-xorg.preinst.in @@ -15,22 +15,14 @@ THIS_SCRIPT=preinst CONFIG_DIR=/etc/X11 SERVER_SYMLINK="$CONFIG_DIR/X" CONFIG_AUX_DIR=/var/lib/x11 -SERVER_SYMLINK_CHECKSUM_BASE="${SERVER_SYMLINK##*/}.md5sum" -SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/$SERVER_SYMLINK_CHECKSUM_BASE" -SERVER_SYMLINK_ROSTER_BASE="${SERVER_SYMLINK##*/}.roster" -SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/$SERVER_SYMLINK_ROSTER_BASE" THIS_SERVER=/usr/bin/Xorg -UNCONFIGURED_LINK_TARGET=$(which true) if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then - # create the configuration files' main and auxiliary directories if they - # don't exist - for DIR in "$CONFIG_DIR" "$CONFIG_AUX_DIR"; do - if ! [ -e "$DIR" ]; then - observe "creating $DIR" - mkdir --mode=755 --parents "$DIR" - fi - done + # create the configuration files directory if it doesn't exist + if ! [ -e "$CONFIG_DIR" ]; then + observe "creating $CONFIG_DIR" + mkdir --mode=755 --parents "$CONFIG_DIR" + fi fi case "$1" in commit 43ae9085fa728bca9c2bd49d4dd762af95a6f60c Author: Julien Cristau <jcris...@debian.org> Date: Tue Jun 9 15:51:05 2009 +0200 xserver-xorg.{pre,post}inst: drop xorg.conf checksum handling. Stop creating an empty xorg.conf in preinst. Now that we don't run dexconf, we don't need to keep a checksum of the config file to know whether the user customized it. diff --git a/debian/changelog b/debian/changelog index a3a82a3..8e5656e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,10 @@ xorg (1:7.4+2) UNRELEASED; urgency=low 2.20.7-5. * xserver-xorg.preinst: drop migration code from /var/lib/xfree86 to /var/lib/x11. + * xserver-xorg.{pre,post}inst: drop xorg.conf checksum handling. Stop + creating an empty xorg.conf in preinst. Now that we don't run dexconf, we + don't need to keep a checksum of the config file to know whether the user + customized it. [ Debconf translations ] * Bengali added diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in index 3c01a09..e00c621 100644 --- a/debian/xserver-xorg.postinst.in +++ b/debian/xserver-xorg.postinst.in @@ -54,13 +54,10 @@ debug_echo "Configuring $THIS_PACKAGE." #DEBHELPER# -# register this package as a (potential) handler of the X server symlink and -# X.Org X server configuration file -for ROSTER in "$SERVER_SYMLINK_ROSTER" "$XORGCONFIG_ROSTER"; do - if ! fgrep -qsx "$THIS_PACKAGE" "$ROSTER"; then - echo "$THIS_PACKAGE" >> "$ROSTER" - fi -done +# register this package as a (potential) handler of the X server symlink +if ! fgrep -qsx "$THIS_PACKAGE" "$SERVER_SYMLINK_ROSTER"; then + echo "$THIS_PACKAGE" >> "$SERVER_SYMLINK_ROSTER" +fi # only mess with the server symlink file if it is a symbolic link or does # not exist. otherwise, assume that's the way the user wants it. @@ -121,6 +118,7 @@ if [ -n "$UPGRADE" ]; then if dpkg --compare-versions "$2" lt-nl 1:7.4+2; then db_unregister xserver-xorg/config/device/bus_id || true db_unregister xserver-xorg/config/device/bus_id_error || true + rm -f "$XORGCONFIG_ROSTER" "$XORGCONFIG_CHECKSUM" fi fi @@ -135,16 +133,6 @@ if dpkg --compare-versions "$2" lt-nl "1:7.4~3"; then } ' $XORGCONFIG > ${XORGCONFIG}.madwizard-new if ! cmp -s $XORGCONFIG ${XORGCONFIG}.madwizard-new; then - # compare the current and stored checksums; if they do not match, assume - # that's the way the user wants it. - if [ "$(md5sum "$XORGCONFIG")" != "$(cat "$XORGCONFIG_CHECKSUM")" ]; then - BACKUP_XORGCONFIG="$XORGCONFIG.$(date '+%Y%m%d%H%M%S')" - warn "$XORGCONFIG has been customized, but we need to make updates. Backing up your config to $BACKUP_XORGCONFIG. If we screw something up, restore using this file." - cp "$XORGCONFIG" "$BACKUP_XORGCONFIG" - else - # checksums match, update the checksum - md5sum "${XORGCONFIG}.madwizard-new" > "$XORGCONFIG_CHECKSUM" - fi chown --reference=$XORGCONFIG ${XORGCONFIG}.madwizard-new chmod --reference=$XORGCONFIG ${XORGCONFIG}.madwizard-new mv ${XORGCONFIG}.madwizard-new $XORGCONFIG diff --git a/debian/xserver-xorg.preinst.in b/debian/xserver-xorg.preinst.in index a17d2d0..eae0d2b 100644 --- a/debian/xserver-xorg.preinst.in +++ b/debian/xserver-xorg.preinst.in @@ -14,17 +14,11 @@ THIS_SCRIPT=preinst CONFIG_DIR=/etc/X11 SERVER_SYMLINK="$CONFIG_DIR/X" -XF86CONFIG="$CONFIG_DIR/XF86Config-4" -XORGCONFIG="$CONFIG_DIR/xorg.conf" CONFIG_AUX_DIR=/var/lib/x11 SERVER_SYMLINK_CHECKSUM_BASE="${SERVER_SYMLINK##*/}.md5sum" SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/$SERVER_SYMLINK_CHECKSUM_BASE" SERVER_SYMLINK_ROSTER_BASE="${SERVER_SYMLINK##*/}.roster" SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/$SERVER_SYMLINK_ROSTER_BASE" -XORGCONFIG_CHECKSUM_BASE="${XORGCONFIG##*/}.md5sum" -XORGCONFIG_CHECKSUM="$CONFIG_AUX_DIR/$XORGCONFIG_CHECKSUM_BASE" -XORGCONFIG_ROSTER_BASE="${XORGCONFIG##*/}.roster" -XORGCONFIG_ROSTER="$CONFIG_AUX_DIR/$XORGCONFIG_ROSTER_BASE" THIS_SERVER=/usr/bin/Xorg UNCONFIGURED_LINK_TARGET=$(which true) @@ -37,18 +31,6 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then mkdir --mode=755 --parents "$DIR" fi done - - # implement (simplified) ucf-style configration file handling - - # if performing a fresh install, place config files under management if they - # do *not* already exist - if [ "$1" = "install" ]; then - if ! [ -e "$XORGCONFIG" ]; then - # cheap, fork()-free version of "touch" - : > "$XORGCONFIG" - md5sum "$XORGCONFIG" > "$XORGCONFIG_CHECKSUM" - fi - fi fi case "$1" in commit 01db5f0be45e8aa0e39221919a9c715500495045 Author: Julien Cristau <jcris...@debian.org> Date: Tue Jun 9 15:26:26 2009 +0200 xserver-xorg.preinst: drop migration code from /var/lib/xfree86 to /var/lib/x11 diff --git a/debian/changelog b/debian/changelog index 937e186..a3a82a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ xorg (1:7.4+2) UNRELEASED; urgency=low debconf templates and maintainer scripts handling. * Don't ship the /usr/X11R6/bin symlink in x11-common. Break gdm << 2.20.7-5. + * xserver-xorg.preinst: drop migration code from /var/lib/xfree86 to + /var/lib/x11. [ Debconf translations ] * Bengali added diff --git a/debian/xserver-xorg.preinst.in b/debian/xserver-xorg.preinst.in index 05dccef..a17d2d0 100644 --- a/debian/xserver-xorg.preinst.in +++ b/debian/xserver-xorg.preinst.in @@ -38,49 +38,6 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then fi done - # the transition from /var/lib/xfree86 to /var/lib/x11 occurred in - # 7.0.0-0ubuntu1 and 1:7.0.0 - if [ -n "$2" ] && \ - dpkg --compare-versions "$2" lt "1:7.0.11"; then - if [ -e "/var/lib/xfree86" ]; then - if [ -e "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE" ]; then \ - if fgrep -qx "$THIS_PACKAGE" \ - "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE"; then - # construct temporary roster file with our package name removed, ignoring - # failure - fgrep -vx "$THIS_PACKAGE" \ - "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE" > \ - "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE.dpkg-tmp" 2>/dev/null \ - || true - - # is there anything left? - if [ -s "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE.dpkg-tmp" ]; then - # yes, replace the roster file - mv "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE.dpkg-tmp" \ - "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE" - else - # no; remove both the original and our temporary copy - rm -f "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE" \ - "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE.dpkg-tmp" - fi - fi - fi - - if [ -e "/var/lib/xfree86/$XORGCONFIG_CHECKSUM_BASE" ]; then - # migrate the checksum if it doesn't exist - if [ -e "$XORGCONFIG_CHECKSUM" ]; then - rm "/var/lib/xfree86/$XORGCONFIG_CHECKSUM_BASE" - else - mv "/var/lib/xfree86/$XORGCONFIG_CHECKSUM_BASE" \ - "$CONFIG_AUX_DIR" || \ - error "Could not move the xorg.conf.md5sum for some reason" - fi - fi - - rmdir /var/lib/xfree86 2>/dev/null || true - fi - fi - # implement (simplified) ucf-style configration file handling # if performing a fresh install, place config files under management if they commit 559a21e88e9c558c801ee470f2be4a18a34cfd8d Author: Julien Cristau <jcris...@debian.org> Date: Tue Jun 9 15:21:17 2009 +0200 Don't ship the /usr/X11R6/bin symlink in x11-common. Break gdm << 2.20.7-5. diff --git a/debian/changelog b/debian/changelog index 672689c..937e186 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ xorg (1:7.4+2) UNRELEASED; urgency=low templates. * Drop support for renicing the X server from the wrapper. Remove related debconf templates and maintainer scripts handling. + * Don't ship the /usr/X11R6/bin symlink in x11-common. Break gdm << + 2.20.7-5. [ Debconf translations ] * Bengali added diff --git a/debian/control b/debian/control index 0f0dc72..c8e4589 100644 --- a/debian/control +++ b/debian/control @@ -64,6 +64,7 @@ Conflicts: xfree86-common, xorg-common, xserver-common (<< 7), x-common, ucbmpeg-play (<< 2.3p-13), netscape-base-4, communicator-smotif-477, epan, navigator-smotif-477, stella (<< 2.2-1), xfractint (<< 20.3.01-1), xgobi, xpostitplus, xisp, vide (<= 1.21-3) +Breaks: gdm (<< 2.20.7-5) Replaces: xfree86-common, xorg-common, xserver-common (<< 7), x-common Description: X Window System (X.Org) infrastructure x11-common contains the filesystem infrastructure required for further diff --git a/debian/x11-common.links b/debian/x11-common.links index e707811..2cf8af5 100644 --- a/debian/x11-common.links +++ b/debian/x11-common.links @@ -1,3 +1,2 @@ usr/bin usr/bin/X11 etc/X11/rgb.txt usr/share/X11/rgb.txt -usr/bin usr/X11R6/bin commit 5021ba0d9b348296c1aaea492bc50223e7eb062f Author: Julien Cristau <jcris...@debian.org> Date: Tue Jun 2 21:06:21 2009 +0200 Add a small todo list for this package diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 0000000..973d2cc --- /dev/null +++ b/debian/TODO @@ -0,0 +1,4 @@ +* Xwrapper.config should really move away from x11-common, now that we + only have one X server to deal with +* Merge xserver-xorg and xserver-xorg-core? What about the circular dep? + commit bd0391d1ed24aaf2defc39b0609e6c2878753230 Author: Julien Cristau <jcris...@debian.org> Date: Tue Jun 2 20:32:56 2009 +0200 update po files diff --git a/debian/po/ar.po b/debian/po/ar.po index 2a1db02..46e8ed2 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ar\n" "Report-Msgid-Bugs-To: x...@packages.debian.org\n" -"POT-Creation-Date: 2009-05-25 15:28+0200\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" "PO-Revision-Date: 2008-06-12 03:41+0300\n" "Last-Translator: Ossama M. Khayat <okha...@yahoo.com>\n" "Language-Team: Arabic <supp...@arabeyes.org>\n" @@ -60,110 +60,81 @@ msgstr "" "يمكنه تشغيل خادم X. لذا، فإن الحل الأمثل لهذه المعضلة هو السماح فقط لمستخدمي " "النظام عبر أحد الطرفيات الوهمية." -#. Type: string -#. Description -#: ../x11-common.templates:4001 -msgid "Nice value for the X server:" -msgstr "قيمة nice لخادم X:" +#~ msgid "Nice value for the X server:" +#~ msgstr "قيمة nice لخادم X:" -#. Type: string -#. Description -#: ../x11-common.templates:4001 -msgid "" -"When using operating system kernels with a particular scheduling strategy, " -"it has been widely noted that the X server's performance improves when it is " -"run at a higher process priority than the default; a process's priority is " -"known as its \"nice\" value. These values range from -20 (extremely high " -"priority, or \"not nice\" to other processes) to 19 (extremely low " -"priority). The default nice value for ordinary processes is 0, and this is " -"also the recommend value for the X server." -msgstr "" -"عند استخدام نواة نظام تشغيل ذات استراتيجية جدولة معينة، لوحظ بشكل كبير بأن " -"كفاءة خادم X تتحسن عند تشغيله بأولوية عملية أعلى من الافتراضية، والتي تعرف " -"بقيمة \"nice\". وتتراوح هذه القيمة بين -20 (والتي هي الأولوية المرتفعة جداً، " -"أو التي \"ليست لطيفة\" للعمليات الأخرى) إلى 19 (والتي هي الأولوية المنخفضة " -"جداً). تكون قيمة nice للعمليات العادية هي 0، وهذه هي القيمة المستحسنة أيضاً " -"لخادم X." - -#. Type: string -#. Description -#: ../x11-common.templates:4001 -msgid "" -"Values outside the range of -10 to 0 are not recommended; too negative, and " -"the X server will interfere with important system tasks. Too positive, and " -"the X server will be sluggish and unresponsive." -msgstr "" -"القيم التي تقل عن -10 أو تزيد عن 0 ليست مستحسنة؛ فإن كانت أقل من -10 فإن " -"خادم X سيتعارض مع مهام النظام الضرورية. وإن كانت أكبر من 0 فستبطئ عمل خادم X " -"وتثبطه." +#~ msgid "" +#~ "When using operating system kernels with a particular scheduling " +#~ "strategy, it has been widely noted that the X server's performance " +#~ "improves when it is run at a higher process priority than the default; a " +#~ "process's priority is known as its \"nice\" value. These values range " +#~ "from -20 (extremely high priority, or \"not nice\" to other processes) to " +#~ "19 (extremely low priority). The default nice value for ordinary " +#~ "processes is 0, and this is also the recommend value for the X server." +#~ msgstr "" +#~ "عند استخدام نواة نظام تشغيل ذات استراتيجية جدولة معينة، لوحظ بشكل كبير " +#~ "بأن كفاءة خادم X تتحسن عند تشغيله بأولوية عملية أعلى من الافتراضية، والتي " +#~ "تعرف بقيمة \"nice\". وتتراوح هذه القيمة بين -20 (والتي هي الأولوية " +#~ "المرتفعة جداً، أو التي \"ليست لطيفة\" للعمليات الأخرى) إلى 19 (والتي هي " +#~ "الأولوية المنخفضة جداً). تكون قيمة nice للعمليات العادية هي 0، وهذه هي " +#~ "القيمة المستحسنة أيضاً لخادم X." -#. Type: note -#. Description -#: ../x11-common.templates:5001 -msgid "Incorrect nice value" -msgstr "قيمة nice غير صالحة" +#~ msgid "" +#~ "Values outside the range of -10 to 0 are not recommended; too negative, " +#~ "and the X server will interfere with important system tasks. Too " +#~ "positive, and the X server will be sluggish and unresponsive." +#~ msgstr "" +#~ "القيم التي تقل عن -10 أو تزيد عن 0 ليست مستحسنة؛ فإن كانت أقل من -10 فإن " +#~ "خادم X سيتعارض مع مهام النظام الضرورية. وإن كانت أكبر من 0 فستبطئ عمل " +#~ "خادم X وتثبطه." -#. Type: note -#. Description -#: ../x11-common.templates:5001 -msgid "Please enter an integer between -20 and 19." -msgstr "الرجاء إدخال قيمة صحيحة بين -20 و 19" +#~ msgid "Incorrect nice value" +#~ msgstr "قيمة nice غير صالحة" -#. Type: note -#. Description -#: ../x11-common.templates:6001 -msgid "Major possible upgrade issues" -msgstr "قد تكون هناك مشاكل عامة في الترقية" +#~ msgid "Please enter an integer between -20 and 19." +#~ msgstr "الرجاء إدخال قيمة صحيحة بين -20 و 19" -#. Type: note -#. Description -#: ../x11-common.templates:6001 -msgid "" -"Some users have reported that upon upgrade to the current package set, their " -"xserver package was no longer installed. Because there is no easy way around " -"this problem, you should be sure to check that the xserver-xorg package is " -"installed after upgrade. If it is not installed and you require it, it is " -"recommended that you install the xorg package to make sure you have a fully " -"functional X setup." -msgstr "" -"أبلغنا بعض المستخدمين بأنه عند الترقية إلى مجموعة الحزم الحالية، فإن حزمة " -"xserver لا يتم تثبيتها. ولإنه ليست هناك طريقة سهلة لحل هذه المعضلة، فعليك " -"بالتأكد من تثبيت حزمة xserver-xorg بعد الترقية. إن تكن الحزمة مثبتةً وكنت " -"بحاجة لها، فمن المستحسن أن تقوم بتثبيت حزمة xorg كي تضمن الحصول على إعداد " -"لخادم X يمكنك العمل به." +#~ msgid "Major possible upgrade issues" +#~ msgstr "قد تكون هناك مشاكل عامة في الترقية" -#. Type: note -#. Description -#: ../x11-common.templates:7001 -msgid "Cannot remove /usr/X11R6/bin directory" -msgstr "لا يمكن إزالة الدليل /usr/X11R6/bin" +#~ msgid "" +#~ "Some users have reported that upon upgrade to the current package set, " +#~ "their xserver package was no longer installed. Because there is no easy " +#~ "way around this problem, you should be sure to check that the xserver-" +#~ "xorg package is installed after upgrade. If it is not installed and you " +#~ "require it, it is recommended that you install the xorg package to make " +#~ "sure you have a fully functional X setup." +#~ msgstr "" +#~ "أبلغنا بعض المستخدمين بأنه عند الترقية إلى مجموعة الحزم الحالية، فإن حزمة " +#~ "xserver لا يتم تثبيتها. ولإنه ليست هناك طريقة سهلة لحل هذه المعضلة، فعليك " +#~ "بالتأكد من تثبيت حزمة xserver-xorg بعد الترقية. إن تكن الحزمة مثبتةً وكنت " +#~ "بحاجة لها، فمن المستحسن أن تقوم بتثبيت حزمة xorg كي تضمن الحصول على إعداد " +#~ "لخادم X يمكنك العمل به." -#. Type: note -#. Description -#: ../x11-common.templates:7001 -msgid "" -"This upgrade requires that the /usr/X11R6/bin directory be removed and " -"replaced with a symlink. An attempt was made to do so, but it failed, most " -"likely because the directory is not yet empty. You must move the files that " -"are currently in the directory out of the way so that the installation can " -"complete. If you like, you may move them back after the symlink is in place." -msgstr "" -"تتطلب عملية الترقية هذه إزالة الدليل /usr/X11R6/bin و استبداله برابط رمزي. " -"لقد حاولنا القيام بذلك، ولكن العملية فشلت، ويبدو أن هذا بسبب أن الدليل غير " -"فارغ. عليك بنقل الملفات الموجودة حالياً في الدليل كي يتمكن برنامج التثبيت من " -"إتمام هذه العملية. إن أردت، يمكن إعادة الملفات إلى حيث كانت بعد إنشاء الرابط " -"الرمزي." +#~ msgid "Cannot remove /usr/X11R6/bin directory" +#~ msgstr "لا يمكن إزالة الدليل /usr/X11R6/bin" -#. Type: note -#. Description -#: ../x11-common.templates:7001 -msgid "" -"This package installation will now fail and exit so that you can do this. " -"Please re-run your upgrade procedure after you have cleaned out the " -"directory." -msgstr "" -"ستفشل عملية تثبيت الحزمة هذه وتتوقف كي تستطيع القيام بهذا. الرجاء إعادة " -"تشغيل عملية الترقية بعد أن تنتهي من تنظيف الدليل." +#~ msgid "" +#~ "This upgrade requires that the /usr/X11R6/bin directory be removed and " +#~ "replaced with a symlink. An attempt was made to do so, but it failed, " +#~ "most likely because the directory is not yet empty. You must move the " +#~ "files that are currently in the directory out of the way so that the " +#~ "installation can complete. If you like, you may move them back after the " +#~ "symlink is in place." +#~ msgstr "" +#~ "تتطلب عملية الترقية هذه إزالة الدليل /usr/X11R6/bin و استبداله برابط " +#~ "رمزي. لقد حاولنا القيام بذلك، ولكن العملية فشلت، ويبدو أن هذا بسبب أن " +#~ "الدليل غير فارغ. عليك بنقل الملفات الموجودة حالياً في الدليل كي يتمكن " +#~ "برنامج التثبيت من إتمام هذه العملية. إن أردت، يمكن إعادة الملفات إلى حيث " +#~ "كانت بعد إنشاء الرابط الرمزي." + +#~ msgid "" +#~ "This package installation will now fail and exit so that you can do this. " +#~ "Please re-run your upgrade procedure after you have cleaned out the " +#~ "directory." +#~ msgstr "" +#~ "ستفشل عملية تثبيت الحزمة هذه وتتوقف كي تستطيع القيام بهذا. الرجاء إعادة " +#~ "تشغيل عملية الترقية بعد أن تنتهي من تنظيف الدليل." #~ msgid "Video card's bus identifier:" #~ msgstr "مُعرّف ناقل بطاقة الفيديو:" diff --git a/debian/po/ast.po b/debian/po/ast.po index fec2ad4..793f4e1 100644 --- a/debian/po/ast.po +++ b/debian/po/ast.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xorg_po\n" "Report-Msgid-Bugs-To: x...@packages.debian.org\n" -"POT-Creation-Date: 2009-05-25 15:28+0200\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" "PO-Revision-Date: 2009-01-12 08:33+0100\n" "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costa...@gmail." "com>\n" @@ -62,114 +62,87 @@ msgstr "" "que'l sirvidor X lu anicien namái usuarios que tengan entrao per una de les " "consoles virtuales." -#. Type: string -#. Description -#: ../x11-common.templates:4001 -msgid "Nice value for the X server:" -msgstr "Bon valor (nice) pal sirividor X:" +#~ msgid "Nice value for the X server:" +#~ msgstr "Bon valor (nice) pal sirividor X:" -#. Type: string -#. Description -#: ../x11-common.templates:4001 -msgid "" -"When using operating system kernels with a particular scheduling strategy, " -"it has been widely noted that the X server's performance improves when it is " -"run at a higher process priority than the default; a process's priority is " -"known as its \"nice\" value. These values range from -20 (extremely high " -"priority, or \"not nice\" to other processes) to 19 (extremely low " -"priority). The default nice value for ordinary processes is 0, and this is " -"also the recommend value for the X server." -msgstr "" -"Cuando s'usen núcleos del sistema operativu configurados con una estratexa " -"particular de planificación de procesos, ta enantadamente demostrao que'l " -"rendimientu del sirvidor X meyora si s'executa con una prioridá mayor que la " -"predeterminada; la prioridá d'un procesu conozse como'l so valor de \"nice" -"\" (amabilidá). Ésti pue cimblar ente -20 (una prioridá estremadamente alta, " -"o nada amable (\"not nice\") col restu de procesos) hasta 19 (una prioridá " -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org