X Strike Force SVN commit: rev 395 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 03:03:13 -0500 (Tue, 19 Aug 2003)
New Revision: 395

Added:
   trunk/debian/xdm.logrotate
Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
Perform log rotation on xdm's log file. (Closes: #200699)
  - debian/rules: invoke dh_installlogrotate in binary-arch target
  - debian/xdm.logrotate: new; log rotation policy file


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2003-08-18 22:14:31 UTC (rev 394)
+++ trunk/debian/changelog  2003-08-19 08:03:13 UTC (rev 395)
@@ -195,8 +195,12 @@
 wacky behavior must have been caused by this).  Thanks to Eduard Bloch for
 noticing odd dexconf behavior which led me to this realization.
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Mon, 18 Aug 2003 17:05:00 -0500
+  * Perform log rotation on xdm's log file. (Closes: #200699)
+- debian/rules: invoke dh_installlogrotate in binary-arch target
+- debian/xdm.logrotate: new; log rotation policy file
 
+ -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 02:59:01 -0500
+
 xfree86 (4.2.1-9) unstable; urgency=high
 
   * urgency due to xterm security fixes; see below

Modified: trunk/debian/rules
===
--- trunk/debian/rules  2003-08-18 22:14:31 UTC (rev 394)
+++ trunk/debian/rules  2003-08-19 08:03:13 UTC (rev 395)
@@ -367,6 +367,7 @@
dh_installmenu
dh_installpam
dh_installinit --noscripts
+   dh_installlogrotate
dh_installchangelogs
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip \

Added: trunk/debian/xdm.logrotate
===
--- trunk/debian/xdm.logrotate  2003-08-18 22:14:31 UTC (rev 394)
+++ trunk/debian/xdm.logrotate  2003-08-19 08:03:13 UTC (rev 395)
@@ -0,0 +1,4 @@
+/var/log/xdm.log {
+   notifempty
+   missingok
+}


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Fw: the SlCKEST pIace on E/\RTH? Q U j FO

[gojeyo]

 

Hey izoTt Mdnu Debian-x
Debian-x AGkF

Bug#206173: Keyboard option "grp:alt_shift_toggle" not working in XF86Config-4

[Eduard Bloch]

Package: xserver-xfree86
Version: 4.3.0-0pre1v1
Severity: minor
Tags: experimental upstream

Hello,

I use multiple keymaps since I write cyrillic mails from time to time.
With XFree86 4.3, I use the multiple-keymap list feature as showed in
their examples (/etc/X11/xkb/README.config), see config below.

However, pressing Alt-Shift does not anything right after the X start.
The switch function only works when I execute setxkbmap manually,

setxkbmap -option "grp:alt_shift_toggle"

After running it, I can roll trough the keymap list with Alt-Shift as
expected. I remember that I did not need to execute this command when I
used the first packages of Daniel Stone's series, it did not work with
his latest builds and does not work with pre1v1 now.

MfG,
Eduard.

-- Package-specific info:
01:00.0 VGA compatible controller: nVidia Corporation NV17 [GeForce4 420 Go] (rev a3)
01:00.0 Class 0300: 10de:0175 (rev a3)

### 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"
FontPath"unix/:7100"# local font server
# if the local font server has problems, we can fall back on these
FontPath"/usr/lib/X11/fonts/Type1"
FontPath"/usr/lib/X11/fonts/CID"
FontPath"/usr/lib/X11/fonts/Speedo"
FontPath"/usr/lib/X11/fonts/misc"
FontPath"/usr/lib/X11/fonts/cyrillic"
FontPath"/usr/lib/X11/fonts/100dpi"
FontPath"/usr/lib/X11/fonts/75dpi"
EndSection

Section "Module"
Load"GLcore"
Load"bitmap"
Load"dbe"
Load"ddc"
Load"dri"
Load"extmod"
Load"freetype"
Load"glx"
Load"int10"
Load"record"
Load"speedo"
Load"type1"
Load"vbe"
EndSection

Section "InputDevice"
Identifier  "Generic Keyboard"
Driver  "keyboard"
Option  "CoreKeyboard"
Option  "XkbRules"  "xfree86"
Option  "XkbModel"  "ps105"
Option  "XkbLayout" "de,ru"
Option  "XkbVariant""nodeadkeys,phonetic"
Option  "grp:alt_shift_toggle"
EndSection

Section "InputDevice"
Identifier  "Configured Mouse"
Driver  "mouse"
Option  "CorePointer"
Option  "Device""/dev/misc/psaux"
Option  "Protocol"  "ImPS/2"
Option  "ZAxisMapping"  "4 5"
EndSection

Section "InputDevice"
Identifier  "Generic Mouse"
Driver  "mouse"
Option  "SendCoreEvents""true"
Option  "Device""/dev/input/mice"
Option  "Protocol"  "ImPS/2"
Option  "ZAxisMapping"  "4 5"
EndSection

Section "Device"
Identifier  "420go"
Driver  "nv"
EndSection

Section "Monitor"
Identifier  "TFT"
HorizSync   28-49
VertRefresh 43-72
Option  "DPMS"
EndSection

Section "Screen"
Identifier  "Default Screen"
Device  "420go"
Monitor "TFT"
DefaultDepth24
SubSection "Display"
Depth   1
Modes   "1024x768" "800x600" "640x480"
EndSubSection
SubSection "Display"
Depth   4
Modes   "1024x768" "800x600" "640x480"
EndSubSection
SubSection "Display"
Depth   8
Modes   "1024x768" "800x600" "640x480"
EndSubSection
SubSection "Display"
Depth   15
Modes   "1024x768" "800x600" "640x480"
EndSubSection
SubSection "Display"
Depth   16
Modes   "1024x768" "800x600" "640x480"
EndSubSection
SubSection "Display"
Depth   24
Modes   "1024x768" "800x600" "640x480"
EndSubSection
EndSection

Section "ServerLayout"
Identifier  "Default Layout"
Screen  "Default Screen

X Strike Force SVN commit: rev 397 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 04:09:54 -0500 (Tue, 19 Aug 2003)
New Revision: 397

Modified:
   trunk/debian/NEWS.Debian
Log:
debian/NEWS.Debian: set svn:keywords property to "Id"



Property changes on: trunk/debian/NEWS.Debian
___
Name: svn:keywords
   + Id


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Processed: tagging 143825

[Debian Bug Tracking System]

Processing commands for [EMAIL PROTECTED]:

> tag 143825 + help
Bug#143825: xutils: why is rstart.real a conffile?
There were no tags set.
Tags added: help

> tag 143825 + upstream
Bug#143825: xutils: why is rstart.real a conffile?
Tags were: help
Tags added: upstream

>
End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

X Strike Force SVN commit: rev 398 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 04:12:12 -0500 (Tue, 19 Aug 2003)
New Revision: 398

Modified:
   trunk/debian/changelog
Log:
debian/changelog: update to include a couple of forgotten changes from
  revision 396


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2003-08-19 09:09:54 UTC (rev 397)
+++ trunk/debian/changelog  2003-08-19 09:12:12 UTC (rev 398)
@@ -215,14 +215,14 @@
 maintain a roster file corresponding to the config file, for which each
 interested package adds its name on package configuration, and removes it
 on package purge.
-- debian/xserver-common.postinst.in: if the roster file for each
+- debian/xserver-{common,xfree86}.postinst.in: if the roster file for each
   non-conffile config file doesn't already list this package on
   configuration, add it to the roster
-- debian/xserver-common.postrm.in: on purge, remove this package's name
-  from each non-conffile config file's roster file (if that leaves no
-  packages managing a config file, look for a stored MD5 checksum of the
-  config file; if that matches the current config file, remove the config
-  file; finally, remove the checksum file)
+- debian/xserver-{common,xfree86}.postrm.in: on purge, remove this
+  package's name from each non-conffile config file's roster file (if that
+  leaves no packages managing a config file, look for a stored MD5
+  checksum of the config file; if that matches the current config file,
+  remove the config file; finally, remove the checksum file)
 
   * debian/xserver-{common,xfree86}.config.in: input validation errors in the
 package config scripts are now presented with "critical" priority
@@ -250,7 +250,7 @@
 - debian/rules: invoke dh_installlogrotate in binary-arch target
 - debian/xdm.logrotate: new; log rotation policy file
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 03:57:47 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 04:10:35 -0500
 
 xfree86 (4.2.1-9) unstable; urgency=high
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

X Strike Force SVN commit: rev 399 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 04:14:21 -0500 (Tue, 19 Aug 2003)
New Revision: 399

Modified:
   trunk/debian/changelog
Log:
debian/changelog: credit Matt Swift for supplying xdm.logrotate file


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2003-08-19 09:12:12 UTC (rev 398)
+++ trunk/debian/changelog  2003-08-19 09:14:21 UTC (rev 399)
@@ -248,7 +248,7 @@
 
   * Perform log rotation on xdm's log file. (Closes: #200699)
 - debian/rules: invoke dh_installlogrotate in binary-arch target
-- debian/xdm.logrotate: new; log rotation policy file
+- debian/xdm.logrotate: new; log rotation policy file (thanks, Matt Swift)
 
  -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 04:10:35 -0500
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

X Strike Force SVN commit: rev 401 - in trunk/debian: . patches

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 04:31:59 -0500 (Tue, 19 Aug 2003)
New Revision: 401

Modified:
   trunk/debian/changelog
   trunk/debian/patches/002_xdm_fixes.diff
Log:
debian/patches/002_xdm_fixes.diff: in auth.c:openFiles(), check the
  return value of fopen() so that we don't SEGV when setting up an X
  authority file in /tmp because we couldn't write one in $HOME (based on a
  patch by Neil Brown -- thanks!) (Closes: #206141)


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2003-08-19 09:19:12 UTC (rev 400)
+++ trunk/debian/changelog  2003-08-19 09:31:59 UTC (rev 401)
@@ -253,8 +253,13 @@
   * debian/po/*: update templates.pot and *.po files to reflect changes to
 debconf templates
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 04:16:14 -0500
+  * debian/patches/002_xdm_fixes.diff: in auth.c:openFiles(), check the return
+value of fopen() so that we don't SEGV when setting up an X authority file
+in /tmp because we couldn't write one in $HOME (based on a patch by Neil
+Brown -- thanks!) (Closes: #206141)
 
+ -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 04:21:59 -0500
+
 xfree86 (4.2.1-9) unstable; urgency=high
 
   * urgency due to xterm security fixes; see below

Modified: trunk/debian/patches/002_xdm_fixes.diff
===
--- trunk/debian/patches/002_xdm_fixes.diff 2003-08-19 09:19:12 UTC (rev 400)
+++ trunk/debian/patches/002_xdm_fixes.diff 2003-08-19 09:31:59 UTC (rev 401)
@@ -26,7 +26,7 @@
   would fail.  Well, tough titties."  Since "-n" files are cleaned
   shortly after they are created, the existence of any such file would
   be an anomaly (the result of an xdm or xinit process getting killed
-  at an inopportune moment.)  This doesn't seem like an important
+  at an inopportune moment).  This doesn't seem like an important
   concession.
 - Also note that xdm is only susceptible to the aforementioned
   race-condition-based symlink attacks if:
@@ -116,8 +116,8 @@
 server.c.)
 
 diff -urN xc/programs/xdm~/auth.c xc/programs/xdm/auth.c
 xc/programs/xdm~/auth.c2003-02-23 17:03:35.0 -0500
-+++ xc/programs/xdm/auth.c 2003-02-23 17:15:37.0 -0500
+--- xc/programs/xdm~/auth.c2003-08-19 01:01:30.0 -0500
 xc/programs/xdm/auth.c 2003-08-19 01:04:55.0 -0500
 @@ -46,6 +46,7 @@
  #include "dm_error.h"
  
@@ -206,7 +206,7 @@
fclose (auth_file);
  }
  return ret;
-@@ -458,19 +475,34 @@
+@@ -458,19 +475,36 @@
  openFiles (char *name, char *new_name, FILE **oldp, FILE **newp)
  {
int mask;
@@ -235,19 +235,21 @@
 +  {
 +  Debug ("can't open new file %s\n", new_name);
 +  return 0;
-   }
--  *oldp = fopen (name, "r");
--  Debug ("opens succeeded %s %s\n", name, new_name);
++  }
 +  else
 +  Debug ("open succeeded: %s\n", new_name);
 +  if (oldp)
++  {
 +  *oldp = fopen (name, "r");
-+  if (*oldp)
-+  Debug ("open succeeded %s\n", name);
++  if (*oldp)
++  Debug ("open succeeded: %s\n", name);
+   }
+-  *oldp = fopen (name, "r");
+-  Debug ("opens succeeded %s %s\n", name, new_name);
return 1;
  }
  
-@@ -804,10 +836,11 @@
+@@ -804,10 +838,11 @@
  struct in_ifaddr ifaddr;
  struct strioctl str;
  unsigned char *addr;
@@ -261,7 +263,7 @@
  
  /* Indicate that we want to start at the begining */
  ifnet.ib_next = (struct ipb *) 1;
-@@ -821,8 +854,9 @@
+@@ -821,8 +856,9 @@
  
if (ioctl (ipfd, (int) I_STR, (char *) &str) < 0)
{
@@ -272,7 +274,7 @@
}
  
ifaddr.ia_next = (struct in_ifaddr *) ifnet.if_addrlist;
-@@ -833,8 +867,9 @@
+@@ -833,8 +869,9 @@
  
if (ioctl (ipfd, (int) I_STR, (char *) &str) < 0)
{
@@ -283,7 +285,7 @@
}
  
/*
-@@ -874,11 +909,11 @@
+@@ -874,11 +911,11 @@
  char  *addr;
  int   family;
  register struct ifreq *ifr;
@@ -297,7 +299,7 @@
  
  #ifdef ISC
  #define IFC_IFC_REQ (struct ifreq *) ifc.ifc_buf
-@@ -1096,28 +1131,47 @@
+@@ -1096,28 +1133,47 @@
Debug ("openFiles failed\n");
XauUnlockAuth (home_name);
lockStatus = LOCK_ERROR;
@@ -349,7 +351,7 @@
home_name, backup_name);
return;
}
-@@ -1186,8 +1240,9 @@
+@@ -1186,8 +1242,9 @@
Debug ("unlink %s failed\n", name);
envname = name;
if (link (new_name, name) == -1) {
@@ -360,7 +362,7 @@
setenv = 1;
envname = new_name;
} else {
-@@ -1263,12 +1318,14 @@
+@@ -1263,12 +1320,14 @@
if (unlink (name) == -1)
Debug ("unlink %s failed\n", name);
if (link (new_name, name) == -1) {


-- 
To UNSUBSCRIBE, email to [EMAIL PROT

Fw: Debian-x! See her on your monitor, invite her to home I ibEWo dE

[gahoye]

LIv Debian-x TBAVTUX
D fI

Bug#206173: Keyboard option "grp:alt_shift_toggle" not working in XF86Config-4

[Michel Dänzer]

On Tue, 2003-08-19 at 10:55, Eduard Bloch wrote:
> 
> I use multiple keymaps since I write cyrillic mails from time to time.
> With XFree86 4.3, I use the multiple-keymap list feature as showed in
> their examples (/etc/X11/xkb/README.config), see config below.
> 
> However, pressing Alt-Shift does not anything right after the X start.
> The switch function only works when I execute setxkbmap manually,
> 
> setxkbmap -option "grp:alt_shift_toggle"
> 
> After running it, I can roll trough the keymap list with Alt-Shift as
> expected. I remember that I did not need to execute this command when I
> used the first packages of Daniel Stone's series, it did not work with
> his latest builds and does not work with pre1v1 now.

[...]

> Section "InputDevice"
>   Identifier  "Generic Keyboard"
>   Driver  "keyboard"

(BTW, heads up to XSF: the keyboard manpage is still missing)

>   Option  "CoreKeyboard"
>   Option  "XkbRules"  "xfree86"
>   Option  "XkbModel"  "ps105"
>   Option  "XkbLayout" "de,ru"
>   Option  "XkbVariant""nodeadkeys,phonetic"
>   Option  "grp:alt_shift_toggle"

What if you make this

Option  "XkbOptions""grp:alt_shift_toggle"

? (dexconf bug?)

> EndSection


-- 
Earthling Michel Dänzer   \  Debian (powerpc), XFree86 and DRI developer
Software libre enthusiast  \ http://svcs.affero.net/rm.php?r=daenzer



--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Re: Experiments and Problems with 4.3.0-0pre1v1

[Michel Dänzer]

On Tue, 2003-08-19 at 07:10, Chris wrote: 
> I get a very high count of ethernet frame errors whenever 4.3.0 is 
> running, with or without DRI enabled.  This was never an issue with 
> 4.2.1-X.  The Radeon and 3Com card are sharing an IRQ, but this 
> really should not matter. 

It might matter with DRI enabled, but then I'd expect the problem to lie
in the ethernet driver. It certainly shouldn't matter with DRI disabled
(is it really disabled though? :) as the Radeon IRQ is unused in that
case.

> I once had the xserver hang when playing around with KDE's GL 
> screensavers too.  I would offhand attribute this to the same issue.

That's a long shot. :) Might be a 3D driver bug, see below.


> Option "EnableDepthMoves"

The source has this comment:

/* Depth moves are disabled by default since they are extremely slow
*/


> [...] there are numerous GL performance and rendering problems.  Games 
> like TuxRacer run at about half the framerate they did back in the 
> 4.2.1-X days before Radeon DRI broke from that gcc issue.  

Probably a 3D driver bug, see below.

> Also, there are rendering glitches.  The ice in Tuxracer flickers, for 
> instance.  

This is a tuxracer bug (Z fighting, it should use glPolygonOffset). You
can work around it by setting the RADEON_TCL_FORCE_DISABLE environment
variable.

> When using GL in a window (such as glxgears), text outside the 
> window sometimes flickers. (namely icon text on the KDE desktop).  

Page flipping problem probably. It's still really a hack and problems
like this are why it's not enabled by default.

> Also, when trying to moving the window, there is a roughly 0.5 to 2 sec. hang before 
> the 
> screen updates (depends on how demanding the GL app running is).  

If this isn't the depth moves, it might be a 3D driver bug, see below.

> GL Xscreensaver hacks running full screen flicker terribly as if 
> refreshes are happening randomly.

The consensus among DRI developers is that this seems to be an
xscreensaver bug, it seems to make bogus assumptions about GLX on the
root window.


About 3D driver bugs: Keep in mind that the 3D drivers in 4.3 are rather
old and no longer actively maintained. Many bugs have been fixed and new
features implemented in DRI CVS, you may want to try
http://dri.sourceforge.net/snapshots/README.Debian (note that the
current dri-trunk-sid packages haven't been built for i386 yet, hint,
hint)


