X Strike Force XFree86 SVN commit: r1756 - trunk/debian
Author: branden Date: 2004-08-28 00:49:17 -0500 (Sat, 28 Aug 2004) New Revision: 1756 Modified: trunk/debian/CHANGESETS trunk/debian/rules Log: Don't run sort without setting LC_ALL=C, or unexpected things will happen. Thanks to Guillem Jover for diagnosing this problem (see Debian #268116). Modified: trunk/debian/CHANGESETS === --- trunk/debian/CHANGESETS 2004-08-25 17:00:50 UTC (rev 1755) +++ trunk/debian/CHANGESETS 2004-08-28 05:49:17 UTC (rev 1756) @@ -143,7 +143,7 @@ + Reduce the build time by 20 to 30 percent when the binary-arch target is used (ccache users might see even more improvement). + Make the buildd admins hate us less. -1658, 1659, 1661, 1670, 1671, 1679, 1681 +1658, 1659, 1661, 1670, 1671, 1679, 1681, 1756 Fix missing element of Debian X FAQ conversion to XHTML; correct s390-specific version of xfree86-common dh_installdocs file to recognize Modified: trunk/debian/rules === --- trunk/debian/rules 2004-08-25 17:00:50 UTC (rev 1755) +++ trunk/debian/rules 2004-08-28 05:49:17 UTC (rev 1756) @@ -352,12 +352,12 @@ # Construct MANIFEST files from MANIFEST.$(ARCH).in and # MANIFEST.$(ARCH).all or MANIFEST.all. if expr $(findstring -DBuildFonts=NO,$(IMAKE_DEFINES)) : -DBuildFonts=NO /dev/null 21; then \ - sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH); \ + LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH); \ else \ if [ -e debian/MANIFEST.$(ARCH).all ]; then \ - sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all debian/MANIFEST.$(ARCH); \ + LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all debian/MANIFEST.$(ARCH); \ else \ - sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all debian/MANIFEST.$(ARCH); \ + LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all debian/MANIFEST.$(ARCH); \ fi; \ fi # confirm that the installed file list has not changed
Bug#268116: marked as done (xfree86: may FTBFS if current locale makes sort ordering differ)
Your message dated Sat, 28 Aug 2004 00:51:15 -0500 with message-id [EMAIL PROTECTED] and subject line fixed bug has caused the attached Bug report to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what I am talking about this indicates a serious mail system misconfiguration somewhere. Please contact me immediately.) Debian bug tracking system administrator (administrator, Debian Bugs database) -- Received: (at submit) by bugs.debian.org; 26 Aug 2004 06:38:04 + From [EMAIL PROTECTED] Wed Aug 25 23:38:04 2004 Return-path: [EMAIL PROTECTED] Received: from gluck.debian.org [192.25.206.10] by spohr.debian.org with esmtp (Exim 3.35 1 (Debian)) id 1C0Dtb-0005LU-00; Wed, 25 Aug 2004 23:38:04 -0700 Received: from guillem by gluck.debian.org with local (Exim 3.35 1 (Debian)) id 1C0DtT-00074a-00; Thu, 26 Aug 2004 00:38:01 -0600 Date: Thu, 26 Aug 2004 08:36:35 +0200 From: Guillem Jover [EMAIL PROTECTED] To: [EMAIL PROTECTED] Subject: xfree86: may FTBFS if current locale makes sort ordering differ Message-ID: [EMAIL PROTECTED] Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=opJtzjQTFsWo+cga Content-Disposition: inline User-Agent: Mutt/1.5.6+20040818i Sender: Guillem Jover [EMAIL PROTECTED] Delivered-To: [EMAIL PROTECTED] X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 (1.212-2003-09-23-exp) on spohr.debian.org X-Spam-Status: No, hits=-6.4 required=4.0 tests=BAYES_00,HAS_PACKAGE, UPPERCASE_25_50 autolearn=no version=2.60-bugs.debian.org_2004_03_25 X-Spam-Level: --opJtzjQTFsWo+cga Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Package: xfree86 Version: 4.3.0.dfsg.1-6+SVN (r1741) Severity: important Tags: patch Hi, While building r1741 to test the patch on #260099, I got a FTBFS in the MANIFEST check. The problem here is that one sort uses LC_ALL=C and the others does not, so if the current locale is different from C it will use a differenr sorting order. On my build system I had LANG=C, LC_COLLATE=ca_ES and LC_CTYPE=ca_ES. Attached is a trivial patch (against trunk's HEAD) that solves this possible problem, thus not RC severity, although I think it should get into -6. regards, guillem --opJtzjQTFsWo+cga Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=xfree86-4.3.0.dfsg.1-6+SVN_FTFBS_locale_sort.patch Index: rules === --- rules (revision 1755) +++ rules (working copy) @@ -352,12 +352,12 @@ # Construct MANIFEST files from MANIFEST.$(ARCH).in and # MANIFEST.$(ARCH).all or MANIFEST.all. if expr $(findstring -DBuildFonts=NO,$(IMAKE_DEFINES)) : -DBuildFonts=NO /dev/null 21; then \ - sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH); \ + LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH); \ else \ if [ -e debian/MANIFEST.$(ARCH).all ]; then \ - sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all debian/MANIFEST.$(ARCH); \ + LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all debian/MANIFEST.$(ARCH); \ else \ - sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all debian/MANIFEST.$(ARCH); \ + LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all debian/MANIFEST.$(ARCH); \ fi; \ fi # confirm that the installed file list has not changed --opJtzjQTFsWo+cga-- --- Received: (at 268116-done) by bugs.debian.org; 28 Aug 2004 05:51:17 + From [EMAIL PROTECTED] Fri Aug 27 22:51:17 2004 Return-path: [EMAIL PROTECTED] Received: from dhcp065-026-182-085.indy.rr.com (sisyphus.deadbeast.net) [65.26.182.85] by spohr.debian.org with esmtp (Exim 3.35 1 (Debian)) id 1C0w7R-000165-00; Fri, 27 Aug 2004 22:51:17 -0700 Received: by sisyphus.deadbeast.net (Postfix, from userid 1000) id 9C04968C002; Sat, 28 Aug 2004 00:51:15 -0500 (EST) Date: Sat, 28 Aug 2004 00:51:15 -0500 From: Branden Robinson [EMAIL PROTECTED] To: [EMAIL PROTECTED] Subject: fixed bug Message-ID: [EMAIL PROTECTED] Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol=application/pgp-signature; boundary=vGgW1X5XWziG23Ko Content-Disposition: inline User-Agent: Mutt/1.5.6+20040803i Delivered-To: [EMAIL PROTECTED] X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 (1.212-2003-09-23-exp) on spohr.debian.org X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no version=2.60-bugs.debian.org_2004_03_25 X-Spam-Level: --vGgW1X5XWziG23Ko Content-Type: text/plain;
X Strike Force XFree86 SVN commit: r1757 - trunk/debian
Author: branden
Date: 2004-08-28 01:40:48 -0500 (Sat, 28 Aug 2004)
New Revision: 1757
Modified:
trunk/debian/CHANGESETS
Log:
Add missing changeset entry for the app-defaults/xkb migration merge.
Thanks to Fabio for noticing that I overlooked it.
Modified: trunk/debian/CHANGESETS
===
--- trunk/debian/CHANGESETS 2004-08-28 05:49:17 UTC (rev 1756)
+++ trunk/debian/CHANGESETS 2004-08-28 06:40:48 UTC (rev 1757)
@@ -435,4 +435,50 @@
xserver-xfree86 ( 4.3.0.dfsg.1-7)'!
1746, 1747, 1748, 1749, 1750
+Rewrite migration of app-defaults (in libxt6) and xkb (in libx11-6)
+directories.
++ Enhance the shell libary with new functions:
+ - Implement check_symlink() and change check_symlinks_and_warn() and
+check_symlinks_and_bomb() to use it.
+ - Implement make_symlink_sane(). Ensure that the specified symbolic
+link symlink exists, and points to the specified target. If symlink
+does not exist, create it and point it at target. If symlink exists
+but is not a symbolic link, back it up. If symlink exists, is a
+symbolic link, but points to the wrong location, fix it. If symlink
+exists, is a symbolic link, and already points to target, do nothing.
+This function wouldn't be needed if ln had an -I, --idempotent option.
+ - Implement migrate_dir_to_symlink(). Per Debian Policy section 6.5.4,
+A directory will never be replaced by a symbolic link to a directory
+or vice versa; instead, the existing state (symlink or not) will be
+left alone and dpkg will follow the symlink if there is one. We have
+to do it ourselves. This function moves the contents of old_location,
+a directory, into new_location, a directory, then makes old_location a
+symbolic link to new_location. old_location need not exist, but if it
+does, it must be a directory (or a symlink to a directory). If it is
+not, it is backed up. If new_location exists already and is not a
+directory, it is backed up.
++ Add config scripts for libx11-6 and libxt6, which detect if
+ /usr/X11R6/lib/X11/{app-defaults,xkb} is a directory but not a symlink,
+ and use debconf to prompt the user (at low priority) whether the
+ directories should be moved. If the user says no, abort the script. If
+ the user says yes (default), start the migration with
+ migrate_dir_to_symlink().
++ Update preinst scripts to use debconf as the configs script do; this is
+ unusual but necessary because if we're going to do the migration we need
+ to start before any other packages (which may use the old directories)
+ are unpacked.
++ In the preinst scripts, call check_symlink(), and if that fails, call
+ make_symlink_sane(). Stop calling check_symlinks_and_warn().
++ Update postinst scripts to indicate that migration is completed.
++ Update postrm scripts to run migration in reverse if it had been started
+ and the package installation or upgrade is aborted.
++ We keep shipping /etc/X11/{app-defaults,xkb} symlinks as part of the
+ package payloads, because manipulating them in the preinst isn't enough
+ -- dpkg will remove disappearing files from the system *after* the
+ preinst runs but before the postinst does, leaving a window for packages
+ using the legacy paths to unpack to the old location with no symlink to
+ redirect them, which is precisely what we don't want (see section 6.5 of
+ the Debian Policy Manual).
+1753, 1757
+
vim:set ai et sts=4 sw=4 tw=80:
X Strike Force XFree86 SVN commit: r1758 - trunk/debian
Author: fabbione Date: 2004-08-28 01:43:46 -0500 (Sat, 28 Aug 2004) New Revision: 1758 Modified: trunk/debian/CHANGESETS trunk/debian/libx11-6.preinst.in trunk/debian/libxt6.preinst.in Log: Transition should not happen on fresh installation. Modified: trunk/debian/CHANGESETS === --- trunk/debian/CHANGESETS 2004-08-28 06:40:48 UTC (rev 1757) +++ trunk/debian/CHANGESETS 2004-08-28 06:43:46 UTC (rev 1758) @@ -479,6 +479,6 @@ using the legacy paths to unpack to the old location with no symlink to redirect them, which is precisely what we don't want (see section 6.5 of the Debian Policy Manual). -1753, 1757 +1753, 1757, 1758 vim:set ai et sts=4 sw=4 tw=80: Modified: trunk/debian/libx11-6.preinst.in === --- trunk/debian/libx11-6.preinst.in2004-08-28 06:40:48 UTC (rev 1757) +++ trunk/debian/libx11-6.preinst.in2004-08-28 06:43:46 UTC (rev 1758) @@ -18,38 +18,41 @@ #INCLUDE_SHELL_LIB# if [ $1 = install ] || [ $1 = upgrade ]; then - # xkb directory moved in 4.0 - MIGRATION_FILE=/var/run/libx11-6.xkb.migration - DIR=/usr/X11R6/lib/X11/xkb - if [ -d $DIR ] [ ! -L $DIR ]; then -# We do this debconf stuff in the preinst, not the postinst, because the -# migration needs to happen *before* other packages are unpacked. -# The question may not have been seen yet if this package wasn't -# pre-configured. If not, we must ask now. -run db_metaget libx11-6/migrate_xkb_dir seen -if [ $RET != true ]; then - run db_input low libx11-6/migrate_xkb_dir - run db_go -fi -if db_get libx11-6/migrate_xkb_dir; then - if [ $RET = true ]; then -if migrate_dir_to_symlink $DIR $(maplink $DIR); then - $MIGRATION_FILE + # If there is no $2, this is a fresh install. + if [ -n $2 ]; then +# xkb directory moved in 4.0 +MIGRATION_FILE=/var/run/libx11-6.xkb.migration +DIR=/usr/X11R6/lib/X11/xkb +if [ -d $DIR ] [ ! -L $DIR ]; then + # We do this debconf stuff in the preinst, not the postinst, because the + # migration needs to happen *before* other packages are unpacked. + # The question may not have been seen yet if this package wasn't + # pre-configured. If not, we must ask now. + run db_metaget libx11-6/migrate_xkb_dir seen + if [ $RET != true ]; then +run db_input low libx11-6/migrate_xkb_dir +run db_go + fi + if db_get libx11-6/migrate_xkb_dir; then +if [ $RET = true ]; then + if migrate_dir_to_symlink $DIR $(maplink $DIR); then +$MIGRATION_FILE + else +die failed to migrate $DIR to $(maplink $DIR) + fi else - die failed to migrate $DIR to $(maplink $DIR) + die aborting at user request fi else -die aborting at user request +internal_error failure using db_get to retrieve \ + libx11-6/migrate_xkb_dir fi -else - internal_error failure using db_get to retrieve \ -libx11-6/migrate_xkb_dir fi +# Ensure the app-defaults directory is in the correct place. +if ! check_symlink $DIR; then + make_symlink_sane $DIR $(maplink $DIR) +fi fi - # Ensure the app-defaults directory is in the correct place. - if ! check_symlink $DIR; then -make_symlink_sane $DIR $(maplink $DIR) - fi fi #DEBHELPER# Modified: trunk/debian/libxt6.preinst.in === --- trunk/debian/libxt6.preinst.in 2004-08-28 06:40:48 UTC (rev 1757) +++ trunk/debian/libxt6.preinst.in 2004-08-28 06:43:46 UTC (rev 1758) @@ -18,38 +18,41 @@ #INCLUDE_SHELL_LIB# if [ $1 = install ] || [ $1 = upgrade ]; then - # app-defaults directory moved in 4.0 - MIGRATION_FILE=/var/run/libxt6.app-defaults.migration - DIR=/usr/X11R6/lib/X11/app-defaults - if [ -d $DIR ] [ ! -L $DIR ]; then -# We do this debconf stuff in the preinst, not the postinst, because the -# migration needs to happen *before* other packages are unpacked. -# The question may not have been seen yet if this package wasn't -# pre-configured. If not, we must ask now. -run db_metaget libxt6/migrate_app_defaults_dir seen -if [ $RET != true ]; then - run db_input low libxt6/migrate_app_defaults_dir - run db_go -fi -if db_get libxt6/migrate_app_defaults_dir; then - if [ $RET = true ]; then -if migrate_dir_to_symlink $DIR $(maplink $DIR); then - $MIGRATION_FILE + # If there is no $2, this is a fresh install. + if [ -n $2 ]; then +# app-defaults directory moved in 4.0 +MIGRATION_FILE=/var/run/libxt6.app-defaults.migration +DIR=/usr/X11R6/lib/X11/app-defaults +if [ -d $DIR ] [ ! -L $DIR ]; then + # We do this debconf stuff in the preinst, not the postinst, because the + # migration
Processed: Re: xfree86: FTBFS: wrong Build-Depends libstdc++-5-dev
Processing commands for [EMAIL PROTECTED]: severity 268461 minor Bug#268461: xfree86: FBTFS: wrong Build-Depends libstdc++-5-dev Severity set to `minor'. thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Bug#268461: xfree86: FTBFS: wrong Build-Depends libstdc++-5-dev
severity 268461 minor thanks This is hardly a serious bug -- the xfree86 package build-depends: libstdc++5-dev | libstdc++-dev, which is always satisfied by build-essential, so there is zero impact on the buildability of the package, even accounting for sbuild's peculiarities in resolving dependencies. -- Steve Langasek postmodern programmer signature.asc Description: Digital signature
X Strike Force XFree86 SVN commit: r1759 - trunk/debian
Author: fabbione Date: 2004-08-28 02:12:08 -0500 (Sat, 28 Aug 2004) New Revision: 1759 Modified: trunk/debian/CHANGESETS trunk/debian/libx11-6.preinst.in trunk/debian/libxt6.preinst.in Log: Revert improper fix. Modified: trunk/debian/CHANGESETS === --- trunk/debian/CHANGESETS 2004-08-28 06:43:46 UTC (rev 1758) +++ trunk/debian/CHANGESETS 2004-08-28 07:12:08 UTC (rev 1759) @@ -479,6 +479,6 @@ using the legacy paths to unpack to the old location with no symlink to redirect them, which is precisely what we don't want (see section 6.5 of the Debian Policy Manual). -1753, 1757, 1758 +1753, 1757 vim:set ai et sts=4 sw=4 tw=80: Modified: trunk/debian/libx11-6.preinst.in === --- trunk/debian/libx11-6.preinst.in2004-08-28 06:43:46 UTC (rev 1758) +++ trunk/debian/libx11-6.preinst.in2004-08-28 07:12:08 UTC (rev 1759) @@ -18,41 +18,38 @@ #INCLUDE_SHELL_LIB# if [ $1 = install ] || [ $1 = upgrade ]; then - # If there is no $2, this is a fresh install. - if [ -n $2 ]; then -# xkb directory moved in 4.0 -MIGRATION_FILE=/var/run/libx11-6.xkb.migration -DIR=/usr/X11R6/lib/X11/xkb -if [ -d $DIR ] [ ! -L $DIR ]; then - # We do this debconf stuff in the preinst, not the postinst, because the - # migration needs to happen *before* other packages are unpacked. - # The question may not have been seen yet if this package wasn't - # pre-configured. If not, we must ask now. - run db_metaget libx11-6/migrate_xkb_dir seen - if [ $RET != true ]; then -run db_input low libx11-6/migrate_xkb_dir -run db_go - fi - if db_get libx11-6/migrate_xkb_dir; then -if [ $RET = true ]; then - if migrate_dir_to_symlink $DIR $(maplink $DIR); then -$MIGRATION_FILE - else -die failed to migrate $DIR to $(maplink $DIR) - fi + # xkb directory moved in 4.0 + MIGRATION_FILE=/var/run/libx11-6.xkb.migration + DIR=/usr/X11R6/lib/X11/xkb + if [ -d $DIR ] [ ! -L $DIR ]; then +# We do this debconf stuff in the preinst, not the postinst, because the +# migration needs to happen *before* other packages are unpacked. +# The question may not have been seen yet if this package wasn't +# pre-configured. If not, we must ask now. +run db_metaget libx11-6/migrate_xkb_dir seen +if [ $RET != true ]; then + run db_input low libx11-6/migrate_xkb_dir + run db_go +fi +if db_get libx11-6/migrate_xkb_dir; then + if [ $RET = true ]; then +if migrate_dir_to_symlink $DIR $(maplink $DIR); then + $MIGRATION_FILE else - die aborting at user request + die failed to migrate $DIR to $(maplink $DIR) fi else -internal_error failure using db_get to retrieve \ - libx11-6/migrate_xkb_dir +die aborting at user request fi +else + internal_error failure using db_get to retrieve \ +libx11-6/migrate_xkb_dir fi -# Ensure the app-defaults directory is in the correct place. -if ! check_symlink $DIR; then - make_symlink_sane $DIR $(maplink $DIR) -fi fi + # Ensure the app-defaults directory is in the correct place. + if ! check_symlink $DIR; then +make_symlink_sane $DIR $(maplink $DIR) + fi fi #DEBHELPER# Modified: trunk/debian/libxt6.preinst.in === --- trunk/debian/libxt6.preinst.in 2004-08-28 06:43:46 UTC (rev 1758) +++ trunk/debian/libxt6.preinst.in 2004-08-28 07:12:08 UTC (rev 1759) @@ -18,41 +18,38 @@ #INCLUDE_SHELL_LIB# if [ $1 = install ] || [ $1 = upgrade ]; then - # If there is no $2, this is a fresh install. - if [ -n $2 ]; then -# app-defaults directory moved in 4.0 -MIGRATION_FILE=/var/run/libxt6.app-defaults.migration -DIR=/usr/X11R6/lib/X11/app-defaults -if [ -d $DIR ] [ ! -L $DIR ]; then - # We do this debconf stuff in the preinst, not the postinst, because the - # migration needs to happen *before* other packages are unpacked. - # The question may not have been seen yet if this package wasn't - # pre-configured. If not, we must ask now. - run db_metaget libxt6/migrate_app_defaults_dir seen - if [ $RET != true ]; then -run db_input low libxt6/migrate_app_defaults_dir -run db_go - fi - if db_get libxt6/migrate_app_defaults_dir; then -if [ $RET = true ]; then - if migrate_dir_to_symlink $DIR $(maplink $DIR); then -$MIGRATION_FILE - else -die failed to migrate $DIR to $(maplink $DIR) - fi + # app-defaults directory moved in 4.0 + MIGRATION_FILE=/var/run/libxt6.app-defaults.migration + DIR=/usr/X11R6/lib/X11/app-defaults + if [ -d $DIR ] [ ! -L $DIR ]; then +# We do
X Strike Force XFree86 SVN commit: r1760 - trunk/debian
Author: branden
Date: 2004-08-28 02:53:52 -0500 (Sat, 28 Aug 2004)
New Revision: 1760
Modified:
trunk/debian/CHANGESETS
trunk/debian/shell-lib.sh
Log:
Use mkdir -p in make_symlink_sane() to ensure that the parent directories
of the symlink and its destination exist before creating the symlink
itself.
Modified: trunk/debian/CHANGESETS
===
--- trunk/debian/CHANGESETS 2004-08-28 07:12:08 UTC (rev 1759)
+++ trunk/debian/CHANGESETS 2004-08-28 07:53:52 UTC (rev 1760)
@@ -479,6 +479,6 @@
using the legacy paths to unpack to the old location with no symlink to
redirect them, which is precisely what we don't want (see section 6.5 of
the Debian Policy Manual).
-1753, 1757
+1753, 1757, 1760
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/shell-lib.sh
===
--- trunk/debian/shell-lib.sh 2004-08-28 07:12:08 UTC (rev 1759)
+++ trunk/debian/shell-lib.sh 2004-08-28 07:53:52 UTC (rev 1760)
@@ -655,6 +655,7 @@
observe link from $symlink to $target already exists
else
observe creating symbolic link from $symlink to $target
+mkdir -p ${target%/*} ${symlink%/*}
ln -s -b -S .dpkg-old $target $symlink
fi
}
Bug#256706: Patch to solve XKB mess about modifiers
Here are the same patches ready to be committed; programs/xkbcomp/expr.c
3.7 was added for convenience.
Denis
Index: debian/patches/000_stolen_from_HEAD_xkb_data.diff
===
--- debian/patches/000_stolen_from_HEAD_xkb_data.diff (revision 1760)
+++ debian/patches/000_stolen_from_HEAD_xkb_data.diff (working copy)
@@ -178,6 +178,10 @@
[...]
[Ivan Pascal]
+xc/programs/xkbcomp/symbols/altwin @ 1.5
+ 646. Fix for XKB map 'altwin' to avoid one keysym to more than one modifier
+mapping (Ivan Pascal).
+
xc/programs/xkbcomp/symbols/pc/us @ 1.7
667. Fixes and updates for XKB keyboard maps:
- Add to 'us' keymap backslash key that can be rewritten in other
layouts
@@ -2530,6 +2534,38 @@
-
+include level3(ralt_switch_multikey)
};
+Index: xc/programs/xkbcomp/symbols/altwin
+===
+RCS file: /cvs/xc/programs/xkbcomp/symbols/altwin,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- xc/programs/xkbcomp/symbols/altwin 10 Oct 2001 19:18:32 - 1.4
xc/programs/xkbcomp/symbols/altwin 3 Dec 2003 14:09:08 - 1.5
+@@ -1,4 +1,4 @@
+-// $XFree86: xc/programs/xkbcomp/symbols/altwin,v 1.4 2001/10/10 19:18:32
herrb Exp $
++// $XFree86: xc/programs/xkbcomp/symbols/altwin,v 1.5 2003/12/03 14:09:08
pascal Exp $
+
+ partial modifier_keys
+ xkb_symbols meta_alt {
+@@ -15,7 +15,7 @@
+ key LWIN { [ Meta_L ] };
+ key RWIN { [ Meta_R ] };
+ modifier_map Mod1 { Alt_L, Alt_R };
+-modifier_map Mod4 { Meta_L, Meta_R };
++modifier_map Mod4 { META, Meta_L, Meta_R };
+ };
+
+ partial modifier_keys
+@@ -23,7 +23,7 @@
+ key LALT { [ Alt_L, Alt_L ] };
+ key LWIN { [ Meta_L ] };
+ modifier_map Mod1 { Alt_L };
+-modifier_map Mod4 { Meta_L };
++modifier_map Mod4 { META, Meta_L };
+ };
+
+ partial modifier_keys
Index: xc/programs/xkbcomp/symbols/pc/am
===
RCS file: /cvs/xc/programs/xkbcomp/symbols/pc/am,v
Index: debian/patches/000_stolen_from_HEAD.diff
===
--- debian/patches/000_stolen_from_HEAD.diff(revision 1760)
+++ debian/patches/000_stolen_from_HEAD.diff(working copy)
@@ -608,6 +608,18 @@
Fix manual pages typos (Bugzilla #316, Jens Schweikhardt).
[Matthieu Herrb]
+xc/programs/xmodmap/exec.c @ 1.6
+ 634. Fix xmodmap's output of the modifiers map when the first column keysym
+ is empty (Ivan Pascal).
+
+xc/programs/xkbcomp/expr.c @ 3.7
+ 351. Fixed string octal number parsing and string to int conversion for \00
+ in xkbcomp (BugzillaR #553, Egbert Eich).
+xc/programs/xkbcomp/expr.c @ 3.8
+ Add modifier_map none syntax to remove modifier bindings from the
+ specified key. [Ivan Pascal]
+
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.0 +1100
+++ xc/config/imake/imake.c2003-04-09 01:58:14.0 +1000
@@ -23491,3 +23503,97 @@
and serving as an example for XTrap functionality, it can reasonably used as
a primitive playback client for X sessions.
.LP
+Index: xc/programs/xmodmap/exec.c
+===
+RCS file: /cvs/xc/programs/xmodmap/exec.c,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -u -r1.5 -r1.6
+--- xc/programs/xmodmap/exec.c 14 Dec 2001 20:02:13 - 1.5
xc/programs/xmodmap/exec.c 2 Dec 2003 13:13:57 - 1.6
+@@ -56,7 +56,7 @@
+ * Author: Jim Fulton, MIT X Consortium; derived from parts of the
+ * original xmodmap, written by David Rosenthal, of Sun Microsystems.
+ */
+-/* $XFree86: xc/programs/xmodmap/exec.c,v 1.5 2001/12/14 20:02:13 dawes Exp $
*/
++/* $XFree86: xc/programs/xmodmap/exec.c,v 1.6 2003/12/02 13:13:57 pascal Exp
$ */
+
+ #include X11/Xos.h
+ #include X11/Xlib.h
+@@ -212,8 +212,13 @@
+ PrintModifierMapping(XModifierKeymap *map, FILE *fp)
+ {
+ int i, k = 0;
++int min_keycode, max_keycode, keysyms_per_keycode = 0;
+
+-fprintf (fp,
++XDisplayKeycodes (dpy, min_keycode, max_keycode);
++XGetKeyboardMapping (dpy, min_keycode, (max_keycode - min_keycode + 1),
++ keysyms_per_keycode);
++
++fprintf (fp,
+%s: up to %d keys per modifier, (keycodes in parentheses):\n\n,
+ProgramName, map-max_keypermod);
+ for (i = 0; i 8; i++) {
+@@ -222,8 +227,14 @@
+ fprintf(fp, %-10s, modifier_table[i].name);
+ for (j = 0; j map-max_keypermod; j++) {
+ if (map-modifiermap[k]) {
+- KeySym ks = XKeycodeToKeysym(dpy, map-modifiermap[k], 0);
+- char *nm = XKeysymToString(ks);
++
Bug#265084: Reply on bug 265084
Thomas Hood wrote: According to my understanding of the severity levels, the fact that X doesn't work on one system doesn't count as a critical bug. (I didn't get copied on this message, but I just checked the bug report page and found it.) Just FYI: I can't remember for sure, but I'm about 98% confident that I selected critical according to the definitions provided in the Debian bug reporting tool, so perhaps those definitions need to be revisited by the designers of the bug reporting tool? Also, if it matters, I have five SunBlade 2000s; each one locks up hard when upgrading to Testing or Unstable (I tried the first four machines, found they froze, then did a totally clean, minimal install on the fifth, and then tried upgrading it, at which point it froze also; it was this fifth machine I used as the basis for the bug report). If by one system you mean one machine, I'd tend to agree with you. If instead you mean one particular configuration of hardware, regardless of number of machines involved, I'm a bit less in agreement, as these are just as they shipped from our Sun supplier, which makes me wonder if other SunBlade 2000s world-wide might not suffer the same fate. But the severity level lable is really an important issue to me; I just wanted the developers working on getting Sarge out the door to be aware that in my experience, Sarge makes SunBlade 2000s unusable as an X-enabled workstation (which bums me, as I've got them in a university lab to expose the students to the beauty that is Debian). You developers and package maintainers do a great job! I appreciate your efforts! Thanks! -- Kent
[MailServer Notification] Attention ! Vir us detecté !
ScanMail for Microsoft Exchange took action on the message. The message details were: Sender = debian-x@lists.debian.org Recipient(s) = [EMAIL PROTECTED]; Subject = Mail Delivery (failure [EMAIL PROTECTED]) Scanning time = 08/28/2004 15:50:34 Engine/Pattern = 7.000-1004/2.162.00 Action taken on message: The message body contained HTML_Netsky.P virus. ScanMail deleted the message body. Le 08/28/2004 à 03:50 PM debian-x@lists.debian.org Attention ! Nous avons detecté un virus dans un courrier électronique avec comme émetteur votre adresse email: debian-x@lists.debian.org . Il est possible que votre machine soit infectée par : real-time scan. Nous vous suggérons d'effectuer une vérification anti-virus de votre machine.
Bug#268731: Can't Start X Window
Package: xserver-xfree86 Version: 4.1.0.1 Severity: important Hi There, Whenever I try to start the x window, this error message comes: PEXExtensionInit: Couldn't open default PEX font file Roman_M This should not happen! An unresolved function was called! I have just installed debian woody stable on to wmware machine. XFree86.0.log and XF86Config-4 files are attached to this mail. XFree86.0.log Description: Binary data XF86Config-4 Description: Binary data
X Strike Force XFree86 SVN commit: r1761 - trunk/debian
Author: branden Date: 2004-08-28 15:43:39 -0500 (Sat, 28 Aug 2004) New Revision: 1761 Modified: trunk/debian/CHANGESETS trunk/debian/changelog Log: Move app-defaults/xkb directory migration changelog entry to indicate Fabio's assistance with bugfixes and testing. Thanks, Fabio! Modified: trunk/debian/CHANGESETS === --- trunk/debian/CHANGESETS 2004-08-28 07:53:52 UTC (rev 1760) +++ trunk/debian/CHANGESETS 2004-08-28 20:43:39 UTC (rev 1761) @@ -14,7 +14,7 @@ Miscellaneous cosmetic fixes. 1607, 1608, 1624, 1626, 1627, 1636, 1651, 1654, 1663, 1664, 1675, 1685, -1690, 1713, 1715, 1716, 1718, 1736, 1737, 1743 +1690, 1713, 1715, 1716, 1718, 1736, 1737, 1743, 1761 Grab latest version of XTerm (#191) from Thomas Dickey's website. 1609 Modified: trunk/debian/changelog === --- trunk/debian/changelog 2004-08-28 07:53:52 UTC (rev 1760) +++ trunk/debian/changelog 2004-08-28 20:43:39 UTC (rev 1761) @@ -342,6 +342,34 @@ person, of *course* dpkg and apt accept 'Conflicts: (4.3.0.dfsg.1-4 ) xserver-xfree86 ( 4.3.0.dfsg.1-7)'! + Changes by Fabio M. Di Nitto and Branden Robinson: + + * Support building only the parts of the source tree needed by +architecture-specific packages. ++ Modify Debian Imake configuration to support building with fonts and + specs docs turned off (patch #003). Resynchronize GNU/Hurd, + GNU/FreeBSD, and GNU/NetBSD Imake configurations with Debian + configuration (patches #800, #820, #842, #900). Resync diffs in patches + #004, #099c, #600. ++ Modify Imakefiles to build and install the font utilities even if the + fonts themselves are not being shipped (patch #095). ++ Make the build target a dummy target, replacing it with + build-arch-only and build-all targets. Target-specific variable + values are used to invoke a real-build target, turning off the + building of fonts and specs docs as needed. ++ Add comments to rules file, update $(stampdir_targets) and .PHONY + target. ++ Split MANIFEST files into arch-specific and arch-independent parts. + Update the README to explain how these files work now and how to update + them. ++ Ship the XTerm control sequences document only in the xspecs package. +Consequences: ++ Reduce the disk space required to build the package by ~520MB when the + binary-arch target is used (e.g., by dpkg-buildpackage -B.) ++ Reduce the build time by 20 to 30 percent when the binary-arch target + is used (ccache users might see even more improvement). ++ Make the buildd admins hate us less. + * Rewrite migration of app-defaults (in libxt6) and xkb (in libx11-6) directories. + Enhance the shell libary with new functions: @@ -387,34 +415,6 @@ redirect them, which is precisely what we don't want (see section 6.5 of the Debian Policy Manual). - Changes by Fabio M. Di Nitto and Branden Robinson: - - * Support building only the parts of the source tree needed by -architecture-specific packages. -+ Modify Debian Imake configuration to support building with fonts and - specs docs turned off (patch #003). Resynchronize GNU/Hurd, - GNU/FreeBSD, and GNU/NetBSD Imake configurations with Debian - configuration (patches #800, #820, #842, #900). Resync diffs in patches - #004, #099c, #600. -+ Modify Imakefiles to build and install the font utilities even if the - fonts themselves are not being shipped (patch #095). -+ Make the build target a dummy target, replacing it with - build-arch-only and build-all targets. Target-specific variable - values are used to invoke a real-build target, turning off the - building of fonts and specs docs as needed. -+ Add comments to rules file, update $(stampdir_targets) and .PHONY - target. -+ Split MANIFEST files into arch-specific and arch-independent parts. - Update the README to explain how these files work now and how to update - them. -+ Ship the XTerm control sequences document only in the xspecs package. -Consequences: -+ Reduce the disk space required to build the package by ~520MB when the - binary-arch target is used (e.g., by dpkg-buildpackage -B.) -+ Reduce the build time by 20 to 30 percent when the binary-arch target - is used (ccache users might see even more improvement). -+ Make the buildd admins hate us less. - Changes by Robert Millan: * Get glxinfo to link properly with g++ (instead of adding -lstdc++).
Bug#268749: xserver-xfree86: XFree crashes on xset dpms force suspend [ATI Radeon Mobility 7500, VESA]
Package: xserver-xfree86 Version: 4.1.0-16woody3 Severity: normal I got a laptop with ATI Radeon 7500 Mobility. Since XFree fron Woody does not support this card I use XFree's VESA-Driver. Works quite okay until I issue any dmps command e.g. | xset dpms force suspend which immediatly crashes the XFree Server. Well, I dont't have any idea how to debug this further. Any hints what I can do? Sebastian 01:00.0 VGA compatible controller: ATI Technologies Inc Radeon Mobility M7 LW [Radeon Mobility 7500] 01:00.0 Class 0300: 1002:4c57 ### BEGIN DEBCONF SECTION # XF86Config-4 (XFree86 server configuration file) generated by dexconf, the # Debian X Configuration tool, using values from the debconf database. # # Edit this file with caution, and see the XF86Config-4 manual page. # (Type man XF86Config-4 at the shell prompt.) # # If you want your changes to this file preserved by dexconf, only make changes # before the ### BEGIN DEBCONF SECTION line above, and/or after the # ### END DEBCONF SECTION line below. # # To change things within the debconf section, run the command: # dpkg-reconfigure xserver-xfree86 # as root. Also see How do I add custom sections to a dexconf-generated # XF86Config or XF86Config-4 file? in /usr/share/doc/xfree86-common/FAQ.gz. Section Files FontPathunix/:7100# local font server # if the local font server has problems, we can fall back on these FontPath/usr/lib/X11/fonts/misc FontPath/usr/lib/X11/fonts/cyrillic FontPath/usr/lib/X11/fonts/100dpi/:unscaled FontPath/usr/lib/X11/fonts/75dpi/:unscaled FontPath/usr/lib/X11/fonts/Type1 FontPath/usr/lib/X11/fonts/Speedo FontPath/usr/lib/X11/fonts/100dpi FontPath/usr/lib/X11/fonts/75dpi EndSection Section Module LoadGLcore Loadbitmap Loaddbe Loadddc Loaddri Loadextmod Loadfreetype Loadglx Loadint10 Loadpex5 Loadrecord Loadspeedo Loadtype1 Loadvbe Loadxie EndSection Section InputDevice Identifier Generic Keyboard Driver keyboard Option CoreKeyboard Option XkbRules xfree86 Option XkbModel pc102 Option XkbLayout de Option XkbVariantnodeadkeys EndSection Section InputDevice Identifier Configured Mouse Driver mouse Option CorePointer Option Device/dev/psaux Option Protocol PS/2 Option Emulate3Buttons true EndSection Section InputDevice Identifier Generic Mouse Driver mouse Option SendCoreEventstrue Option Device/dev/input/mice Option Protocol ImPS/2 Option Emulate3Buttons true EndSection Section Device Identifier Generic Video Card Driver vesa Option UseFBDev true EndSection Section Monitor Identifier Generic Monitor HorizSync 28-50 VertRefresh 43-75 Option DPMS EndSection Section Screen Identifier Default Screen Device Generic Video Card Monitor Generic Monitor DefaultDepth24 SubSection Display Depth 1 Modes 1600x1200 1280x1024 1280x960 1152x864 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 4 Modes 1600x1200 1280x1024 1280x960 1152x864 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 8 Modes 1600x1200 1280x1024 1280x960 1152x864 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 15 Modes 1600x1200 1280x1024 1280x960 1152x864 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 16 Modes 1600x1200 1280x1024 1280x960 1152x864 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 24 Modes 1600x1200 1280x1024 1280x960 1152x864 1024x768 800x600 640x480 EndSubSection EndSection Section ServerLayout Identifier Default Layout Screen Default Screen InputDevice Generic Keyboard InputDevice Configured Mouse InputDevice Generic Mouse EndSection Section DRI Mode0666
Bug#268759: [nv] Sarge xserver-xfree86 breaks display
Package: xserver-xfree86 Severity: important Hi! In one of the labs I administer, we just updated all our machines to the latest Sarge and all the boxes that were using the nv driver had the same problem: the mouse pointer was a big garbage square, and the video had problems in general, lots of garbage on screen. This could be easily solved by adding: Option HWCursor false Option Accel false To the Device section. It's an easy fix, although it's turning off 2D acceleration :-\. These machines were working fine with the previous Sarge version of xserver-xfree86, and we never used the proprietary drivers. Apparently some changes were made to the nv driver for NVidia support, that broke in these machines. These machines are not updated periodically. Last update was done about 5 or 6 months ago. So the change probably happened some time in that span (I know it's a lot, sorry for that). I'm sorry I don't have the complete hardware information, since I'm not in the lab right now. I hope you can have a look at this, and I'll try to submit the hardware information as soon as I can. Love, Marga.