-- 
Earthling Michel Dänzer   \  Debian (powerpc), XFree86 and DRI developer
Software libre enthusiast  \ http://svcs.affero.net/rm.php?r=daenzer


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Bug#206173: marked as done (Keyboard option "grp:alt_shift_toggle" not working in XF86Config-4)

[Debian Bug Tracking System]

Your message dated Tue, 19 Aug 2003 12:39:49 +0200
with message-id <[EMAIL PROTECTED]>
and subject line Bug#206173: Keyboard option "grp:alt_shift_toggle" not working in 
XF86Config-4
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; 19 Aug 2003 08:56:07 +
>From [EMAIL PROTECTED] Tue Aug 19 03:56:03 2003
Return-path: <[EMAIL PROTECTED]>
Received: from mail.uni-kl.de (uni-kl.de) [131.246.137.52] 
by master.debian.org with esmtp (Exim 3.35 1 (Debian))
id 19p2Ha-jX-00; Tue, 19 Aug 2003 03:56:02 -0500
Received: from mailgate1.uni-kl.de (mailgate1.uni-kl.de [131.246.120.5])
by uni-kl.de (8.12.8/8.12.8) with ESMTP id h7J8u1F5012536;
Tue, 19 Aug 2003 10:56:01 +0200 (MET DST)
Received: from mailinf.rhrk.uni-kl.de (mailinf.rhrk.uni-kl.de [131.246.137.54])
by mailgate1.uni-kl.de (8.12.7/8.12.7) with ESMTP id h7J8u1Es023426;
Tue, 19 Aug 2003 10:56:01 +0200
Received: from domino.informatik.uni-kl.de ([EMAIL PROTECTED] [131.246.161.19])
by mailinf.rhrk.uni-kl.de (8.12.8/8.12.8) with ESMTP id h7J8tjTf001626;
Tue, 19 Aug 2003 10:55:45 +0200 (MET DST)
Received: from zombie.inka.de (rotes255.wohnheim.uni-kl.de [131.246.178.65])
by domino.informatik.uni-kl.de (8.11.7/8.11.6) with ESMTP id h7J8u0704551;
Tue, 19 Aug 2003 10:56:00 +0200 (MEST)
Received: from inet by zombie.inka.de with local (Exim 4.20)
id 19p2HI-0008VA-CP; Tue, 19 Aug 2003 10:55:44 +0200
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="UTF-8"
From: Eduard Bloch <[EMAIL PROTECTED]>
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: Keyboard option "grp:alt_shift_toggle" not working in XF86Config-4
X-Mailer: reportbug 2.22
Date: Tue, 19 Aug 2003 10:55:44 +0200
Message-Id: <[EMAIL PROTECTED]>
Sender: Eduard Bloch <[EMAIL PROTECTED]>
Delivered-To: [EMAIL PROTECTED]
X-Spam-Status: No, hits=-3.0 required=4.0
tests=BAYES_30,HAS_PACKAGE,PENISACCENT
version=2.53-bugs.debian.org_2003_8_17
X-Spam-Level: 
X-Spam-Checker-Version: SpamAssassin 2.53-bugs.debian.org_2003_8_17 
(1.174.2.15-2003-03-30-exp)

Package: xserver-xfree86
Version: 4.3.0-0pre1v1
Severity: minor
Tags: experimental upstream

Hello,

I use multiple keymaps since I write cyrillic mails from time to time.
With XFree86 4.3, I use the multiple-keymap list feature as showed in
their examples (/etc/X11/xkb/README.config), see config below.

However, pressing Alt-Shift does not anything right after the X start.
The switch function only works when I execute setxkbmap manually,

setxkbmap -option "grp:alt_shift_toggle"

After running it, I can roll trough the keymap list with Alt-Shift as
expected. I remember that I did not need to execute this command when I
used the first packages of Daniel Stone's series, it did not work with
his latest builds and does not work with pre1v1 now.

MfG,
Eduard.

-- Package-specific info:
01:00.0 VGA compatible controller: nVidia Corporation NV17 [GeForce4 420 Go] (rev a3)
01:00.0 Class 0300: 10de:0175 (rev a3)

### 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"
FontPath"unix/:7100"# local font server
# if the local font server has problems, we can fall back on these
FontPath"/usr/lib/X11/fonts/Type1"
FontPath"/usr/lib/X11/fonts/CID"
FontPath"/usr/lib/X11/fonts/Speedo"
FontPath"/usr/lib/X11/fonts/misc"
FontPath"/usr/lib/X11/fonts/cyrillic"
FontPath"/usr/lib/X11/fonts/100dpi"
FontPath"/usr/lib/X11/fonts/75dpi"
EndSection

Section "Module"
Load"GLcore"
Load"bitmap"
Load"dbe"
Load"ddc"
Load"dri"

Bug#205973: (Re: Bug#205973: xlibs: /usr/X11R6/lib/X11/xkb/compiled)

[Jim Bray]

On Tue, 2003-08-19 at 01:52, Branden Robinson wrote:

> Okay.  I'm glad to hear my packages (probably) weren't at fault.

No, they weren't.

>  dpkg -S reports only on a package's "payload"; that is,
> stuff in /var/lib/dpkg/info/$package.list, not stuff created by the
> package's maintainer scripts.

  OK, that's good to know.

> Unfortunately there is no wonderful method for determining this;
> essentially, you have to grep the maintainer scripts in
> /var/lib/dpkg/info.

 Even that is not a magic bullet. I find plenty of mention of
/etc...compiled, but no /usr... compiled, because it turns out
that /usr/X11R6/libs/X11/xkb is symlinked to /etc...xkb. I should
probably have checked that sooner... must remember to
check each element in pathnames...


> Dpkg provides no mechanism at present for permitting packages to
> "register" additional filenames that a package doesn't unpack, but might
> be interested in.

  Might be a good wishlist item way down the road. Hmmm... just had a
really hideous idea of using something like strace for the scripts (and
children thereof) to trap all creating and linking syscalls... 

Thanks,

Jim





-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

X Strike Force SVN commit: rev 402 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 13:46:35 -0500 (Tue, 19 Aug 2003)
New Revision: 402

Modified:
   trunk/debian/xserver-xfree86.config.in
   trunk/debian/xserver-xfree86.preinst.in
Log:
Fix syntax and logic errors uncaught from revision 396.

debian/xserver-xfree86.config.in:
  - debug_report_status() should call debug_echo(), not message()
(lest we scare the user with harmless messages)
  - fix missing line-continuation bug

debian/xserver-xfree86.preinst.in: fix syntax/logic error; close if
  statements checking for existence of configuration files


Modified: trunk/debian/xserver-xfree86.config.in
===
--- trunk/debian/xserver-xfree86.config.in  2003-08-19 09:31:59 UTC (rev 401)
+++ trunk/debian/xserver-xfree86.config.in  2003-08-19 18:46:35 UTC (rev 402)
@@ -39,7 +39,7 @@
 
 debug_report_status () {
   # Syntax: debug_report_status command exit_status
-  message "$1 exited with status $2"
+  debug_echo "$1 exited with status $2"
 }
 
 discover_video () {
@@ -434,7 +434,7 @@
 # default")
 PRIORITY_CEILING=
 if [ -e "$XF86CONFIG" ]; then
-  debug_echo "$XF86CONFIG file exists; capping configuration question"
+  debug_echo "$XF86CONFIG file exists; capping configuration question" \
  "priority at medium."
   PRIORITY_CEILING=medium
 fi

Modified: trunk/debian/xserver-xfree86.preinst.in
===
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-19 09:31:59 UTC (rev 401)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-08-19 18:46:35 UTC (rev 402)
@@ -40,46 +40,49 @@
 
   # first, migrate the X server symlink
   if [ -e "$SERVER_SYMLINK" ]; then
-  # attempt to pre-seed the md5sum file based on the current content of
-  # the file
-  db_get shared/clobber_x-server_symlink
-  if [ "$RET" = "true" ]; then
-# if the config file doesn't even exist, don't bother
-if [ -e "$SERVER_SYMLINK" ]; then
-  # people were letting debconf "manage" the config file even
-  # though they complained when it did so, so store a backup to
-  # keep people quiet
-  message "Note: migrating $SERVER_SYMLINK away from management" \
-  "by debconf; backup stored in $SERVER_SYMLINK.dpkg-old" \
-  "and MD5 checksum stored in $SERVER_SYMLINK_CHECKSUM"
-  readlink "$SERVER_SYMLINK" | md5sum > "$SERVER_SYMLINK_CHECKSUM"
-  ln -s "$(readlink "$SERVER_SYMLINK")" "$SERVER_SYMLINK.dpkg-old"
+# attempt to pre-seed the md5sum file based on the current content
+# of the file
+db_get shared/clobber_x-server_symlink
+if [ "$RET" = "true" ]; then
+  # if the config file doesn't even exist, don't bother
+  if [ -e "$SERVER_SYMLINK" ]; then
+# people were letting debconf "manage" the config file even
+# though they complained when it did so, so store a backup to
+# keep people quiet
+message "Note: migrating $SERVER_SYMLINK away from management" \
+"by debconf; backup stored in" \
+"$SERVER_SYMLINK.dpkg-old and MD5 checksum stored in" \
+"$SERVER_SYMLINK_CHECKSUM"
+readlink "$SERVER_SYMLINK" | md5sum > "$SERVER_SYMLINK_CHECKSUM"
+ln -s "$(readlink "$SERVER_SYMLINK")" "$SERVER_SYMLINK.dpkg-old"
+  fi
+else
+  message "Note: not storing MD5 checksum of $SERVER_SYMLINK;" \
+  "file not under management of debconf."
 fi
-  else
-message "Note: not storing MD5 checksum of $SERVER_SYMLINK; file" \
-"not under management of debconf."
   fi
 
   # next, migrate XF86Config-4
   if [ -e "$XF86CONFIG" ]; then
-  # attempt to pre-seed the md5sum file based on the current content of
-  # the file
-  db_get xserver-xfree86/manage_config_with_debconf
-  if [ "$RET" = "true" ]; then
-# if the config file doesn't even exist, don't bother
-if [ -e "$XF86CONFIG" ]; then
-  # people were letting debconf "manage" the config file even though
-  # they complained when it did so, so store a backup to keep people
-  # quiet
-  message "Note: migrating $XF86CONFIG away from management by" \
-  "debconf; backup stored in $XF86CONFIG.dpkg-old and MD5" \
-  "checksum stored in $XF86CONFIG_CHECKSUM"
-  md5sum "$XF86CONFIG" > "$XF86CONFIG_CHECKSUM"
-  cp "$XF86CONFIG" "$XF86CONFIG.dpkg-old"
+# attempt to pre-seed the md5sum file based on the current content
+# of the file
+db_get xs

X Strike Force SVN commit: rev 403 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 13:58:20 -0500 (Tue, 19 Aug 2003)
New Revision: 403

Modified:
   trunk/debian/rules
Log:
debian/rules: fix stupid typos that caused spurious creation of "755"
  directories in build tree


Modified: trunk/debian/rules
===
--- trunk/debian/rules  2003-08-19 18:46:35 UTC (rev 402)
+++ trunk/debian/rules  2003-08-19 18:58:20 UTC (rev 403)
@@ -351,7 +351,7 @@
dh_testroot
dh_install --sourcedir=debian/tmp
# special handling
-   install -d 755 debian/xserver-xfree86-dbg/usr/X11R6/man/man1
+   install -m 755 -d debian/xserver-xfree86-dbg/usr/X11R6/man/man1
install -m 644 debian/tmp/usr/X11R6/man/man1/XFree86.1x 
debian/xserver-xfree86-dbg/usr/X11R6/man/man1/XFree86-debug.1x
dh_installdebconf
dh_installdirs
@@ -492,7 +492,7 @@
dh_testroot
dh_install --sourcedir=debian/tmp
# special handling
-   install -d 755 debian/xserver-xfree86-dbg/usr/X11R6/man/man1
+   install -m 755 -d debian/xserver-xfree86-dbg/usr/X11R6/man/man1
install -m 644 debian/tmp/usr/X11R6/man/man1/XFree86.1x 
debian/xserver-xfree86-dbg/usr/X11R6/man/man1/XFree86-debug.1x
dh_installdebconf
dh_installdirs


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

X Strike Force SVN commit: rev 404 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 14:02:36 -0500 (Tue, 19 Aug 2003)
New Revision: 404

Modified:
   trunk/debian/rules
Log:
debian/rules:
  - update copyright notice
  - add $Id$ expando
  - set svn:keywords property to "Id"


Modified: trunk/debian/rules
===
--- trunk/debian/rules  2003-08-19 18:58:20 UTC (rev 403)
+++ trunk/debian/rules  2003-08-19 19:02:36 UTC (rev 404)
@@ -4,11 +4,13 @@
 # Modified by Mark W. Eichin <[EMAIL PROTECTED]>
 # Modified by Adam Heath <[EMAIL PROTECTED]>
 # Modified by Branden Robinson <[EMAIL PROTECTED]>
-# Copyright 1996-2001 Software in the Public Interest, Inc.
+# Copyright 1996--2003 Software in the Public Interest, Inc.
 # Licensed under the GNU General Public License, version 2.  See the file
 # /usr/share/common-licenses/GPL or .
 # Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
 
+# $Id$
+
 # default rule to keep things from going nuts by accident
 default: environment
 


Property changes on: trunk/debian/rules
___
Name: svn:keywords
   + Id


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

X Strike Force SVN commit: rev 405 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 14:48:34 -0500 (Tue, 19 Aug 2003)
New Revision: 405

Modified:
   trunk/debian/xserver-xfree86.preinst.in
Log:
debian/xserver-xfree86.preinst.in: *weeps* I can't get this fucking preinst
  script right to save my life.  It passes sh -n now, it really does.


Modified: trunk/debian/xserver-xfree86.preinst.in
===
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-19 19:02:36 UTC (rev 404)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-08-19 19:48:34 UTC (rev 405)
@@ -91,6 +91,7 @@
   "directory."
 fi
   fi
+fi
 
 # in other news, unregister the now no-longer-used templates
 db_unregister shared/clobber_x-server_symlink


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

xfree86_4.3.0-0pre1v1_hppa.changes ACCEPTED

[Debian Installer]

Accepted:
lbxproxy_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/lbxproxy_4.3.0-0pre1v1_hppa.deb
libdps-dev_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libdps-dev_4.3.0-0pre1v1_hppa.deb
libdps1-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libdps1-dbg_4.3.0-0pre1v1_hppa.deb
libdps1_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libdps1_4.3.0-0pre1v1_hppa.deb
libxaw6-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libxaw6-dbg_4.3.0-0pre1v1_hppa.deb
libxaw6-dev_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libxaw6-dev_4.3.0-0pre1v1_hppa.deb
libxaw6_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libxaw6_4.3.0-0pre1v1_hppa.deb
libxaw7-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libxaw7-dbg_4.3.0-0pre1v1_hppa.deb
libxaw7-dev_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libxaw7-dev_4.3.0-0pre1v1_hppa.deb
libxaw7_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libxaw7_4.3.0-0pre1v1_hppa.deb
proxymngr_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/proxymngr_4.3.0-0pre1v1_hppa.deb
twm_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/twm_4.3.0-0pre1v1_hppa.deb
x-window-system-core_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/x-window-system-core_4.3.0-0pre1v1_hppa.deb
xbase-clients_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xbase-clients_4.3.0-0pre1v1_hppa.deb
xdm_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xdm_4.3.0-0pre1v1_hppa.deb
xfs_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xfs_4.3.0-0pre1v1_hppa.deb
xfwp_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xfwp_4.3.0-0pre1v1_hppa.deb
xlibmesa-dri_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-dri_4.3.0-0pre1v1_hppa.deb
xlibmesa-gl-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-gl-dbg_4.3.0-0pre1v1_hppa.deb
xlibmesa-gl-dev_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-gl-dev_4.3.0-0pre1v1_hppa.deb
xlibmesa-gl_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-gl_4.3.0-0pre1v1_hppa.deb
xlibmesa-glu-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-glu-dbg_4.3.0-0pre1v1_hppa.deb
xlibmesa-glu-dev_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-glu-dev_4.3.0-0pre1v1_hppa.deb
xlibmesa-glu_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-glu_4.3.0-0pre1v1_hppa.deb
xlibs-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibs-dbg_4.3.0-0pre1v1_hppa.deb
xlibs-dev_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibs-dev_4.3.0-0pre1v1_hppa.deb
xlibs-static-pic_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibs-static-pic_4.3.0-0pre1v1_hppa.deb
xlibs_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibs_4.3.0-0pre1v1_hppa.deb
xmh_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xmh_4.3.0-0pre1v1_hppa.deb
xnest_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xnest_4.3.0-0pre1v1_hppa.deb
xprt_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xprt_4.3.0-0pre1v1_hppa.deb
xserver-common_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xserver-common_4.3.0-0pre1v1_hppa.deb
xserver-xfree86-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xserver-xfree86-dbg_4.3.0-0pre1v1_hppa.deb
xserver-xfree86_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xserver-xfree86_4.3.0-0pre1v1_hppa.deb
xterm_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xterm_4.3.0-0pre1v1_hppa.deb
xutils_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xutils_4.3.0-0pre1v1_hppa.deb
xvfb_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xvfb_4.3.0-0pre1v1_hppa.deb


Thank you for your contribution to Debian.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

X Strike Force SVN commit: rev 406 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 19:36:10 -0500 (Tue, 19 Aug 2003)
New Revision: 406

Modified:
   trunk/debian/xserver-xfree86.postinst.in
Log:
debian/xserver-xfree86.postinst.in: fix another combination syntax/logic
  error; close open if block and react gracefully if for some loony reason
  the user has made the X server symlink point to a directory


Modified: trunk/debian/xserver-xfree86.postinst.in
===
--- trunk/debian/xserver-xfree86.postinst.in2003-08-19 19:48:34 UTC (rev 405)
+++ trunk/debian/xserver-xfree86.postinst.in2003-08-20 00:36:10 UTC (rev 406)
@@ -58,10 +58,16 @@
   NEW_SERVER_SYMLINK="$SERVER_SYMLINK.dpkg-new"
   ln -sf "$THIS_SERVER" "$NEW_SERVER_SYMLINK"
   if ! cmp -s "$SERVER_SYMLINK" "$NEW_SERVER_SYMLINK"; then
-  if [ "$(readlink "$SERVER_SYMLINK")" \
-   != "$(readlink "$NEW_SERVER_SYMLINK")" ]; then
-mv "$NEW_SERVER_SYMLINK" "$SERVER_SYMLINK"
-readlink "$SERVER_SYMLINK" | m5sum > "$SERVER_SYMLINK_CHECKSUM"
+if [ "$(readlink "$SERVER_SYMLINK")" \
+ != "$(readlink "$NEW_SERVER_SYMLINK")" ]; then
+  if [ ! -d "$SERVER_SYMLINK" ]; then
+mv "$NEW_SERVER_SYMLINK" "$SERVER_SYMLINK"
+readlink "$SERVER_SYMLINK" | m5sum > "$SERVER_SYMLINK_CHECKSUM"
+  else
+message "Note: not updating $SERVER_SYMLINK; it is a symbolic" \
+"link to a directory"
+  fi
+fi
   fi
   rm -f "$NEW_SERVER_SYMLINK"
 fi


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

X Strike Force SVN commit: rev 407 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 19:44:26 -0500 (Tue, 19 Aug 2003)
New Revision: 407

Modified:
   trunk/debian/xserver-common.postinst.in
   trunk/debian/xserver-common.preinst.in
   trunk/debian/xserver-xfree86.postinst.in
   trunk/debian/xserver-xfree86.preinst.in
   trunk/debian/xserver-xfree86.prerm.in
Log:
(cosmetic) cleanups to user-visible messages
  debian/xserver-common.postinst.in
  debian/xserver-common.preinst.in
  debian/xserver-xfree86.postinst.in
  debian/xserver-xfree86.preinst.in
  debian/xserver-xfree86.prerm.in


Modified: trunk/debian/xserver-common.postinst.in
===
--- trunk/debian/xserver-common.postinst.in 2003-08-20 00:36:10 UTC (rev 406)
+++ trunk/debian/xserver-common.postinst.in 2003-08-20 00:44:26 UTC (rev 407)
@@ -64,14 +64,14 @@
   fi
   rm -f "$NEW_XWRAPPER_CONFIG"
 else
-  message "Note: not updating $XWRAPPER_CONFIG; file has been customized"
+  message "Note: not updating $XWRAPPER_CONFIG; file has been customized."
 fi
   else
 message "Note: not updating $XWRAPPER_CONFIG; no stored MD5 checksum" \
-"available"
+"available."
   fi
 else
-  message "Note: not updating $XWRAPPER_CONFIG; file does not exist"
+  message "Note: not updating $XWRAPPER_CONFIG; file does not exist."
 fi
 
 exit 0

Modified: trunk/debian/xserver-common.preinst.in
===
--- trunk/debian/xserver-common.preinst.in  2003-08-20 00:36:10 UTC (rev 406)
+++ trunk/debian/xserver-common.preinst.in  2003-08-20 00:44:26 UTC (rev 407)
@@ -31,7 +31,8 @@
 
   # /etc/X11/Xserver obsolete as of 4.0.1-6
   if [ -e /etc/X11/Xserver ]; then
-message "Note: Moving obsolete file /etc/X11/Xserver to 
/etc/X11/Xserver.xserver-common-backup"
+message "Note: Moving obsolete file /etc/X11/Xserver to" \
+"/etc/X11/Xserver.xserver-common-backup."
 mv /etc/X11/Xserver /etc/X11/Xserver.xserver-common-backup
   fi
 
@@ -66,7 +67,7 @@
   # quiet
   message "Note: migrating $XWRAPPER_CONFIG away from management" \
   "by debconf; backup stored in $XWRAPPER_CONFIG.dpkg-old" \
-  "and MD5 checksum stored in $XWRAPPER_CONFIG_CHECKSUM"
+  "and MD5 checksum stored in $XWRAPPER_CONFIG_CHECKSUM."
   md5sum "$XWRAPPER_CONFIG" > "$XWRAPPER_CONFIG_CHECKSUM"
   cp "$XWRAPPER_CONFIG" "$XWRAPPER_CONFIG.dpkg-old"
 fi

Modified: trunk/debian/xserver-xfree86.postinst.in
===
--- trunk/debian/xserver-xfree86.postinst.in2003-08-20 00:36:10 UTC (rev 406)
+++ trunk/debian/xserver-xfree86.postinst.in2003-08-20 00:44:26 UTC (rev 407)
@@ -65,7 +65,7 @@
 readlink "$SERVER_SYMLINK" | m5sum > "$SERVER_SYMLINK_CHECKSUM"
   else
 message "Note: not updating $SERVER_SYMLINK; it is a symbolic" \
-"link to a directory"
+"link to a directory."
   fi
 fi
   fi
@@ -74,17 +74,17 @@
   else
 message "Note: not updating $SERVER_SYMLINK; no default X server" \
 "configured; run \"dpkg-reconfigure $THIS_PACKAGE\" to" \
-"correct this"
+"correct this."
   fi
 else
-  message "Note: not updating $SERVER_SYMLINK; file has been customized"
+  message "Note: not updating $SERVER_SYMLINK; file has been customized."
 fi
   else
 message "Note: not updating $SERVER_SYMLINK; no stored MD5 checksum" \
-"available"
+"available."
   fi
 else
-  message "Note: not updating $SERVER_SYMLINK; file does not exist"
+  message "Note: not updating $SERVER_SYMLINK; file does not exist."
 fi
 
 # only mess with X server config file if it exists; if it does not, assume
@@ -108,18 +108,18 @@
   else
 message "Note: error while preparing new XFree86 X server" \
 "configuration file in $NEW_XF86CONFIG; not attempting to" \
-"update existing configuration"
+"update existing configuration."
   fi
   rm -f "$NEW_XF86CONFIG"
 else
-  message "Note: not updating $XF86CONFIG; file has been customized"
+  message "Note: not updating $XF86CONFIG; file has been customized."
 fi
   else
 message "Note: not updating $XF86CONFIG; no stored MD5 checksum" \
-"available"
+"available."
   fi
 else
-  message "Note: not updating $XF86CONFIG; file does not exist"
+  message "Note: not updating $XF86CONFIG; file does not exist."
 fi
 
 # register X server configlet

Modified: trunk/debian/xserver-xfree86.preinst.in
===
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-20 00:36:10 UTC (rev 406)
+++ trunk/debian/xserver-xfree86.preinst.in 

X Strike Force SVN commit: rev 408 - trunk/debian/local

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 21:51:17 -0500 (Tue, 19 Aug 2003)
New Revision: 408

Modified:
   trunk/debian/local/dexconf
Log:
debian/local/dexconf: fix stupid thinko in option parsing


Modified: trunk/debian/local/dexconf
===
--- trunk/debian/local/dexconf  2003-08-20 00:44:26 UTC (rev 407)
+++ trunk/debian/local/dexconf  2003-08-20 02:51:17 UTC (rev 408)
@@ -81,9 +81,9 @@
 
 while :; do
 case "$1" in
--f|--format) FORMAT="$1"; shift ;;
+-f|--format) FORMAT="$2"; shift ;;
 -h|--help) SHOWHELP=yes EARLYEXIT=yes ;;
--o|--output) XF86CONFIG="$1"; shift ;;
+-o|--output) XF86CONFIG="$2"; shift ;;
 --) shift; break ;;
 *) bomb "error while parsing options; use \"$PROGNAME --help\" for help" ;;
 esac


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

X Strike Force SVN commit: rev 409 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 21:53:09 -0500 (Tue, 19 Aug 2003)
New Revision: 409

Modified:
   trunk/debian/xserver-common.preinst.in
Log:
debian/xserver-common.preinst.in: don't issue a message telling the user
  we're not doing anything


Modified: trunk/debian/xserver-common.preinst.in
===
--- trunk/debian/xserver-common.preinst.in  2003-08-20 02:51:17 UTC (rev 408)
+++ trunk/debian/xserver-common.preinst.in  2003-08-20 02:53:09 UTC (rev 409)
@@ -72,9 +72,6 @@
   cp "$XWRAPPER_CONFIG" "$XWRAPPER_CONFIG.dpkg-old"
 fi
   fi
-else
-  message "Note: not storing MD5 checksum of $XWRAPPER_CONFIG; file not" \
-  "under management of debconf."
 fi
 
 # in other news, unregister the now no-longer-used templates


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

X Strike Force SVN commit: rev 410 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 21:57:05 -0500 (Tue, 19 Aug 2003)
New Revision: 410

Modified:
   trunk/debian/xserver-xfree86.preinst.in
Log:
debian/xserver-xfree86.preinst.in: migration-from-debconf-"management"
  logic fixes:
  - remove redundant test for existence of X server symlink
  - base migration of existing X server symlink on the value of
shared/default-x-server being the same as the package being upgraded,
and the server symlink actually pointing to the server executable
provided by the package; do not pay any attention to the value of
shared/clobber_x-server_symlink
  - store the target of the X server symlink in a variable since we
reference it more than once
  - don't show the user messages telling him we're not doing anything


Modified: trunk/debian/xserver-xfree86.preinst.in
===
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-20 02:53:09 UTC (rev 409)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-08-20 02:57:05 UTC (rev 410)
@@ -21,6 +21,7 @@
 CHECKSUM_DIR=/var/lib/xfree86
 SERVER_SYMLINK_CHECKSUM="$CHECKSUM_DIR/$(basename "$SERVER_SYMLINK").md5sum"
 XF86CONFIG_CHECKSUM="$CHECKSUM_DIR/$(basename "$XF86CONFIG").md5sum"
+THIS_SERVER=/usr/bin/X11/XFree86
 
 if [ "$1" = "install" -o "$1" = "upgrade" ]; then
   # if upgrading from < 4.2.1-10, migrate X server symlink and XF86Config-4
@@ -41,11 +42,14 @@
   # first, migrate the X server symlink
   if [ -e "$SERVER_SYMLINK" ]; then
 # attempt to pre-seed the md5sum file based on the current content
-# of the file
-db_get shared/clobber_x-server_symlink
-if [ "$RET" = "true" ]; then
-  # if the config file doesn't even exist, don't bother
-  if [ -e "$SERVER_SYMLINK" ]; then
+# of the file; first, is this package selected as the one
+# containing the default X server?
+db_get shared/default-x-server
+if [ "$RET" = "$THIS_PACKAGE" ]; then
+  # next, does the symlink point to the server executable provided
+  # by this package?
+  CURRENT_SYMLINK_TARGET=$(readlink "$SERVER_SYMLINK")
+  if [ "$CURRENT_SYMLINK_TARGET" = "$THIS_SERVER" ]; then
 # people were letting debconf "manage" the config file even
 # though they complained when it did so, so store a backup to
 # keep people quiet
@@ -53,12 +57,9 @@
 "by debconf; backup stored in" \
 "$SERVER_SYMLINK.dpkg-old and MD5 checksum stored in" \
 "$SERVER_SYMLINK_CHECKSUM."
-readlink "$SERVER_SYMLINK" | md5sum > "$SERVER_SYMLINK_CHECKSUM"
-ln -s "$(readlink "$SERVER_SYMLINK")" "$SERVER_SYMLINK.dpkg-old"
+echo "$CURRENT_SYMLINK_TARGET" | md5sum > "$SERVER_SYMLINK_CHECKSUM"
+ln -s "$CURRENT_SYMLINK_TARGET" "$SERVER_SYMLINK.dpkg-old"
   fi
-else
-  message "Note: not storing MD5 checksum of $SERVER_SYMLINK;" \
-  "file not under management of debconf."
 fi
   fi
 
@@ -79,9 +80,6 @@
 md5sum "$XF86CONFIG" > "$XF86CONFIG_CHECKSUM"
 cp "$XF86CONFIG" "$XF86CONFIG.dpkg-old"
   fi
-else
-  message "Note: not storing MD5 checksum of $XF86CONFIG; file" \
-  "not under management of debconf."
 fi
   fi
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Re: Thank you!

[Unexpected reply handler]

Subject: This is an AutoResponse from eBay
 
Thank you for your response. As this is an automated email, please do not reply.
 
If you have a question for eBay Customer Support, please visit the following
 eBay Help page. This page will help you locate the answer to your question,
 or assist you in contacting eBay Customer Support.
 
http://pages.ebay.com/help/index_popup.html
 
To change your notification preferences, which determine how you would like
 eBay to communicate with you, please visit our Notification Preferences
 Change page (please note that it might take a few days to process your
 request). 
 
http://cgi3.ebay.com/aw-cgi/eBayISAPI.dll?OptinLoginShow
 
As always, we appreciate your patronage.
 
Regards,
eBay


-- 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

X Strike Force SVN commit: rev 411 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 22:27:04 -0500 (Tue, 19 Aug 2003)
New Revision: 411

Modified:
   trunk/debian/xserver-xfree86.postinst.in
Log:
debian/xserver-xfree86.postinst.in: *sigh* still more fixes for my own
  stupidity; the command is called "md5sum", not "m5sum"; hello, fumble
  fingers


Modified: trunk/debian/xserver-xfree86.postinst.in
===
--- trunk/debian/xserver-xfree86.postinst.in2003-08-20 02:57:05 UTC (rev 410)
+++ trunk/debian/xserver-xfree86.postinst.in2003-08-20 03:27:04 UTC (rev 411)
@@ -44,7 +44,7 @@
   if [ -e "$SERVER_SYMLINK_CHECKSUM" ]; then
 # compare the current and stored checksums; if they do not match, assume
 # that's the way the user wants it
-CURRENT_MD5SUM=$(readlink "$SERVER_SYMLINK" | m5sum)
+CURRENT_MD5SUM=$(readlink "$SERVER_SYMLINK" | md5sum)
 if [ "$CURRENT_MD5SUM" = "$(cat "$SERVER_SYMLINK_CHECKSUM")" ]; then
   # finally, only update the symlink if this package contains the selected
   # default X server
@@ -62,7 +62,7 @@
  != "$(readlink "$NEW_SERVER_SYMLINK")" ]; then
   if [ ! -d "$SERVER_SYMLINK" ]; then
 mv "$NEW_SERVER_SYMLINK" "$SERVER_SYMLINK"
-readlink "$SERVER_SYMLINK" | m5sum > "$SERVER_SYMLINK_CHECKSUM"
+readlink "$SERVER_SYMLINK" | md5sum > "$SERVER_SYMLINK_CHECKSUM"
   else
 message "Note: not updating $SERVER_SYMLINK; it is a symbolic" \
 "link to a directory."


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

X Strike Force SVN commit: rev 412 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 22:30:44 -0500 (Tue, 19 Aug 2003)
New Revision: 412

Modified:
   trunk/debian/xserver-common.postinst.in
   trunk/debian/xserver-xfree86.postinst.in
Log:
debian/xserver-{common,xfree86}.postinst.in: minor logic simplification;
  don't create a variable that is only dereferenced once


Modified: trunk/debian/xserver-common.postinst.in
===
--- trunk/debian/xserver-common.postinst.in 2003-08-20 03:27:04 UTC (rev 411)
+++ trunk/debian/xserver-common.postinst.in 2003-08-20 03:30:44 UTC (rev 412)
@@ -45,8 +45,7 @@
   if [ -e "$XWRAPPER_CONFIG_CHECKSUM" ]; then
 # next, compare the current and stored checksums; if they do not match,
 # assume that's the way the user wants it
-CURRENT_MD5SUM=$(md5sum "$XWRAPPER_CONFIG")
-if [ "$CURRENT_MD5SUM" = "$(cat "$XWRAPPER_CONFIG_CHECKSUM")" ]; then
+if [ "$(md5sum "$XWRAPPER_CONFIG")" = "$(cat "$XWRAPPER_CONFIG_CHECKSUM")" ]; then
   # they match; prepare a new version of the config file
   db_get xserver-common/xwrapper/actual_allowed_users
   ALLOWED_USERS="$RET"

Modified: trunk/debian/xserver-xfree86.postinst.in
===
--- trunk/debian/xserver-xfree86.postinst.in2003-08-20 03:27:04 UTC (rev 411)
+++ trunk/debian/xserver-xfree86.postinst.in2003-08-20 03:30:44 UTC (rev 412)
@@ -44,8 +44,7 @@
   if [ -e "$SERVER_SYMLINK_CHECKSUM" ]; then
 # compare the current and stored checksums; if they do not match, assume
 # that's the way the user wants it
-CURRENT_MD5SUM=$(readlink "$SERVER_SYMLINK" | md5sum)
-if [ "$CURRENT_MD5SUM" = "$(cat "$SERVER_SYMLINK_CHECKSUM")" ]; then
+if [ "$(readlink "$SERVER_SYMLINK" | md5sum)" = "$(cat 
"$SERVER_SYMLINK_CHECKSUM")" ]; then
   # finally, only update the symlink if this package contains the selected
   # default X server
   db_get shared/default-x-server
@@ -95,8 +94,7 @@
   if [ -e "$XF86CONFIG_CHECKSUM" ]; then
 # compare the current and stored checksums; if they do not match, assume
 # that's the way the user wants it
-CURRENT_MD5SUM=$(md5sum "$XF86CONFIG")
-if [ "$CURRENT_MD5SUM" = "$(cat "$XF86CONFIG_CHECKSUM")" ]; then
+if [ "$(md5sum "$XF86CONFIG")" = "$(cat "$XF86CONFIG_CHECKSUM")" ]; then
   # they match; prepare a new version of the config file
   NEW_XF86CONFIG=$(tempfile)
   if dexconf -o "$NEW_XF86CONFIG"; then


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

X Strike Force SVN commit: rev 413 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 22:59:58 -0500 (Tue, 19 Aug 2003)
New Revision: 413

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
debian/control: for xserver-xfree86 and xserver-xfree86-dbg, tighten the
  versioning of the dependency on xserver-common to (>= 4.2.1-10); these
  packages' postinst scripts use functionality that was broken in earlier
  versions of dexconf


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2003-08-20 03:30:44 UTC (rev 412)
+++ trunk/debian/changelog  2003-08-20 03:59:58 UTC (rev 413)
@@ -210,6 +210,10 @@
   + update "FUTURE DIRECTIONS" section
 - debian/local/dexlet/main.py: only mess with the obsolete debconf
   templates when configuring an XFree86 3.x X server
+- debian/control: for xserver-xfree86 and xserver-xfree86-dbg, tighten the
+  versioning of the dependency on xserver-common to (>= 4.2.1-10); these
+  packages' postinst scripts use functionality that was broken in earlier
+  versions of dexconf
 
   * Add technique for deciding when to purge non-conffile configuration files;
 maintain a roster file corresponding to the config file, for which each
@@ -258,7 +262,7 @@
 in /tmp because we couldn't write one in $HOME (based on a patch by Neil
 Brown -- thanks!) (Closes: #206141)
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 04:21:59 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 22:58:08 -0500
 
 xfree86 (4.2.1-9) unstable; urgency=high
 

Modified: trunk/debian/control
===
--- trunk/debian/control2003-08-20 03:30:44 UTC (rev 412)
+++ trunk/debian/control2003-08-20 03:59:58 UTC (rev 413)
@@ -882,7 +882,7 @@
 
 Package: xserver-xfree86
 Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc 
sh3 sh4 sparc
-Depends: xserver-common (>= 4.1.0-10), ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common (>= 4.2.1-10), ${shlibs:Depends}, ${misc:Depends}
 Suggests: discover, mdetect, read-edid
 Conflicts: libxfont-xtt
 Replaces: xserver-common (<< 4.0), libxfont-xtt
@@ -911,7 +911,7 @@
 Package: xserver-xfree86-dbg
 Priority: extra
 Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc 
sh3 sh4 sparc
-Depends: xserver-common (>= 4.1.0-10), ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common (>= 4.2.1-10), ${shlibs:Depends}, ${misc:Depends}
 Recommends: xserver-xfree86
 Suggests: discover, mdetect, read-edid
 Conflicts: libxfont-xtt


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Re: X Strike Force SVN commit: rev 410 - trunk/debian

[Daniel Stone]

On Tue, Aug 19, 2003 at 09:57:09PM -0500, X Strike Force SVN Admin wrote:
>   - don't show the user messages telling him we're not doing anything

Women use Debian, too. :P

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.debian.org - http://www.kde.org - http://www.freedesktop.org
"Configurability is always the best choice when it's pretty simple to implement"
  -- Havoc Pennington, gnome-list


pgp0.pgp
Description: PGP signature

X Strike Force SVN commit: rev 414 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 23:51:15 -0500 (Tue, 19 Aug 2003)
New Revision: 414

Modified:
   trunk/debian/xserver-common.preinst.in
   trunk/debian/xserver-xfree86.preinst.in
Log:
debian/xserver-{common,xfree86}.preinst.in: add more robustification to
  config file migration strategy;
  - use "lt-nl" operator instead of "lt" when invoking dpkg
--compare-versions; if we know of no previous configured version of the
package, don't bother attempting to migrate at all
  - wrap "db_get"s in if statements so that if for some reason the debconf
template of interest has already been purged, the script does not fail


Modified: trunk/debian/xserver-common.preinst.in
===
--- trunk/debian/xserver-common.preinst.in  2003-08-20 03:59:58 UTC (rev 413)
+++ trunk/debian/xserver-common.preinst.in  2003-08-20 04:51:15 UTC (rev 414)
@@ -38,39 +38,41 @@
 
   # if upgrading from < 4.2.1-10, migrate Xwrapper.config to (simplified)
   # ucf-style handling
-  if dpkg --compare-versions "$2" lt "4.2.1-10"; then
+  if dpkg --compare-versions "$2" lt-nl "4.2.1-10"; then
 # was the user letting the debconf "manage" the file?
-db_get xserver-common/manage_config_with_debconf
-if [ "$RET" = "true" ]; then
-  # yes; attempt to pre-seed the md5sum file based on the current content
-  # of the file
-  WRITE_MD5SUM=yes
-  # if the config file doesn't even exist, don't bother
-  if [ -e "$XWRAPPER_CONFIG" ]; then
-# this is the preinst, so our checksum directory might not have been
-# unpacked yet (in fact, if we're upgrading from < 4.2.1-10, we expect
-# it not to be)
-if [ ! -e "$CHECKSUM_DIR" ]; then
-  mkdir --mode=755 "$CHECKSUM_DIR"
-else
-  # if the checksum pathname does exist but is not a directory, give
-  # up; dpkg will probably vomit on unpack anyway
-  if [ ! -d "$CHECKSUM_DIR" ]; then
-message "Warning: cannot store MD5 checksum of $XWRAPPER_CONFIG;" \
-"$CHECKSUM_DIR exists but is not a directory."
-WRITE_MD5SUM=
+if db_get xserver-common/manage_config_with_debconf; then
+  if [ "$RET" = "true" ]; then
+# yes; attempt to pre-seed the md5sum file based on the current content
+# of the file
+WRITE_MD5SUM=yes
+# if the config file doesn't even exist, don't bother
+if [ -e "$XWRAPPER_CONFIG" ]; then
+  # this is the preinst, so our checksum directory might not have been
+  # unpacked yet (in fact, if we're upgrading from < 4.2.1-10, we
+  # expect it not to be)
+  if [ ! -e "$CHECKSUM_DIR" ]; then
+mkdir --mode=755 "$CHECKSUM_DIR"
+  else
+# if the checksum pathname does exist but is not a directory, give
+# up; dpkg will probably vomit on unpack anyway
+if [ ! -d "$CHECKSUM_DIR" ]; then
+  message "Warning: cannot store MD5 checksum of" \
+  "$XWRAPPER_CONFIG; $CHECKSUM_DIR exists but is not a" \
+  "directory."
+  WRITE_MD5SUM=
+fi
   fi
+  if [ -n "$WRITE_MD5SUM" ]; then
+# people were letting debconf "manage" the config file even though
+# they complained when it did so, so store a backup to keep people
+# quiet
+message "Note: migrating $XWRAPPER_CONFIG away from management" \
+"by debconf; backup stored in $XWRAPPER_CONFIG.dpkg-old" \
+"and MD5 checksum stored in $XWRAPPER_CONFIG_CHECKSUM."
+md5sum "$XWRAPPER_CONFIG" > "$XWRAPPER_CONFIG_CHECKSUM"
+cp "$XWRAPPER_CONFIG" "$XWRAPPER_CONFIG.dpkg-old"
+  fi
 fi
-if [ -n "$WRITE_MD5SUM" ]; then
-  # people were letting debconf "manage" the config file even though
-  # they complained when it did so, so store a backup to keep people
-  # quiet
-  message "Note: migrating $XWRAPPER_CONFIG away from management" \
-  "by debconf; backup stored in $XWRAPPER_CONFIG.dpkg-old" \
-  "and MD5 checksum stored in $XWRAPPER_CONFIG_CHECKSUM."
-  md5sum "$XWRAPPER_CONFIG" > "$XWRAPPER_CONFIG_CHECKSUM"
-  cp "$XWRAPPER_CONFIG" "$XWRAPPER_CONFIG.dpkg-old"
-fi
   fi
 fi
 

Modified: trunk/debian/xserver-xfree86.preinst.in
===
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-20 03:59:58 UTC (rev 413)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-08-20 04:51:15 UTC (rev 414)
@@ -26,7 +26,7 @@
 if [ "$1" = "install" -o "$1" = "upgrade" ]; then
   # if upgrading from < 4.2.1-10, migrate X server symlink and XF86Config-4
   # to (simplified) ucf-style handling
-  if dpkg --compare-versions "$2" lt "4.2.1-10"; then
+  if dpkg --compare-versi

Experiments and Problems with 4.3.0-0pre1v1

[Chris]

I just recently had some time to experiment with the pre1v1 packages on two 
machines and so I thought I'd share my results.

Configuration 1:
Debian/unstable (typically updated weekly)
Linux 2.4.21
kernel DRM radeon.o driver version 1.7.0
Athlon XP 1700
ATI Radeon 9000
3Com 905tx NIC

I am still experiencing some unusual behavior that was present in the older 
ds* packages as well.  I get a very high count of ethernet frame errors 
whenever 4.3.0 is running, with or without DRI enabled.  This was never an 
issue with 4.2.1-X.  The Radeon and 3Com card are sharing an IRQ, but this 
really should not matter. (it hasn't mattered in the past or in Windoze that 
is..)  I once had the xserver hang when playing around with KDE's GL 
screensavers too.  I would offhand attribute this to the same issue.

Otherwise, there are some various GL rendering glitches and performance issues 
on this configuration as well. (more details under config 2)  I am using the 
same radeon options in XF86Config for config 1 as config 2.  These are:

Option "AGPMode" "4"
Option "AGPSize" "64"
Option "EnableDepthMoves"
Option "EnablePageFlip"

I will be doing some more thorough testing on this machine in the near future, 
but I wanted to share my results up to this point and see if perhaps anyone 
else has had the same issues.

Configuration 2:
Debian/unstable (updated in sync with Config 1 machine)
Linux 2.4.21
kernel DRM radeon.o driver version 1.7.0
Athlon XP 1600
ATI Radeon 64Mb. VIVO (original Radeon, aka. "7200")
Realtek 8139 NIC

No stability problems on this machine.  However, there are numerous GL 
performance and rendering problems.  Games like TuxRacer run at about half 
the framerate they did back in the 4.2.1-X days before Radeon DRI broke from 
that gcc issue.  glxgears runs at about 1100fps at default window size.  
Also, there are rendering glitches.  The ice in Tuxracer flickers, for 
instance.  When using GL in a window (such as glxgears), text outside the 
window sometimes flickers. (namely icon text on the KDE desktop).  Also, when 
trying to moving the window, there is a roughly 0.5 to 2 sec. hang before the 
screen updates (depends on how demanding the GL app running is).  GL 
Xscreensaver hacks running full screen flicker terribly as if refreshes are 
happening randomly.

Maybe I'm missing something.  Or maybe 4.3.0 is just a troubled release.  Does 
anyone have their radeon card working perfectly?  If so, what options are you 
using?

Chris

Bug#206141: xdm login fails when .Xauthority cannot be written to

[Branden Robinson]

tag 206141 + patch
thanks

On Tue, Aug 19, 2003 at 09:49:31AM +1000, Neil Brown wrote:
> When xdm cannot write to $HOME/.Xauthority, such as when the user is over 
> quota,
> it tried to create a .Xauthority file in /tmp and use that.
> This breaks due to patch/002_xdm_fixes.diff
> In particular openFiles causes a segmentation violation.
> 
> Towards the end of the patches openFile are the lines:
> 
> + if (oldp)
> + *oldp = fopen (name, "r");
> + if (*oldp)
> + Debug ("open succeeded %s\n", name);
> 
> if oldp is NULL, as it will be in this case, the
>if (*oldp)
> will dereference a NULL pointer - and BANG.

Thanks very much for this bug report and analysis.  I wish more bug
reports against my packages were like yours.

-- 
G. Branden Robinson|America is at that awkward stage.
Debian GNU/Linux   |It's too late to work within the
[EMAIL PROTECTED] |system, but too early to shoot the
http://people.debian.org/~branden/ |bastards.   -- Claire Wolfe


pgpBl63vN2pXA.pgp
Description: PGP signature

Processed: retitle 206141 to xdm: SEGV in auth.c:openFiles() when .Xauthority cannot be written to

[Debian Bug Tracking System]

Processing commands for [EMAIL PROTECTED]:

> retitle 206141 xdm: SEGV in auth.c:openFiles() when .Xauthority cannot be 
> written to
Bug#206141: xdm login fails when .Xauthority cannot be written to
Changed Bug title.

>
End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)

Processed: Re: Bug#206141: xdm login fails when .Xauthority cannot be written to

[Debian Bug Tracking System]

Processing commands for [EMAIL PROTECTED]:

> tag 206141 + patch
Bug#206141: xdm: SEGV in auth.c:openFiles() when .Xauthority cannot be written 
to
There were no tags set.
Tags added: patch

> thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)

Bug#205973: acknowledged by developer (Re: Bug#205973: xlibs: /usr/X11R6/lib/X11/xkb/compiled)

[Branden Robinson]

On Mon, Aug 18, 2003 at 10:22:46PM -0400, Jim Bray wrote:
>  I did a reinstall of xbase-clients and it did create the
> symlink. It appears possible that an 'event' involving
> the 2.6.0-pre3 kernel might have led to some silent
> Reiserfs deletions. That kernel is not ready for prime time.

Okay.  I'm glad to hear my packages (probably) weren't at fault.

> dpkg -S still shows no owner of the symlink in question:
> 
> xkb/2#dpkg -S `pwd`/compiled*
> dpkg: /usr/X11R6/lib/X11/xkb/compiled not found.

They won't; dpkg -S reports only on a package's "payload"; that is,
stuff in /var/lib/dpkg/info/$package.list, not stuff created by the
package's maintainer scripts.

> On Mon, 2003-08-18 at 15:45, Branden Robinson wrote:
> > That's not the only way to look for it.  Dpkg manages symlinks to
> > directories poorly, so you'll find that the xbase-clients preinst and
> > postinst scripts manage this symlink.
> 
>  OK, I'd been operating on the mistaken assumption that if
> dpkg -S doesn't find a given file, the file is not managed
> by Debian.

It does mean that it's not installed or removed by dpkg as such.

> Obviously that isn't right. If you can recommend
> the procedure I should have followed to figure out which package was
> responsible for this file, and thus which to try reinstalling, I can
> avoid filing similar mistaken reports. I picked xlibs because
> I could find no owner of /compiled, but the parent dir is owned
> by xlibs:
> 
> xkb/2#dpkg -S `pwd`
> xlibs: /usr/X11R6/lib/X11/xkb

Unfortunately there is no wonderful method for determining this;
essentially, you have to grep the maintainer scripts in
/var/lib/dpkg/info.

Dpkg provides no mechanism at present for permitting packages to
"register" additional filenames that a package doesn't unpack, but might
be interested in.

-- 
G. Branden Robinson|  There's no trick to being a
Debian GNU/Linux   |  humorist when you have the whole
[EMAIL PROTECTED] |  government working for you.
http://people.debian.org/~branden/ |  -- Will Rogers


pgpYxPNOfrP06.pgp
Description: PGP signature

X Strike Force SVN commit: rev 395 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 03:03:13 -0500 (Tue, 19 Aug 2003)
New Revision: 395

Added:
   trunk/debian/xdm.logrotate
Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
Perform log rotation on xdm's log file. (Closes: #200699)
  - debian/rules: invoke dh_installlogrotate in binary-arch target
  - debian/xdm.logrotate: new; log rotation policy file


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2003-08-18 22:14:31 UTC (rev 394)
+++ trunk/debian/changelog  2003-08-19 08:03:13 UTC (rev 395)
@@ -195,8 +195,12 @@
 wacky behavior must have been caused by this).  Thanks to Eduard Bloch for
 noticing odd dexconf behavior which led me to this realization.
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Mon, 18 Aug 2003 17:05:00 -0500
+  * Perform log rotation on xdm's log file. (Closes: #200699)
+- debian/rules: invoke dh_installlogrotate in binary-arch target
+- debian/xdm.logrotate: new; log rotation policy file
 
+ -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 02:59:01 -0500
+
 xfree86 (4.2.1-9) unstable; urgency=high
 
   * urgency due to xterm security fixes; see below

Modified: trunk/debian/rules
===
--- trunk/debian/rules  2003-08-18 22:14:31 UTC (rev 394)
+++ trunk/debian/rules  2003-08-19 08:03:13 UTC (rev 395)
@@ -367,6 +367,7 @@
dh_installmenu
dh_installpam
dh_installinit --noscripts
+   dh_installlogrotate
dh_installchangelogs
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip \

Added: trunk/debian/xdm.logrotate
===
--- trunk/debian/xdm.logrotate  2003-08-18 22:14:31 UTC (rev 394)
+++ trunk/debian/xdm.logrotate  2003-08-19 08:03:13 UTC (rev 395)
@@ -0,0 +1,4 @@
+/var/log/xdm.log {
+   notifempty
+   missingok
+}

Fw: the SlCKEST pIace on E/\RTH? Q U j FO

[gojeyo]

 

Hey izoTt Mdnu Debian-x
Debian-x AGkF

Bug#206173: Keyboard option "grp:alt_shift_toggle" not working in XF86Config-4

[Eduard Bloch]

Package: xserver-xfree86
Version: 4.3.0-0pre1v1
Severity: minor
Tags: experimental upstream

Hello,

I use multiple keymaps since I write cyrillic mails from time to time.
With XFree86 4.3, I use the multiple-keymap list feature as showed in
their examples (/etc/X11/xkb/README.config), see config below.

However, pressing Alt-Shift does not anything right after the X start.
The switch function only works when I execute setxkbmap manually,

setxkbmap -option "grp:alt_shift_toggle"

After running it, I can roll trough the keymap list with Alt-Shift as
expected. I remember that I did not need to execute this command when I
used the first packages of Daniel Stone's series, it did not work with
his latest builds and does not work with pre1v1 now.

MfG,
Eduard.

-- Package-specific info:
01:00.0 VGA compatible controller: nVidia Corporation NV17 [GeForce4 420 Go] 
(rev a3)
01:00.0 Class 0300: 10de:0175 (rev a3)

### 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"
FontPath"unix/:7100"# local font server
# if the local font server has problems, we can fall back on these
FontPath"/usr/lib/X11/fonts/Type1"
FontPath"/usr/lib/X11/fonts/CID"
FontPath"/usr/lib/X11/fonts/Speedo"
FontPath"/usr/lib/X11/fonts/misc"
FontPath"/usr/lib/X11/fonts/cyrillic"
FontPath"/usr/lib/X11/fonts/100dpi"
FontPath"/usr/lib/X11/fonts/75dpi"
EndSection

Section "Module"
Load"GLcore"
Load"bitmap"
Load"dbe"
Load"ddc"
Load"dri"
Load"extmod"
Load"freetype"
Load"glx"
Load"int10"
Load"record"
Load"speedo"
Load"type1"
Load"vbe"
EndSection

Section "InputDevice"
Identifier  "Generic Keyboard"
Driver  "keyboard"
Option  "CoreKeyboard"
Option  "XkbRules"  "xfree86"
Option  "XkbModel"  "ps105"
Option  "XkbLayout" "de,ru"
Option  "XkbVariant""nodeadkeys,phonetic"
Option  "grp:alt_shift_toggle"
EndSection

Section "InputDevice"
Identifier  "Configured Mouse"
Driver  "mouse"
Option  "CorePointer"
Option  "Device""/dev/misc/psaux"
Option  "Protocol"  "ImPS/2"
Option  "ZAxisMapping"  "4 5"
EndSection

Section "InputDevice"
Identifier  "Generic Mouse"
Driver  "mouse"
Option  "SendCoreEvents""true"
Option  "Device""/dev/input/mice"
Option  "Protocol"  "ImPS/2"
Option  "ZAxisMapping"  "4 5"
EndSection

Section "Device"
Identifier  "420go"
Driver  "nv"
EndSection

Section "Monitor"
Identifier  "TFT"
HorizSync   28-49
VertRefresh 43-72
Option  "DPMS"
EndSection

Section "Screen"
Identifier  "Default Screen"
Device  "420go"
Monitor "TFT"
DefaultDepth24
SubSection "Display"
Depth   1
Modes   "1024x768" "800x600" "640x480"
EndSubSection
SubSection "Display"
Depth   4
Modes   "1024x768" "800x600" "640x480"
EndSubSection
SubSection "Display"
Depth   8
Modes   "1024x768" "800x600" "640x480"
EndSubSection
SubSection "Display"
Depth   15
Modes   "1024x768" "800x600" "640x480"
EndSubSection
SubSection "Display"
Depth   16
Modes   "1024x768" "800x600" "640x480"
EndSubSection
SubSection "Display"
Depth   24
Modes   "1024x768" "800x600" "640x480"
EndSubSection
EndSection

Section "ServerLayout"
Identifier  "Default Layout"
Screen  "Default Scree

X Strike Force SVN commit: rev 397 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 04:09:54 -0500 (Tue, 19 Aug 2003)
New Revision: 397

Modified:
   trunk/debian/NEWS.Debian
Log:
debian/NEWS.Debian: set svn:keywords property to "Id"



Property changes on: trunk/debian/NEWS.Debian
___
Name: svn:keywords
   + Id

Processed: tagging 143825

[Debian Bug Tracking System]

Processing commands for [EMAIL PROTECTED]:

> tag 143825 + help
Bug#143825: xutils: why is rstart.real a conffile?
There were no tags set.
Tags added: help

> tag 143825 + upstream
Bug#143825: xutils: why is rstart.real a conffile?
Tags were: help
Tags added: upstream

>
End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)

X Strike Force SVN commit: rev 398 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 04:12:12 -0500 (Tue, 19 Aug 2003)
New Revision: 398

Modified:
   trunk/debian/changelog
Log:
debian/changelog: update to include a couple of forgotten changes from
  revision 396


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2003-08-19 09:09:54 UTC (rev 397)
+++ trunk/debian/changelog  2003-08-19 09:12:12 UTC (rev 398)
@@ -215,14 +215,14 @@
 maintain a roster file corresponding to the config file, for which each
 interested package adds its name on package configuration, and removes it
 on package purge.
-- debian/xserver-common.postinst.in: if the roster file for each
+- debian/xserver-{common,xfree86}.postinst.in: if the roster file for each
   non-conffile config file doesn't already list this package on
   configuration, add it to the roster
-- debian/xserver-common.postrm.in: on purge, remove this package's name
-  from each non-conffile config file's roster file (if that leaves no
-  packages managing a config file, look for a stored MD5 checksum of the
-  config file; if that matches the current config file, remove the config
-  file; finally, remove the checksum file)
+- debian/xserver-{common,xfree86}.postrm.in: on purge, remove this
+  package's name from each non-conffile config file's roster file (if that
+  leaves no packages managing a config file, look for a stored MD5
+  checksum of the config file; if that matches the current config file,
+  remove the config file; finally, remove the checksum file)
 
   * debian/xserver-{common,xfree86}.config.in: input validation errors in the
 package config scripts are now presented with "critical" priority
@@ -250,7 +250,7 @@
 - debian/rules: invoke dh_installlogrotate in binary-arch target
 - debian/xdm.logrotate: new; log rotation policy file
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 03:57:47 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 04:10:35 -0500
 
 xfree86 (4.2.1-9) unstable; urgency=high
 

X Strike Force SVN commit: rev 399 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 04:14:21 -0500 (Tue, 19 Aug 2003)
New Revision: 399

Modified:
   trunk/debian/changelog
Log:
debian/changelog: credit Matt Swift for supplying xdm.logrotate file


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2003-08-19 09:12:12 UTC (rev 398)
+++ trunk/debian/changelog  2003-08-19 09:14:21 UTC (rev 399)
@@ -248,7 +248,7 @@
 
   * Perform log rotation on xdm's log file. (Closes: #200699)
 - debian/rules: invoke dh_installlogrotate in binary-arch target
-- debian/xdm.logrotate: new; log rotation policy file
+- debian/xdm.logrotate: new; log rotation policy file (thanks, Matt Swift)
 
  -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 04:10:35 -0500
 

X Strike Force SVN commit: rev 401 - in trunk/debian: . patches

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 04:31:59 -0500 (Tue, 19 Aug 2003)
New Revision: 401

Modified:
   trunk/debian/changelog
   trunk/debian/patches/002_xdm_fixes.diff
Log:
debian/patches/002_xdm_fixes.diff: in auth.c:openFiles(), check the
  return value of fopen() so that we don't SEGV when setting up an X
  authority file in /tmp because we couldn't write one in $HOME (based on a
  patch by Neil Brown -- thanks!) (Closes: #206141)


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2003-08-19 09:19:12 UTC (rev 400)
+++ trunk/debian/changelog  2003-08-19 09:31:59 UTC (rev 401)
@@ -253,8 +253,13 @@
   * debian/po/*: update templates.pot and *.po files to reflect changes to
 debconf templates
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 04:16:14 -0500
+  * debian/patches/002_xdm_fixes.diff: in auth.c:openFiles(), check the return
+value of fopen() so that we don't SEGV when setting up an X authority file
+in /tmp because we couldn't write one in $HOME (based on a patch by Neil
+Brown -- thanks!) (Closes: #206141)
 
+ -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 04:21:59 -0500
+
 xfree86 (4.2.1-9) unstable; urgency=high
 
   * urgency due to xterm security fixes; see below

Modified: trunk/debian/patches/002_xdm_fixes.diff
===
--- trunk/debian/patches/002_xdm_fixes.diff 2003-08-19 09:19:12 UTC (rev 
400)
+++ trunk/debian/patches/002_xdm_fixes.diff 2003-08-19 09:31:59 UTC (rev 
401)
@@ -26,7 +26,7 @@
   would fail.  Well, tough titties."  Since "-n" files are cleaned
   shortly after they are created, the existence of any such file would
   be an anomaly (the result of an xdm or xinit process getting killed
-  at an inopportune moment.)  This doesn't seem like an important
+  at an inopportune moment).  This doesn't seem like an important
   concession.
 - Also note that xdm is only susceptible to the aforementioned
   race-condition-based symlink attacks if:
@@ -116,8 +116,8 @@
 server.c.)
 
 diff -urN xc/programs/xdm~/auth.c xc/programs/xdm/auth.c
 xc/programs/xdm~/auth.c2003-02-23 17:03:35.0 -0500
-+++ xc/programs/xdm/auth.c 2003-02-23 17:15:37.0 -0500
+--- xc/programs/xdm~/auth.c2003-08-19 01:01:30.0 -0500
 xc/programs/xdm/auth.c 2003-08-19 01:04:55.0 -0500
 @@ -46,6 +46,7 @@
  #include "dm_error.h"
  
@@ -206,7 +206,7 @@
fclose (auth_file);
  }
  return ret;
-@@ -458,19 +475,34 @@
+@@ -458,19 +475,36 @@
  openFiles (char *name, char *new_name, FILE **oldp, FILE **newp)
  {
int mask;
@@ -235,19 +235,21 @@
 +  {
 +  Debug ("can't open new file %s\n", new_name);
 +  return 0;
-   }
--  *oldp = fopen (name, "r");
--  Debug ("opens succeeded %s %s\n", name, new_name);
++  }
 +  else
 +  Debug ("open succeeded: %s\n", new_name);
 +  if (oldp)
++  {
 +  *oldp = fopen (name, "r");
-+  if (*oldp)
-+  Debug ("open succeeded %s\n", name);
++  if (*oldp)
++  Debug ("open succeeded: %s\n", name);
+   }
+-  *oldp = fopen (name, "r");
+-  Debug ("opens succeeded %s %s\n", name, new_name);
return 1;
  }
  
-@@ -804,10 +836,11 @@
+@@ -804,10 +838,11 @@
  struct in_ifaddr ifaddr;
  struct strioctl str;
  unsigned char *addr;
@@ -261,7 +263,7 @@
  
  /* Indicate that we want to start at the begining */
  ifnet.ib_next = (struct ipb *) 1;
-@@ -821,8 +854,9 @@
+@@ -821,8 +856,9 @@
  
if (ioctl (ipfd, (int) I_STR, (char *) &str) < 0)
{
@@ -272,7 +274,7 @@
}
  
ifaddr.ia_next = (struct in_ifaddr *) ifnet.if_addrlist;
-@@ -833,8 +867,9 @@
+@@ -833,8 +869,9 @@
  
if (ioctl (ipfd, (int) I_STR, (char *) &str) < 0)
{
@@ -283,7 +285,7 @@
}
  
/*
-@@ -874,11 +909,11 @@
+@@ -874,11 +911,11 @@
  char  *addr;
  int   family;
  register struct ifreq *ifr;
@@ -297,7 +299,7 @@
  
  #ifdef ISC
  #define IFC_IFC_REQ (struct ifreq *) ifc.ifc_buf
-@@ -1096,28 +1131,47 @@
+@@ -1096,28 +1133,47 @@
Debug ("openFiles failed\n");
XauUnlockAuth (home_name);
lockStatus = LOCK_ERROR;
@@ -349,7 +351,7 @@
home_name, backup_name);
return;
}
-@@ -1186,8 +1240,9 @@
+@@ -1186,8 +1242,9 @@
Debug ("unlink %s failed\n", name);
envname = name;
if (link (new_name, name) == -1) {
@@ -360,7 +362,7 @@
setenv = 1;
envname = new_name;
} else {
-@@ -1263,12 +1318,14 @@
+@@ -1263,12 +1320,14 @@
if (unlink (name) == -1)
Debug ("unlink %s failed\n", name);
if (link (new_name, name) == -1) {

Fw: Debian-x! See her on your monitor, invite her to home I ibEWo dE

[gahoye]

LIv Debian-x TBAVTUX
D fI

Bug#206173: Keyboard option "grp:alt_shift_toggle" not working in XF86Config-4

[Michel Dänzer]

On Tue, 2003-08-19 at 10:55, Eduard Bloch wrote:
> 
> I use multiple keymaps since I write cyrillic mails from time to time.
> With XFree86 4.3, I use the multiple-keymap list feature as showed in
> their examples (/etc/X11/xkb/README.config), see config below.
> 
> However, pressing Alt-Shift does not anything right after the X start.
> The switch function only works when I execute setxkbmap manually,
> 
> setxkbmap -option "grp:alt_shift_toggle"
> 
> After running it, I can roll trough the keymap list with Alt-Shift as
> expected. I remember that I did not need to execute this command when I
> used the first packages of Daniel Stone's series, it did not work with
> his latest builds and does not work with pre1v1 now.

[...]

> Section "InputDevice"
>   Identifier  "Generic Keyboard"
>   Driver  "keyboard"

(BTW, heads up to XSF: the keyboard manpage is still missing)

>   Option  "CoreKeyboard"
>   Option  "XkbRules"  "xfree86"
>   Option  "XkbModel"  "ps105"
>   Option  "XkbLayout" "de,ru"
>   Option  "XkbVariant""nodeadkeys,phonetic"
>   Option  "grp:alt_shift_toggle"

What if you make this

Option  "XkbOptions""grp:alt_shift_toggle"

? (dexconf bug?)

> EndSection


-- 
Earthling Michel Dänzer   \  Debian (powerpc), XFree86 and DRI developer
Software libre enthusiast  \ http://svcs.affero.net/rm.php?r=daenzer

Re: Experiments and Problems with 4.3.0-0pre1v1

[Michel Dänzer]

On Tue, 2003-08-19 at 07:10, Chris wrote: 
> I get a very high count of ethernet frame errors whenever 4.3.0 is 
> running, with or without DRI enabled.  This was never an issue with 
> 4.2.1-X.  The Radeon and 3Com card are sharing an IRQ, but this 
> really should not matter. 

It might matter with DRI enabled, but then I'd expect the problem to lie
in the ethernet driver. It certainly shouldn't matter with DRI disabled
(is it really disabled though? :) as the Radeon IRQ is unused in that
case.

> I once had the xserver hang when playing around with KDE's GL 
> screensavers too.  I would offhand attribute this to the same issue.

That's a long shot. :) Might be a 3D driver bug, see below.


> Option "EnableDepthMoves"

The source has this comment:

/* Depth moves are disabled by default since they are extremely slow
*/


> [...] there are numerous GL performance and rendering problems.  Games 
> like TuxRacer run at about half the framerate they did back in the 
> 4.2.1-X days before Radeon DRI broke from that gcc issue.  

Probably a 3D driver bug, see below.

> Also, there are rendering glitches.  The ice in Tuxracer flickers, for 
> instance.  

This is a tuxracer bug (Z fighting, it should use glPolygonOffset). You
can work around it by setting the RADEON_TCL_FORCE_DISABLE environment
variable.

> When using GL in a window (such as glxgears), text outside the 
> window sometimes flickers. (namely icon text on the KDE desktop).  

Page flipping problem probably. It's still really a hack and problems
like this are why it's not enabled by default.

> Also, when trying to moving the window, there is a roughly 0.5 to 2 sec. hang 
> before the 
> screen updates (depends on how demanding the GL app running is).  

If this isn't the depth moves, it might be a 3D driver bug, see below.

> GL Xscreensaver hacks running full screen flicker terribly as if 
> refreshes are happening randomly.

The consensus among DRI developers is that this seems to be an
xscreensaver bug, it seems to make bogus assumptions about GLX on the
root window.


About 3D driver bugs: Keep in mind that the 3D drivers in 4.3 are rather
old and no longer actively maintained. Many bugs have been fixed and new
features implemented in DRI CVS, you may want to try
http://dri.sourceforge.net/snapshots/README.Debian (note that the
current dri-trunk-sid packages haven't been built for i386 yet, hint,
hint)


-- 
Earthling Michel Dänzer   \  Debian (powerpc), XFree86 and DRI developer
Software libre enthusiast  \ http://svcs.affero.net/rm.php?r=daenzer

Bug#206173: marked as done (Keyboard option "grp:alt_shift_toggle" not working in XF86Config-4)

[Debian Bug Tracking System]

Your message dated Tue, 19 Aug 2003 12:39:49 +0200
with message-id <[EMAIL PROTECTED]>
and subject line Bug#206173: Keyboard option "grp:alt_shift_toggle" not working 
in XF86Config-4
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; 19 Aug 2003 08:56:07 +
>From [EMAIL PROTECTED] Tue Aug 19 03:56:03 2003
Return-path: <[EMAIL PROTECTED]>
Received: from mail.uni-kl.de (uni-kl.de) [131.246.137.52] 
by master.debian.org with esmtp (Exim 3.35 1 (Debian))
id 19p2Ha-jX-00; Tue, 19 Aug 2003 03:56:02 -0500
Received: from mailgate1.uni-kl.de (mailgate1.uni-kl.de [131.246.120.5])
by uni-kl.de (8.12.8/8.12.8) with ESMTP id h7J8u1F5012536;
Tue, 19 Aug 2003 10:56:01 +0200 (MET DST)
Received: from mailinf.rhrk.uni-kl.de (mailinf.rhrk.uni-kl.de [131.246.137.54])
by mailgate1.uni-kl.de (8.12.7/8.12.7) with ESMTP id h7J8u1Es023426;
Tue, 19 Aug 2003 10:56:01 +0200
Received: from domino.informatik.uni-kl.de ([EMAIL PROTECTED] [131.246.161.19])
by mailinf.rhrk.uni-kl.de (8.12.8/8.12.8) with ESMTP id h7J8tjTf001626;
Tue, 19 Aug 2003 10:55:45 +0200 (MET DST)
Received: from zombie.inka.de (rotes255.wohnheim.uni-kl.de [131.246.178.65])
by domino.informatik.uni-kl.de (8.11.7/8.11.6) with ESMTP id 
h7J8u0704551;
Tue, 19 Aug 2003 10:56:00 +0200 (MEST)
Received: from inet by zombie.inka.de with local (Exim 4.20)
id 19p2HI-0008VA-CP; Tue, 19 Aug 2003 10:55:44 +0200
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="UTF-8"
From: Eduard Bloch <[EMAIL PROTECTED]>
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: Keyboard option "grp:alt_shift_toggle" not working in XF86Config-4
X-Mailer: reportbug 2.22
Date: Tue, 19 Aug 2003 10:55:44 +0200
Message-Id: <[EMAIL PROTECTED]>
Sender: Eduard Bloch <[EMAIL PROTECTED]>
Delivered-To: [EMAIL PROTECTED]
X-Spam-Status: No, hits=-3.0 required=4.0
tests=BAYES_30,HAS_PACKAGE,PENISACCENT
version=2.53-bugs.debian.org_2003_8_17
X-Spam-Level: 
X-Spam-Checker-Version: SpamAssassin 2.53-bugs.debian.org_2003_8_17 
(1.174.2.15-2003-03-30-exp)

Package: xserver-xfree86
Version: 4.3.0-0pre1v1
Severity: minor
Tags: experimental upstream

Hello,

I use multiple keymaps since I write cyrillic mails from time to time.
With XFree86 4.3, I use the multiple-keymap list feature as showed in
their examples (/etc/X11/xkb/README.config), see config below.

However, pressing Alt-Shift does not anything right after the X start.
The switch function only works when I execute setxkbmap manually,

setxkbmap -option "grp:alt_shift_toggle"

After running it, I can roll trough the keymap list with Alt-Shift as
expected. I remember that I did not need to execute this command when I
used the first packages of Daniel Stone's series, it did not work with
his latest builds and does not work with pre1v1 now.

MfG,
Eduard.

-- Package-specific info:
01:00.0 VGA compatible controller: nVidia Corporation NV17 [GeForce4 420 Go] 
(rev a3)
01:00.0 Class 0300: 10de:0175 (rev a3)

### 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"
FontPath"unix/:7100"# local font server
# if the local font server has problems, we can fall back on these
FontPath"/usr/lib/X11/fonts/Type1"
FontPath"/usr/lib/X11/fonts/CID"
FontPath"/usr/lib/X11/fonts/Speedo"
FontPath"/usr/lib/X11/fonts/misc"
FontPath"/usr/lib/X11/fonts/cyrillic"
FontPath"/usr/lib/X11/fonts/100dpi"
FontPath"/usr/lib/X11/fonts/75dpi"
EndSection

Section "Module"
Load"GLcore"
Load"bitmap"
Load"dbe"
Load"ddc"
Load"dri

Bug#205973: (Re: Bug#205973: xlibs: /usr/X11R6/lib/X11/xkb/compiled)

[Jim Bray]

On Tue, 2003-08-19 at 01:52, Branden Robinson wrote:

> Okay.  I'm glad to hear my packages (probably) weren't at fault.

No, they weren't.

>  dpkg -S reports only on a package's "payload"; that is,
> stuff in /var/lib/dpkg/info/$package.list, not stuff created by the
> package's maintainer scripts.

  OK, that's good to know.

> Unfortunately there is no wonderful method for determining this;
> essentially, you have to grep the maintainer scripts in
> /var/lib/dpkg/info.

 Even that is not a magic bullet. I find plenty of mention of
/etc...compiled, but no /usr... compiled, because it turns out
that /usr/X11R6/libs/X11/xkb is symlinked to /etc...xkb. I should
probably have checked that sooner... must remember to
check each element in pathnames...


> Dpkg provides no mechanism at present for permitting packages to
> "register" additional filenames that a package doesn't unpack, but might
> be interested in.

  Might be a good wishlist item way down the road. Hmmm... just had a
really hideous idea of using something like strace for the scripts (and
children thereof) to trap all creating and linking syscalls... 

Thanks,

Jim

X Strike Force SVN commit: rev 402 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 13:46:35 -0500 (Tue, 19 Aug 2003)
New Revision: 402

Modified:
   trunk/debian/xserver-xfree86.config.in
   trunk/debian/xserver-xfree86.preinst.in
Log:
Fix syntax and logic errors uncaught from revision 396.

debian/xserver-xfree86.config.in:
  - debug_report_status() should call debug_echo(), not message()
(lest we scare the user with harmless messages)
  - fix missing line-continuation bug

debian/xserver-xfree86.preinst.in: fix syntax/logic error; close if
  statements checking for existence of configuration files


Modified: trunk/debian/xserver-xfree86.config.in
===
--- trunk/debian/xserver-xfree86.config.in  2003-08-19 09:31:59 UTC (rev 
401)
+++ trunk/debian/xserver-xfree86.config.in  2003-08-19 18:46:35 UTC (rev 
402)
@@ -39,7 +39,7 @@
 
 debug_report_status () {
   # Syntax: debug_report_status command exit_status
-  message "$1 exited with status $2"
+  debug_echo "$1 exited with status $2"
 }
 
 discover_video () {
@@ -434,7 +434,7 @@
 # default")
 PRIORITY_CEILING=
 if [ -e "$XF86CONFIG" ]; then
-  debug_echo "$XF86CONFIG file exists; capping configuration question"
+  debug_echo "$XF86CONFIG file exists; capping configuration question" \
  "priority at medium."
   PRIORITY_CEILING=medium
 fi

Modified: trunk/debian/xserver-xfree86.preinst.in
===
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-19 09:31:59 UTC (rev 
401)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-08-19 18:46:35 UTC (rev 
402)
@@ -40,46 +40,49 @@
 
   # first, migrate the X server symlink
   if [ -e "$SERVER_SYMLINK" ]; then
-  # attempt to pre-seed the md5sum file based on the current content of
-  # the file
-  db_get shared/clobber_x-server_symlink
-  if [ "$RET" = "true" ]; then
-# if the config file doesn't even exist, don't bother
-if [ -e "$SERVER_SYMLINK" ]; then
-  # people were letting debconf "manage" the config file even
-  # though they complained when it did so, so store a backup to
-  # keep people quiet
-  message "Note: migrating $SERVER_SYMLINK away from management" \
-  "by debconf; backup stored in $SERVER_SYMLINK.dpkg-old" \
-  "and MD5 checksum stored in $SERVER_SYMLINK_CHECKSUM"
-  readlink "$SERVER_SYMLINK" | md5sum > "$SERVER_SYMLINK_CHECKSUM"
-  ln -s "$(readlink "$SERVER_SYMLINK")" "$SERVER_SYMLINK.dpkg-old"
+# attempt to pre-seed the md5sum file based on the current content
+# of the file
+db_get shared/clobber_x-server_symlink
+if [ "$RET" = "true" ]; then
+  # if the config file doesn't even exist, don't bother
+  if [ -e "$SERVER_SYMLINK" ]; then
+# people were letting debconf "manage" the config file even
+# though they complained when it did so, so store a backup to
+# keep people quiet
+message "Note: migrating $SERVER_SYMLINK away from management" 
\
+"by debconf; backup stored in" \
+"$SERVER_SYMLINK.dpkg-old and MD5 checksum stored in" \
+"$SERVER_SYMLINK_CHECKSUM"
+readlink "$SERVER_SYMLINK" | md5sum > 
"$SERVER_SYMLINK_CHECKSUM"
+ln -s "$(readlink "$SERVER_SYMLINK")" 
"$SERVER_SYMLINK.dpkg-old"
+  fi
+else
+  message "Note: not storing MD5 checksum of $SERVER_SYMLINK;" \
+  "file not under management of debconf."
 fi
-  else
-message "Note: not storing MD5 checksum of $SERVER_SYMLINK; file" \
-"not under management of debconf."
   fi
 
   # next, migrate XF86Config-4
   if [ -e "$XF86CONFIG" ]; then
-  # attempt to pre-seed the md5sum file based on the current content of
-  # the file
-  db_get xserver-xfree86/manage_config_with_debconf
-  if [ "$RET" = "true" ]; then
-# if the config file doesn't even exist, don't bother
-if [ -e "$XF86CONFIG" ]; then
-  # people were letting debconf "manage" the config file even 
though
-  # they complained when it did so, so store a backup to keep 
people
-  # quiet
-  message "Note: migrating $XF86CONFIG away from management by" \
-  "debconf; backup stored in $XF86CONFIG.dpkg-old and MD5" 
\
-  "checksum stored in $XF86CONFIG_CHECKSUM"
-  md5sum "$XF86CONFIG" > "$XF86CONFIG_CHECKSUM"
-  cp "$XF86CONFIG" "$XF86CONFIG.dpkg-old"
+# attempt to pre-seed the md5sum file based on the current content
+# of the file
+   

X Strike Force SVN commit: rev 403 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 13:58:20 -0500 (Tue, 19 Aug 2003)
New Revision: 403

Modified:
   trunk/debian/rules
Log:
debian/rules: fix stupid typos that caused spurious creation of "755"
  directories in build tree


Modified: trunk/debian/rules
===
--- trunk/debian/rules  2003-08-19 18:46:35 UTC (rev 402)
+++ trunk/debian/rules  2003-08-19 18:58:20 UTC (rev 403)
@@ -351,7 +351,7 @@
dh_testroot
dh_install --sourcedir=debian/tmp
# special handling
-   install -d 755 debian/xserver-xfree86-dbg/usr/X11R6/man/man1
+   install -m 755 -d debian/xserver-xfree86-dbg/usr/X11R6/man/man1
install -m 644 debian/tmp/usr/X11R6/man/man1/XFree86.1x 
debian/xserver-xfree86-dbg/usr/X11R6/man/man1/XFree86-debug.1x
dh_installdebconf
dh_installdirs
@@ -492,7 +492,7 @@
dh_testroot
dh_install --sourcedir=debian/tmp
# special handling
-   install -d 755 debian/xserver-xfree86-dbg/usr/X11R6/man/man1
+   install -m 755 -d debian/xserver-xfree86-dbg/usr/X11R6/man/man1
install -m 644 debian/tmp/usr/X11R6/man/man1/XFree86.1x 
debian/xserver-xfree86-dbg/usr/X11R6/man/man1/XFree86-debug.1x
dh_installdebconf
dh_installdirs

X Strike Force SVN commit: rev 404 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 14:02:36 -0500 (Tue, 19 Aug 2003)
New Revision: 404

Modified:
   trunk/debian/rules
Log:
debian/rules:
  - update copyright notice
  - add $Id$ expando
  - set svn:keywords property to "Id"


Modified: trunk/debian/rules
===
--- trunk/debian/rules  2003-08-19 18:58:20 UTC (rev 403)
+++ trunk/debian/rules  2003-08-19 19:02:36 UTC (rev 404)
@@ -4,11 +4,13 @@
 # Modified by Mark W. Eichin <[EMAIL PROTECTED]>
 # Modified by Adam Heath <[EMAIL PROTECTED]>
 # Modified by Branden Robinson <[EMAIL PROTECTED]>
-# Copyright 1996-2001 Software in the Public Interest, Inc.
+# Copyright 1996--2003 Software in the Public Interest, Inc.
 # Licensed under the GNU General Public License, version 2.  See the file
 # /usr/share/common-licenses/GPL or .
 # Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
 
+# $Id$
+
 # default rule to keep things from going nuts by accident
 default: environment
 


Property changes on: trunk/debian/rules
___
Name: svn:keywords
   + Id

X Strike Force SVN commit: rev 405 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 14:48:34 -0500 (Tue, 19 Aug 2003)
New Revision: 405

Modified:
   trunk/debian/xserver-xfree86.preinst.in
Log:
debian/xserver-xfree86.preinst.in: *weeps* I can't get this fucking preinst
  script right to save my life.  It passes sh -n now, it really does.


Modified: trunk/debian/xserver-xfree86.preinst.in
===
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-19 19:02:36 UTC (rev 
404)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-08-19 19:48:34 UTC (rev 
405)
@@ -91,6 +91,7 @@
   "directory."
 fi
   fi
+fi
 
 # in other news, unregister the now no-longer-used templates
 db_unregister shared/clobber_x-server_symlink

xfree86_4.3.0-0pre1v1_hppa.changes ACCEPTED

[Debian Installer]

Accepted:
lbxproxy_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/lbxproxy_4.3.0-0pre1v1_hppa.deb
libdps-dev_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libdps-dev_4.3.0-0pre1v1_hppa.deb
libdps1-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libdps1-dbg_4.3.0-0pre1v1_hppa.deb
libdps1_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libdps1_4.3.0-0pre1v1_hppa.deb
libxaw6-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libxaw6-dbg_4.3.0-0pre1v1_hppa.deb
libxaw6-dev_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libxaw6-dev_4.3.0-0pre1v1_hppa.deb
libxaw6_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libxaw6_4.3.0-0pre1v1_hppa.deb
libxaw7-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libxaw7-dbg_4.3.0-0pre1v1_hppa.deb
libxaw7-dev_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libxaw7-dev_4.3.0-0pre1v1_hppa.deb
libxaw7_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/libxaw7_4.3.0-0pre1v1_hppa.deb
proxymngr_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/proxymngr_4.3.0-0pre1v1_hppa.deb
twm_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/twm_4.3.0-0pre1v1_hppa.deb
x-window-system-core_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/x-window-system-core_4.3.0-0pre1v1_hppa.deb
xbase-clients_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xbase-clients_4.3.0-0pre1v1_hppa.deb
xdm_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xdm_4.3.0-0pre1v1_hppa.deb
xfs_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xfs_4.3.0-0pre1v1_hppa.deb
xfwp_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xfwp_4.3.0-0pre1v1_hppa.deb
xlibmesa-dri_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-dri_4.3.0-0pre1v1_hppa.deb
xlibmesa-gl-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-gl-dbg_4.3.0-0pre1v1_hppa.deb
xlibmesa-gl-dev_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-gl-dev_4.3.0-0pre1v1_hppa.deb
xlibmesa-gl_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-gl_4.3.0-0pre1v1_hppa.deb
xlibmesa-glu-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-glu-dbg_4.3.0-0pre1v1_hppa.deb
xlibmesa-glu-dev_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-glu-dev_4.3.0-0pre1v1_hppa.deb
xlibmesa-glu_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibmesa-glu_4.3.0-0pre1v1_hppa.deb
xlibs-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibs-dbg_4.3.0-0pre1v1_hppa.deb
xlibs-dev_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibs-dev_4.3.0-0pre1v1_hppa.deb
xlibs-static-pic_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibs-static-pic_4.3.0-0pre1v1_hppa.deb
xlibs_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xlibs_4.3.0-0pre1v1_hppa.deb
xmh_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xmh_4.3.0-0pre1v1_hppa.deb
xnest_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xnest_4.3.0-0pre1v1_hppa.deb
xprt_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xprt_4.3.0-0pre1v1_hppa.deb
xserver-common_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xserver-common_4.3.0-0pre1v1_hppa.deb
xserver-xfree86-dbg_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xserver-xfree86-dbg_4.3.0-0pre1v1_hppa.deb
xserver-xfree86_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xserver-xfree86_4.3.0-0pre1v1_hppa.deb
xterm_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xterm_4.3.0-0pre1v1_hppa.deb
xutils_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xutils_4.3.0-0pre1v1_hppa.deb
xvfb_4.3.0-0pre1v1_hppa.deb
  to pool/main/x/xfree86/xvfb_4.3.0-0pre1v1_hppa.deb


Thank you for your contribution to Debian.

X Strike Force SVN commit: rev 406 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 19:36:10 -0500 (Tue, 19 Aug 2003)
New Revision: 406

Modified:
   trunk/debian/xserver-xfree86.postinst.in
Log:
debian/xserver-xfree86.postinst.in: fix another combination syntax/logic
  error; close open if block and react gracefully if for some loony reason
  the user has made the X server symlink point to a directory


Modified: trunk/debian/xserver-xfree86.postinst.in
===
--- trunk/debian/xserver-xfree86.postinst.in2003-08-19 19:48:34 UTC (rev 
405)
+++ trunk/debian/xserver-xfree86.postinst.in2003-08-20 00:36:10 UTC (rev 
406)
@@ -58,10 +58,16 @@
   NEW_SERVER_SYMLINK="$SERVER_SYMLINK.dpkg-new"
   ln -sf "$THIS_SERVER" "$NEW_SERVER_SYMLINK"
   if ! cmp -s "$SERVER_SYMLINK" "$NEW_SERVER_SYMLINK"; then
-  if [ "$(readlink "$SERVER_SYMLINK")" \
-   != "$(readlink "$NEW_SERVER_SYMLINK")" ]; then
-mv "$NEW_SERVER_SYMLINK" "$SERVER_SYMLINK"
-readlink "$SERVER_SYMLINK" | m5sum > "$SERVER_SYMLINK_CHECKSUM"
+if [ "$(readlink "$SERVER_SYMLINK")" \
+ != "$(readlink "$NEW_SERVER_SYMLINK")" ]; then
+  if [ ! -d "$SERVER_SYMLINK" ]; then
+mv "$NEW_SERVER_SYMLINK" "$SERVER_SYMLINK"
+readlink "$SERVER_SYMLINK" | m5sum > "$SERVER_SYMLINK_CHECKSUM"
+  else
+message "Note: not updating $SERVER_SYMLINK; it is a symbolic" 
\
+"link to a directory"
+  fi
+fi
   fi
   rm -f "$NEW_SERVER_SYMLINK"
 fi

X Strike Force SVN commit: rev 407 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 19:44:26 -0500 (Tue, 19 Aug 2003)
New Revision: 407

Modified:
   trunk/debian/xserver-common.postinst.in
   trunk/debian/xserver-common.preinst.in
   trunk/debian/xserver-xfree86.postinst.in
   trunk/debian/xserver-xfree86.preinst.in
   trunk/debian/xserver-xfree86.prerm.in
Log:
(cosmetic) cleanups to user-visible messages
  debian/xserver-common.postinst.in
  debian/xserver-common.preinst.in
  debian/xserver-xfree86.postinst.in
  debian/xserver-xfree86.preinst.in
  debian/xserver-xfree86.prerm.in


Modified: trunk/debian/xserver-common.postinst.in
===
--- trunk/debian/xserver-common.postinst.in 2003-08-20 00:36:10 UTC (rev 
406)
+++ trunk/debian/xserver-common.postinst.in 2003-08-20 00:44:26 UTC (rev 
407)
@@ -64,14 +64,14 @@
   fi
   rm -f "$NEW_XWRAPPER_CONFIG"
 else
-  message "Note: not updating $XWRAPPER_CONFIG; file has been customized"
+  message "Note: not updating $XWRAPPER_CONFIG; file has been customized."
 fi
   else
 message "Note: not updating $XWRAPPER_CONFIG; no stored MD5 checksum" \
-"available"
+"available."
   fi
 else
-  message "Note: not updating $XWRAPPER_CONFIG; file does not exist"
+  message "Note: not updating $XWRAPPER_CONFIG; file does not exist."
 fi
 
 exit 0

Modified: trunk/debian/xserver-common.preinst.in
===
--- trunk/debian/xserver-common.preinst.in  2003-08-20 00:36:10 UTC (rev 
406)
+++ trunk/debian/xserver-common.preinst.in  2003-08-20 00:44:26 UTC (rev 
407)
@@ -31,7 +31,8 @@
 
   # /etc/X11/Xserver obsolete as of 4.0.1-6
   if [ -e /etc/X11/Xserver ]; then
-message "Note: Moving obsolete file /etc/X11/Xserver to 
/etc/X11/Xserver.xserver-common-backup"
+message "Note: Moving obsolete file /etc/X11/Xserver to" \
+"/etc/X11/Xserver.xserver-common-backup."
 mv /etc/X11/Xserver /etc/X11/Xserver.xserver-common-backup
   fi
 
@@ -66,7 +67,7 @@
   # quiet
   message "Note: migrating $XWRAPPER_CONFIG away from management" \
   "by debconf; backup stored in $XWRAPPER_CONFIG.dpkg-old" \
-  "and MD5 checksum stored in $XWRAPPER_CONFIG_CHECKSUM"
+  "and MD5 checksum stored in $XWRAPPER_CONFIG_CHECKSUM."
   md5sum "$XWRAPPER_CONFIG" > "$XWRAPPER_CONFIG_CHECKSUM"
   cp "$XWRAPPER_CONFIG" "$XWRAPPER_CONFIG.dpkg-old"
 fi

Modified: trunk/debian/xserver-xfree86.postinst.in
===
--- trunk/debian/xserver-xfree86.postinst.in2003-08-20 00:36:10 UTC (rev 
406)
+++ trunk/debian/xserver-xfree86.postinst.in2003-08-20 00:44:26 UTC (rev 
407)
@@ -65,7 +65,7 @@
 readlink "$SERVER_SYMLINK" | m5sum > "$SERVER_SYMLINK_CHECKSUM"
   else
 message "Note: not updating $SERVER_SYMLINK; it is a symbolic" 
\
-"link to a directory"
+"link to a directory."
   fi
 fi
   fi
@@ -74,17 +74,17 @@
   else
 message "Note: not updating $SERVER_SYMLINK; no default X server" \
 "configured; run \"dpkg-reconfigure $THIS_PACKAGE\" to" \
-"correct this"
+"correct this."
   fi
 else
-  message "Note: not updating $SERVER_SYMLINK; file has been customized"
+  message "Note: not updating $SERVER_SYMLINK; file has been customized."
 fi
   else
 message "Note: not updating $SERVER_SYMLINK; no stored MD5 checksum" \
-"available"
+"available."
   fi
 else
-  message "Note: not updating $SERVER_SYMLINK; file does not exist"
+  message "Note: not updating $SERVER_SYMLINK; file does not exist."
 fi
 
 # only mess with X server config file if it exists; if it does not, assume
@@ -108,18 +108,18 @@
   else
 message "Note: error while preparing new XFree86 X server" \
 "configuration file in $NEW_XF86CONFIG; not attempting to" \
-"update existing configuration"
+"update existing configuration."
   fi
   rm -f "$NEW_XF86CONFIG"
 else
-  message "Note: not updating $XF86CONFIG; file has been customized"
+  message "Note: not updating $XF86CONFIG; file has been customized."
 fi
   else
 message "Note: not updating $XF86CONFIG; no stored MD5 checksum" \
-"available"
+"available."
   fi
 else
-  message "Note: not updating $XF86CONFIG; file does not exist"
+  message "Note: not updating $XF86CONFIG; file does not exist."
 fi
 
 # register X server configlet

Modified: trunk/debian/xserver-xfree86.preinst.in
===
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-20 00:36:10 UTC (rev 
406)
+++ trunk/debian/xserver-xfree86.pre

X Strike Force SVN commit: rev 408 - trunk/debian/local

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 21:51:17 -0500 (Tue, 19 Aug 2003)
New Revision: 408

Modified:
   trunk/debian/local/dexconf
Log:
debian/local/dexconf: fix stupid thinko in option parsing


Modified: trunk/debian/local/dexconf
===
--- trunk/debian/local/dexconf  2003-08-20 00:44:26 UTC (rev 407)
+++ trunk/debian/local/dexconf  2003-08-20 02:51:17 UTC (rev 408)
@@ -81,9 +81,9 @@
 
 while :; do
 case "$1" in
--f|--format) FORMAT="$1"; shift ;;
+-f|--format) FORMAT="$2"; shift ;;
 -h|--help) SHOWHELP=yes EARLYEXIT=yes ;;
--o|--output) XF86CONFIG="$1"; shift ;;
+-o|--output) XF86CONFIG="$2"; shift ;;
 --) shift; break ;;
 *) bomb "error while parsing options; use \"$PROGNAME --help\" for 
help" ;;
 esac

X Strike Force SVN commit: rev 409 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 21:53:09 -0500 (Tue, 19 Aug 2003)
New Revision: 409

Modified:
   trunk/debian/xserver-common.preinst.in
Log:
debian/xserver-common.preinst.in: don't issue a message telling the user
  we're not doing anything


Modified: trunk/debian/xserver-common.preinst.in
===
--- trunk/debian/xserver-common.preinst.in  2003-08-20 02:51:17 UTC (rev 
408)
+++ trunk/debian/xserver-common.preinst.in  2003-08-20 02:53:09 UTC (rev 
409)
@@ -72,9 +72,6 @@
   cp "$XWRAPPER_CONFIG" "$XWRAPPER_CONFIG.dpkg-old"
 fi
   fi
-else
-  message "Note: not storing MD5 checksum of $XWRAPPER_CONFIG; file not" \
-  "under management of debconf."
 fi
 
 # in other news, unregister the now no-longer-used templates

X Strike Force SVN commit: rev 410 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 21:57:05 -0500 (Tue, 19 Aug 2003)
New Revision: 410

Modified:
   trunk/debian/xserver-xfree86.preinst.in
Log:
debian/xserver-xfree86.preinst.in: migration-from-debconf-"management"
  logic fixes:
  - remove redundant test for existence of X server symlink
  - base migration of existing X server symlink on the value of
shared/default-x-server being the same as the package being upgraded,
and the server symlink actually pointing to the server executable
provided by the package; do not pay any attention to the value of
shared/clobber_x-server_symlink
  - store the target of the X server symlink in a variable since we
reference it more than once
  - don't show the user messages telling him we're not doing anything


Modified: trunk/debian/xserver-xfree86.preinst.in
===
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-20 02:53:09 UTC (rev 
409)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-08-20 02:57:05 UTC (rev 
410)
@@ -21,6 +21,7 @@
 CHECKSUM_DIR=/var/lib/xfree86
 SERVER_SYMLINK_CHECKSUM="$CHECKSUM_DIR/$(basename "$SERVER_SYMLINK").md5sum"
 XF86CONFIG_CHECKSUM="$CHECKSUM_DIR/$(basename "$XF86CONFIG").md5sum"
+THIS_SERVER=/usr/bin/X11/XFree86
 
 if [ "$1" = "install" -o "$1" = "upgrade" ]; then
   # if upgrading from < 4.2.1-10, migrate X server symlink and XF86Config-4
@@ -41,11 +42,14 @@
   # first, migrate the X server symlink
   if [ -e "$SERVER_SYMLINK" ]; then
 # attempt to pre-seed the md5sum file based on the current content
-# of the file
-db_get shared/clobber_x-server_symlink
-if [ "$RET" = "true" ]; then
-  # if the config file doesn't even exist, don't bother
-  if [ -e "$SERVER_SYMLINK" ]; then
+# of the file; first, is this package selected as the one
+# containing the default X server?
+db_get shared/default-x-server
+if [ "$RET" = "$THIS_PACKAGE" ]; then
+  # next, does the symlink point to the server executable provided
+  # by this package?
+  CURRENT_SYMLINK_TARGET=$(readlink "$SERVER_SYMLINK")
+  if [ "$CURRENT_SYMLINK_TARGET" = "$THIS_SERVER" ]; then
 # people were letting debconf "manage" the config file even
 # though they complained when it did so, so store a backup to
 # keep people quiet
@@ -53,12 +57,9 @@
 "by debconf; backup stored in" \
 "$SERVER_SYMLINK.dpkg-old and MD5 checksum stored in" \
 "$SERVER_SYMLINK_CHECKSUM."
-readlink "$SERVER_SYMLINK" | md5sum > 
"$SERVER_SYMLINK_CHECKSUM"
-ln -s "$(readlink "$SERVER_SYMLINK")" 
"$SERVER_SYMLINK.dpkg-old"
+echo "$CURRENT_SYMLINK_TARGET" | md5sum > 
"$SERVER_SYMLINK_CHECKSUM"
+ln -s "$CURRENT_SYMLINK_TARGET" "$SERVER_SYMLINK.dpkg-old"
   fi
-else
-  message "Note: not storing MD5 checksum of $SERVER_SYMLINK;" \
-  "file not under management of debconf."
 fi
   fi
 
@@ -79,9 +80,6 @@
 md5sum "$XF86CONFIG" > "$XF86CONFIG_CHECKSUM"
 cp "$XF86CONFIG" "$XF86CONFIG.dpkg-old"
   fi
-else
-  message "Note: not storing MD5 checksum of $XF86CONFIG; file" \
-  "not under management of debconf."
 fi
   fi
 

Re: Thank you!

[Unexpected reply handler]

Subject: This is an AutoResponse from eBay
 
Thank you for your response. As this is an automated email, please do not reply.
 
If you have a question for eBay Customer Support, please visit the following
 eBay Help page. This page will help you locate the answer to your question,
 or assist you in contacting eBay Customer Support.
 
http://pages.ebay.com/help/index_popup.html
 
To change your notification preferences, which determine how you would like
 eBay to communicate with you, please visit our Notification Preferences
 Change page (please note that it might take a few days to process your
 request). 
 
http://cgi3.ebay.com/aw-cgi/eBayISAPI.dll?OptinLoginShow
 
As always, we appreciate your patronage.
 
Regards,
eBay


-- 

X Strike Force SVN commit: rev 411 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 22:27:04 -0500 (Tue, 19 Aug 2003)
New Revision: 411

Modified:
   trunk/debian/xserver-xfree86.postinst.in
Log:
debian/xserver-xfree86.postinst.in: *sigh* still more fixes for my own
  stupidity; the command is called "md5sum", not "m5sum"; hello, fumble
  fingers


Modified: trunk/debian/xserver-xfree86.postinst.in
===
--- trunk/debian/xserver-xfree86.postinst.in2003-08-20 02:57:05 UTC (rev 
410)
+++ trunk/debian/xserver-xfree86.postinst.in2003-08-20 03:27:04 UTC (rev 
411)
@@ -44,7 +44,7 @@
   if [ -e "$SERVER_SYMLINK_CHECKSUM" ]; then
 # compare the current and stored checksums; if they do not match, assume
 # that's the way the user wants it
-CURRENT_MD5SUM=$(readlink "$SERVER_SYMLINK" | m5sum)
+CURRENT_MD5SUM=$(readlink "$SERVER_SYMLINK" | md5sum)
 if [ "$CURRENT_MD5SUM" = "$(cat "$SERVER_SYMLINK_CHECKSUM")" ]; then
   # finally, only update the symlink if this package contains the selected
   # default X server
@@ -62,7 +62,7 @@
  != "$(readlink "$NEW_SERVER_SYMLINK")" ]; then
   if [ ! -d "$SERVER_SYMLINK" ]; then
 mv "$NEW_SERVER_SYMLINK" "$SERVER_SYMLINK"
-readlink "$SERVER_SYMLINK" | m5sum > "$SERVER_SYMLINK_CHECKSUM"
+readlink "$SERVER_SYMLINK" | md5sum > 
"$SERVER_SYMLINK_CHECKSUM"
   else
 message "Note: not updating $SERVER_SYMLINK; it is a symbolic" 
\
 "link to a directory."

X Strike Force SVN commit: rev 412 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 22:30:44 -0500 (Tue, 19 Aug 2003)
New Revision: 412

Modified:
   trunk/debian/xserver-common.postinst.in
   trunk/debian/xserver-xfree86.postinst.in
Log:
debian/xserver-{common,xfree86}.postinst.in: minor logic simplification;
  don't create a variable that is only dereferenced once


Modified: trunk/debian/xserver-common.postinst.in
===
--- trunk/debian/xserver-common.postinst.in 2003-08-20 03:27:04 UTC (rev 
411)
+++ trunk/debian/xserver-common.postinst.in 2003-08-20 03:30:44 UTC (rev 
412)
@@ -45,8 +45,7 @@
   if [ -e "$XWRAPPER_CONFIG_CHECKSUM" ]; then
 # next, compare the current and stored checksums; if they do not match,
 # assume that's the way the user wants it
-CURRENT_MD5SUM=$(md5sum "$XWRAPPER_CONFIG")
-if [ "$CURRENT_MD5SUM" = "$(cat "$XWRAPPER_CONFIG_CHECKSUM")" ]; then
+if [ "$(md5sum "$XWRAPPER_CONFIG")" = "$(cat "$XWRAPPER_CONFIG_CHECKSUM")" 
]; then
   # they match; prepare a new version of the config file
   db_get xserver-common/xwrapper/actual_allowed_users
   ALLOWED_USERS="$RET"

Modified: trunk/debian/xserver-xfree86.postinst.in
===
--- trunk/debian/xserver-xfree86.postinst.in2003-08-20 03:27:04 UTC (rev 
411)
+++ trunk/debian/xserver-xfree86.postinst.in2003-08-20 03:30:44 UTC (rev 
412)
@@ -44,8 +44,7 @@
   if [ -e "$SERVER_SYMLINK_CHECKSUM" ]; then
 # compare the current and stored checksums; if they do not match, assume
 # that's the way the user wants it
-CURRENT_MD5SUM=$(readlink "$SERVER_SYMLINK" | md5sum)
-if [ "$CURRENT_MD5SUM" = "$(cat "$SERVER_SYMLINK_CHECKSUM")" ]; then
+if [ "$(readlink "$SERVER_SYMLINK" | md5sum)" = "$(cat 
"$SERVER_SYMLINK_CHECKSUM")" ]; then
   # finally, only update the symlink if this package contains the selected
   # default X server
   db_get shared/default-x-server
@@ -95,8 +94,7 @@
   if [ -e "$XF86CONFIG_CHECKSUM" ]; then
 # compare the current and stored checksums; if they do not match, assume
 # that's the way the user wants it
-CURRENT_MD5SUM=$(md5sum "$XF86CONFIG")
-if [ "$CURRENT_MD5SUM" = "$(cat "$XF86CONFIG_CHECKSUM")" ]; then
+if [ "$(md5sum "$XF86CONFIG")" = "$(cat "$XF86CONFIG_CHECKSUM")" ]; then
   # they match; prepare a new version of the config file
   NEW_XF86CONFIG=$(tempfile)
   if dexconf -o "$NEW_XF86CONFIG"; then

X Strike Force SVN commit: rev 413 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 22:59:58 -0500 (Tue, 19 Aug 2003)
New Revision: 413

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
debian/control: for xserver-xfree86 and xserver-xfree86-dbg, tighten the
  versioning of the dependency on xserver-common to (>= 4.2.1-10); these
  packages' postinst scripts use functionality that was broken in earlier
  versions of dexconf


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2003-08-20 03:30:44 UTC (rev 412)
+++ trunk/debian/changelog  2003-08-20 03:59:58 UTC (rev 413)
@@ -210,6 +210,10 @@
   + update "FUTURE DIRECTIONS" section
 - debian/local/dexlet/main.py: only mess with the obsolete debconf
   templates when configuring an XFree86 3.x X server
+- debian/control: for xserver-xfree86 and xserver-xfree86-dbg, tighten the
+  versioning of the dependency on xserver-common to (>= 4.2.1-10); these
+  packages' postinst scripts use functionality that was broken in earlier
+  versions of dexconf
 
   * Add technique for deciding when to purge non-conffile configuration files;
 maintain a roster file corresponding to the config file, for which each
@@ -258,7 +262,7 @@
 in /tmp because we couldn't write one in $HOME (based on a patch by Neil
 Brown -- thanks!) (Closes: #206141)
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 04:21:59 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]>  Tue, 19 Aug 2003 22:58:08 -0500
 
 xfree86 (4.2.1-9) unstable; urgency=high
 

Modified: trunk/debian/control
===
--- trunk/debian/control2003-08-20 03:30:44 UTC (rev 412)
+++ trunk/debian/control2003-08-20 03:59:58 UTC (rev 413)
@@ -882,7 +882,7 @@
 
 Package: xserver-xfree86
 Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 
powerpc sh3 sh4 sparc
-Depends: xserver-common (>= 4.1.0-10), ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common (>= 4.2.1-10), ${shlibs:Depends}, ${misc:Depends}
 Suggests: discover, mdetect, read-edid
 Conflicts: libxfont-xtt
 Replaces: xserver-common (<< 4.0), libxfont-xtt
@@ -911,7 +911,7 @@
 Package: xserver-xfree86-dbg
 Priority: extra
 Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 
powerpc sh3 sh4 sparc
-Depends: xserver-common (>= 4.1.0-10), ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common (>= 4.2.1-10), ${shlibs:Depends}, ${misc:Depends}
 Recommends: xserver-xfree86
 Suggests: discover, mdetect, read-edid
 Conflicts: libxfont-xtt

Re: X Strike Force SVN commit: rev 410 - trunk/debian

[Daniel Stone]

On Tue, Aug 19, 2003 at 09:57:09PM -0500, X Strike Force SVN Admin wrote:
>   - don't show the user messages telling him we're not doing anything

Women use Debian, too. :P

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.debian.org - http://www.kde.org - http://www.freedesktop.org
"Configurability is always the best choice when it's pretty simple to implement"
  -- Havoc Pennington, gnome-list


pgphweFzMG8lo.pgp
Description: PGP signature

X Strike Force SVN commit: rev 414 - trunk/debian

[X Strike Force SVN Admin]

Author: branden
Date: 2003-08-19 23:51:15 -0500 (Tue, 19 Aug 2003)
New Revision: 414

Modified:
   trunk/debian/xserver-common.preinst.in
   trunk/debian/xserver-xfree86.preinst.in
Log:
debian/xserver-{common,xfree86}.preinst.in: add more robustification to
  config file migration strategy;
  - use "lt-nl" operator instead of "lt" when invoking dpkg
--compare-versions; if we know of no previous configured version of the
package, don't bother attempting to migrate at all
  - wrap "db_get"s in if statements so that if for some reason the debconf
template of interest has already been purged, the script does not fail


Modified: trunk/debian/xserver-common.preinst.in
===
--- trunk/debian/xserver-common.preinst.in  2003-08-20 03:59:58 UTC (rev 
413)
+++ trunk/debian/xserver-common.preinst.in  2003-08-20 04:51:15 UTC (rev 
414)
@@ -38,39 +38,41 @@
 
   # if upgrading from < 4.2.1-10, migrate Xwrapper.config to (simplified)
   # ucf-style handling
-  if dpkg --compare-versions "$2" lt "4.2.1-10"; then
+  if dpkg --compare-versions "$2" lt-nl "4.2.1-10"; then
 # was the user letting the debconf "manage" the file?
-db_get xserver-common/manage_config_with_debconf
-if [ "$RET" = "true" ]; then
-  # yes; attempt to pre-seed the md5sum file based on the current content
-  # of the file
-  WRITE_MD5SUM=yes
-  # if the config file doesn't even exist, don't bother
-  if [ -e "$XWRAPPER_CONFIG" ]; then
-# this is the preinst, so our checksum directory might not have been
-# unpacked yet (in fact, if we're upgrading from < 4.2.1-10, we expect
-# it not to be)
-if [ ! -e "$CHECKSUM_DIR" ]; then
-  mkdir --mode=755 "$CHECKSUM_DIR"
-else
-  # if the checksum pathname does exist but is not a directory, give
-  # up; dpkg will probably vomit on unpack anyway
-  if [ ! -d "$CHECKSUM_DIR" ]; then
-message "Warning: cannot store MD5 checksum of $XWRAPPER_CONFIG;" \
-"$CHECKSUM_DIR exists but is not a directory."
-WRITE_MD5SUM=
+if db_get xserver-common/manage_config_with_debconf; then
+  if [ "$RET" = "true" ]; then
+# yes; attempt to pre-seed the md5sum file based on the current content
+# of the file
+WRITE_MD5SUM=yes
+# if the config file doesn't even exist, don't bother
+if [ -e "$XWRAPPER_CONFIG" ]; then
+  # this is the preinst, so our checksum directory might not have been
+  # unpacked yet (in fact, if we're upgrading from < 4.2.1-10, we
+  # expect it not to be)
+  if [ ! -e "$CHECKSUM_DIR" ]; then
+mkdir --mode=755 "$CHECKSUM_DIR"
+  else
+# if the checksum pathname does exist but is not a directory, give
+# up; dpkg will probably vomit on unpack anyway
+if [ ! -d "$CHECKSUM_DIR" ]; then
+  message "Warning: cannot store MD5 checksum of" \
+  "$XWRAPPER_CONFIG; $CHECKSUM_DIR exists but is not a" \
+  "directory."
+  WRITE_MD5SUM=
+fi
   fi
+  if [ -n "$WRITE_MD5SUM" ]; then
+# people were letting debconf "manage" the config file even though
+# they complained when it did so, so store a backup to keep people
+# quiet
+message "Note: migrating $XWRAPPER_CONFIG away from management" \
+"by debconf; backup stored in $XWRAPPER_CONFIG.dpkg-old" \
+"and MD5 checksum stored in $XWRAPPER_CONFIG_CHECKSUM."
+md5sum "$XWRAPPER_CONFIG" > "$XWRAPPER_CONFIG_CHECKSUM"
+cp "$XWRAPPER_CONFIG" "$XWRAPPER_CONFIG.dpkg-old"
+  fi
 fi
-if [ -n "$WRITE_MD5SUM" ]; then
-  # people were letting debconf "manage" the config file even though
-  # they complained when it did so, so store a backup to keep people
-  # quiet
-  message "Note: migrating $XWRAPPER_CONFIG away from management" \
-  "by debconf; backup stored in $XWRAPPER_CONFIG.dpkg-old" \
-  "and MD5 checksum stored in $XWRAPPER_CONFIG_CHECKSUM."
-  md5sum "$XWRAPPER_CONFIG" > "$XWRAPPER_CONFIG_CHECKSUM"
-  cp "$XWRAPPER_CONFIG" "$XWRAPPER_CONFIG.dpkg-old"
-fi
   fi
 fi
 

Modified: trunk/debian/xserver-xfree86.preinst.in
===
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-20 03:59:58 UTC (rev 
413)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-08-20 04:51:15 UTC (rev 
414)
@@ -26,7 +26,7 @@
 if [ "$1" = "install" -o "$1" = "upgrade" ]; then
   # if upgrading from < 4.2.1-10, migrate X server symlink and XF86Config-4
   # to (simplified) ucf-style handling
-  if dpkg --compare-versions "$2" lt "4.2.1-10"; then
+  if dpkg --compare-v