Bug#469943: xterm: Unicode display problems

[Josef Spillner]

Package: xterm
Version: 232-1
Severity: normal

If I invoke the application with
uxterm -fa monospace -fs 12 -bg black -fg white
the settings match those provided by gnome-terminal by default.
Yet (u)xterm doesn't display some characters properly. Sometimes (with
fonts such as monospace) it at least hints at them being there by drawing
boxes, but with the Debian-provided default font and some other fonts it only
draws spaces. This affects for example the following greek letters:
'ΩϡϿ'
With monospace the omega (Ω) is shown correctly, but the other two are
not. The same characters work fine in gnome-terminal.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages xterm depends on:
ii  libc6 2.7-6  GNU C Library: Shared libraries
ii  libfontconfig12.5.0-2generic font configuration library
ii  libice6   2:1.0.4-1  X11 Inter-Client Exchange library
ii  libncurses5   5.6+20071103-1 Shared libraries for terminal hand
ii  libsm62:1.0.3-1+b1   X11 Session Management library
ii  libx11-6  2:1.0.3-7  X11 client-side library
ii  libxaw7   2:1.0.4-1  X11 Athena Widget library
ii  libxext6  1:1.0.3-2  X11 miscellaneous extension librar
ii  libxft2   2.1.12-2   FreeType-based font drawing librar
ii  libxmu6   1:1.0.3-1  X11 miscellaneous utility library
ii  libxt61:1.0.5-3  X11 toolkit intrinsics library
ii  xbitmaps  1.0.1-2Base X bitmaps

Versions of packages xterm recommends:
ii  x11-utils 7.3+1  X11 utilities
ii  xutils1:7.3+3X Window System utility programs m

-- no debconf information



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

Bug#130706: xdm: incorrect usage of PAM_RHOST

[Julien Cristau]

On Wed, Aug 24, 2005 at 19:35:20 +0200, Bastian Kleineidam wrote:

> Hi,
> 
> in latest versions (I checked the current 6.8.2.dfsg.1-5), the
> PAM_RHOST is set to the empty string. I don't think this is correct
> either. The remote host should be just the hostname, nothing else.
> 
Hi,

In the latest version, xdm uses the display name, replaces the last
colon with '\0', and passes that value as PAM_RHOST, if the display name
doesn't start with a colon.  That looks correct to me.
If the display name starts with a colon (i.e. the X server is local),
then the display name is used to set PAM_TTY.

Is there still a problem with this, or can this bug be closed?

Cheers,
Julien



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

Processed: reassign 444384 to xserver-xorg-core

[Debian Bug Tracking System]

Processing commands for [EMAIL PROTECTED]:

> # Automatically generated email from bts, devscripts version 2.10.18.1
> reassign 444384 xserver-xorg-core
Bug#444384: inefficient starting?
Bug reassigned from package `xdm' to `xserver-xorg-core'.

>
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]

Bug#230537: marked as done (xdm: warn of unused Identifiers)

[Debian Bug Tracking System]

Your message dated Sat, 8 Mar 2008 07:28:01 +0100
with message-id <[EMAIL PROTECTED]>
and subject line Re: Bug#230537: xdm: warn of unused Identifiers
has caused the Debian Bug report #230537,
regarding xdm: warn of unused Identifiers
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 this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)


-- 
230537: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=230537
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Package: xdm
Version: 4.2.1-14
Severity: wishlist

In /var/log/XFree86.0.log there could be warnings/notices about
Identifiers declared, but then never used in ServerLayout, e.g.:
(II) ... Identifier "ZZ" declared, but then never used in ServerLayout
(II) ... Identifier "ZZ" unused in ServerLayout


--- End Message ---
--- Begin Message ---
On Sun, Feb  1, 2004 at 01:38:39 +0800, Dan Jacobson wrote:

> In /var/log/XFree86.0.log there could be warnings/notices about
> Identifiers declared, but then never used in ServerLayout, e.g.:
> (II) ... Identifier "ZZ" declared, but then never used in ServerLayout
> (II) ... Identifier "ZZ" unused in ServerLayout
> 
This is not a bug.  Closing.

Cheers,
Julien

--- End Message ---

Bug#136988: marked as done (xdm: Undocumented resources *logoFileName, *logoPadding)

[Debian Bug Tracking System]

Your message dated Sat, 8 Mar 2008 07:26:00 +0100
with message-id <[EMAIL PROTECTED]>
and subject line Re: Bug#136988: xdm: Undocumented resources *logoFileName, 
*logoPadding
has caused the Debian Bug report #136988,
regarding xdm: Undocumented resources *logoFileName, *logoPadding
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 this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)


-- 
136988: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=136988
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Package: xdm
Version: 4.1.0-14
Severity: minor

In /etc/X11/xdm/Xresources, there are the lines

#if PLANES >= 8
xlogin*logoFileName: /usr/X11R6/lib/X11/xdm/pixmaps/debian.xpm
#else
xlogin*logoFileName: /usr/X11R6/lib/X11/xdm/pixmaps/debianbw.xpm
#endif

and

xlogin*logoPadding: 10

The resources *logoFileName and *logoPadding are mentioned anywhere
in the documentation.

-- System Information
Debian Release: 3.0
Architecture: i386
Kernel: Linux meiner 2.2.20 #2 Sun Nov 4 23:47:51 CET 2001 i686
Locale: LANG=C, LC_CTYPE=C

Versions of packages xdm depends on:
ii  cpp   2:2.95.4-9 The GNU C preprocessor.
ii  debconf   1.0.26 Debian configuration management sy
ii  libc6 2.2.5-3GNU C Library: Shared libraries an
ii  libpam0g  0.72-35Pluggable Authentication Modules l
ii  libxaw7   4.1.0-14   X Athena widget set library
ii  xbase-clients 4.1.0-14   miscellaneous X clients
ii  xlibs 4.1.0-14   X Window System client libraries


--- End Message ---
--- Begin Message ---
Version: 1:1.1.5-1

On Tue, Mar  5, 2002 at 21:45:09 +0100, Thomas Koenig wrote:

> The resources *logoFileName and *logoPadding are mentioned anywhere
> in the documentation.
> 
The manpage was updated upstream in xdm 1.1.5, and now documents these
resources.  I'm closing this bug; thanks for your report, and sorry it
took so long.

Cheers,
Julien

--- End Message ---

Bug#439399: bevel issue

[Julien Cristau]

On Fri, Aug 24, 2007 at 21:43:57 +0200, Julien Cristau wrote:

> On Fri, Aug 24, 2007 at 15:29:08 -0400, Joey Hess wrote:
> 
> > The xdm greeter window is quite a bit larger now than it used to be.
> > This might relate to a display glitch. Along the bottom of the window,
> > there is a bevel. About 3/4 of the way across, the bevel is gone, and I
> > think it just displays flat grey instead. Toward the right corner, the
> > bevel reappears.
> > 
> For the record I've made a screenshot and put it up at
> http://people.debian.org/~jcristau/xdm.png
> 
> I'll try to bisect this when I get a chance, but if someone is faster
> I'd appreciate it :)
> 
Hi Joey,

I don't see this anymore with 1:1.1.6-4.  Do you still see this bug?

Thanks,
Julien



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

Bug#366086: xdm: Login widget fonts specified incorrectly in Xresources

[Julien Cristau]

On Fri, May  5, 2006 at 01:03:20 +0100, Richard Thrippleton wrote:

> This could either be a bug in /etc/X11/xdm/Xresources , or xdm itself. The
> resources named xlogin*Font and similar purport to set the fonts used in the
> login widget, but have no such effect. Changing the resource name to 
> login*Font
> works.
> I think xdm used to honour xlogin*Font, based on functioning xdm setups on
> older machines I've seen, but it clearly no longer does - this may or may not
> be correct behaviour.
> 
Hi Richard, sorry for the late reply.

Can you still reproduce this with xdm from testing or unstable?

Looking at the code, I see:
greeter/greet.c:static char *argv[] = { "xlogin", NULL };
greeter/greet.c:dpy = XtOpenDisplay (context, d->name, "xlogin", "Xlogin", 
NULL, 0,
which suggests that the xlogin* resources ought to work.

Cheers,
Julien



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

Bug#428050: unfinite loop inside xdm

[Julien Cristau]

tag 428050 moreinfo
kthxbye

On Fri, Jun  8, 2007 at 14:43:03 +0300, Aleksey Cheusov wrote:

> After a few days of normal work xdm hangs and doesn't respond to the remote
> xdmcp queries anymore. It wastes CPU and does nothing.
> I strace it, look below.
> 
> [EMAIL PROTECTED]:~$ sudo strace -p 4319 2>&1 | head
> Process 4319 attached - interrupt to quit
> read(5, "", 4096)   = 0
> read(5, "", 4096)   = 0
> read(5, "", 4096)   = 0
> read(5, "", 4096)   = 0
> read(5, "", 4096)   = 0
> read(5, "", 4096)   = 0
> read(5, "", 4096)   = 0
> read(5, "", 4096)   = 0
> read(5, "", 4096)   = 0
> [EMAIL PROTECTED]:~$
> 
> I used 'head' here because the list of read calls is unfinite.
> 
Hi Aleksey,

sorry for the late reply.  Do you still experience this problem with
xdm?  If this is the case, could you attach gdb to the xdm process and
get a backtrace, so we know where it's stuck?

Thanks,
Julien



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

Processed: Re: Bug#428050: unfinite loop inside xdm

[Debian Bug Tracking System]

Processing commands for [EMAIL PROTECTED]:

> tag 428050 moreinfo
Bug#428050: unfinite loop inside xdm
There were no tags set.
Tags added: moreinfo

> kthxbye
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]

Processed: Re: Bug#314990: xdm: cannot log in

[Debian Bug Tracking System]

Processing commands for [EMAIL PROTECTED]:

> notfound 314990 1:1.0.5-2
Bug#314990: xdm: cannot log in
Bug no longer marked as found in version 1:1.0.5-2.
(By the way, this Bug is currently marked as done.)

> kthxbye
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]

Bug#314990: xdm: cannot log in

[Julien Cristau]

notfound 314990 1:1.0.5-2
kthxbye

On Wed, May  9, 2007 at 22:57:13 +1200, Jasen Betts wrote:

> after dist-upgrade:
> 
> xdm fails to authenticate all users, purge and reinstall of xdm doesn't help
> 
Hi Jasen (sorry for the late reply),

if you still experience this problem, please open a new bug, 314990 is
most probably unrelated.

Thanks,
Julien



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

Bug#469936: xserver-xorg-input-mouse: mouse sluggish after upgrade (same as 461152? different?)

[gambarimasu+reportbug]

Package: xserver-xorg-input-mouse
Version: 1:1.2.3-2
Severity: normal


not sure if this is same or different from 461152.

shortly after i upgraded xserver-xorg-input-mouse to unstable, the
mouse started occasionally being very sluggish to the point of
near-unusability.  a few days before that, i upgraded
xserver-xorg-core and x11-common, so i do not know for sure that it is
the mouse driver.  but it is almost certainly one of those three.

new information:

1.  i use xset m 1/2 because the mouse is far too fast normally.  however,
this does not fix it.

2.  i have a tyan tiger motherboard with dual athlon mp.  this link
suggests that it might be relevant:
http://ubuntuforums.org/showthread.php?t=100165 .

3.  a busy system makes it worse.  i do not know if this is a cpu thing
or a bus thing, or what.

usb wireless mouse, fresh batteries, excellent reception, never any problem.

thanks.


p.s. previous reportbug claimed success, but it did not post?

-- Package-specific info:
Contents of /var/lib/x11/X.roster:

/var/lib/x11/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx 1 root root 13 2007-11-27 16:58 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 1673980 2008-01-31 21:06 /usr/bin/Xorg

Contents of /var/lib/x11/xorg.conf.roster:
xserver-xorg

VGA-compatible devices on PCI bus:
01:05.0 VGA compatible controller: Matrox Graphics, Inc. MGA G550 AGP (rev 01)

/etc/X11/xorg.conf does not exist.

Xorg X server log files on system:
-rw--- 1 root root 36628 2007-11-28 19:16 /var/log/Xorg.3.log
-rw--- 1 root root 25992 2008-01-27 23:28 /var/log/Xorg.2.log
-rw--- 1 root root 25987 2008-01-31 15:18 /var/log/Xorg.1.log
-rw--- 1 root root 27977 2008-02-25 16:25 /var/log/Xorg.0.log

Contents of most recent Xorg X server log file
/var/log/Xorg.0.log:


-- System Information:
Debian Release: lenny/sid
Architecture: i386 (i686)

Kernel: Linux 2.6.24myver-2-first (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages xserver-xorg-input-mouse depends on:
ii  libc6  2.7-6 GNU C Library: Shared libraries
ii  xserver-xorg-core  2:1.4.1~git20080131-1 Xorg X server - core server

xserver-xorg-input-mouse recommends no packages.

-- debconf-show failed



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

twm_1.0.4-1_i386.changes ACCEPTED

[Debian Installer]

Accepted:
twm_1.0.4-1.diff.gz
  to pool/main/t/twm/twm_1.0.4-1.diff.gz
twm_1.0.4-1.dsc
  to pool/main/t/twm/twm_1.0.4-1.dsc
twm_1.0.4-1_i386.deb
  to pool/main/t/twm/twm_1.0.4-1_i386.deb
twm_1.0.4.orig.tar.gz
  to pool/main/t/twm/twm_1.0.4.orig.tar.gz


Override entries for your package:
twm_1.0.4-1.dsc - source x11
twm_1.0.4-1_i386.deb - optional x11

Announcing to [EMAIL PROTECTED]


Thank you for your contribution to Debian.


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

Bug#437437: marked as done (libx11 breaks scim (and maybe other input methods) XIM mode in GNOME)

[Debian Bug Tracking System]

Your message dated Sat, 08 Mar 2008 03:17:04 +
with message-id <[EMAIL PROTECTED]>
and subject line Bug#437437: fixed in libx11 2:1.1.4-1
has caused the Debian Bug report #437437,
regarding libx11 breaks scim (and maybe other input methods) XIM mode in GNOME
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 this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)


-- 
437437: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=437437
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Package: scim
Version: 1.4.7-1
Severity: normal

Already discussed in
https://bugs.launchpad.net/ubuntu/+source/scim/+bug/66104
And the problem showed up from version 1.4.6. Current transitional
solution is changing the value of "/FrontEnd/X11/Dynamic" in
/etc/scim/config or ~/.scim/config from "false" to "true", which is
known to unfortunately break deadkeys usage in European keyboard layouts. 
So this walk around is only recommend when such problem shows up. Seems 
further investigation is required.

-- Package-specific info:
Related packages:
ii  libscim8c2a1.4.7-1library for SCIM platform
ii  scim   1.4.7-1smart common input method platform
ii  scim-bridge0.4.12-1   Another gtk-immodule of SCIM (transitional p
ii  scim-bridge-ag 0.4.12-1   IME server of scim-bridge communicate with S
ii  scim-bridge-cl 0.4.12-1   IME server of scim-bridge communicate with S
ii  scim-gtk2-immo 1.4.7-1GTK+2 input method module with SCIM as backe
ii  scim-modules-s 1.4.7-1socket modules for SCIM platform
ii  scim-pinyin0.5.0-3smart pinyin IM engine for SCIM platform

Related environment variables:
[EMAIL PROTECTED]
$GTK_IM_MODULE=xim

Installed SCIM components:
/usr/lib/scim-1.0:
1.4.0
scim-helper-launcher
scim-helper-manager
scim-launcher
scim-panel-gtk

/usr/lib/scim-1.0/1.4.0:
Config
Filter
FrontEnd
Helper
IMEngine
SetupUI

/usr/lib/scim-1.0/1.4.0/Config:
simple.so
socket.so

/usr/lib/scim-1.0/1.4.0/Filter:
sctc.so

/usr/lib/scim-1.0/1.4.0/FrontEnd:
socket.so
x11.so

/usr/lib/scim-1.0/1.4.0/Helper:
setup.so

/usr/lib/scim-1.0/1.4.0/IMEngine:
pinyin.so
rawcode.so
socket.so

/usr/lib/scim-1.0/1.4.0/SetupUI:
aaa-frontend-setup.so
aaa-imengine-setup.so
panel-gtk-setup.so
pinyin-imengine-setup.so

-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (990, 'testing'), (800, 'unstable'), (300, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.21-2-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages scim depends on:
ii  libatk1.0-0 1.18.0-2 The ATK accessibility toolkit
ii  libc6   2.6-2GNU C Library: Shared libraries
ii  libcairo2   1.4.10-1 The Cairo 2D vector graphics libra
ii  libfontconfig1  2.4.2-1.2generic font configuration library
ii  libgcc1 1:4.2-20070712-1 GCC support library
ii  libglib2.0-02.12.12-1+b1 The GLib library of C routines
ii  libgtk2.0-0 2.10.13-1The GTK+ graphical user interface 
ii  libpango1.0-0   1.16.4-1 Layout and rendering of internatio
ii  libscim8c2a 1.4.7-1  library for SCIM platform
ii  libstdc++6  4.2-20070712-1   The GNU Standard C++ Library v3
ii  libx11-62:1.0.3-7X11 client-side library
ii  libxcursor1 1:1.1.8-2X cursor management library
ii  libxext61:1.0.3-2X11 miscellaneous extension librar
ii  libxfixes3  1:4.0.3-2X11 miscellaneous 'fixes' extensio
ii  libxi6  2:1.1.1-1X11 Input extension library
ii  libxinerama11:1.0.2-1X11 Xinerama extension library
ii  libxrandr2  2:1.2.1-1X11 RandR extension library
ii  libxrender1 1:0.9.2-1X Rendering Extension client libra

Versions of packages scim recommends:
ii  im-switch 1.14   Input method switch framework
ii  scim-gtk2-immodule1.4.7-1GTK+2 input method module with SCI

-- no debconf information

--- End Message ---
--- Begin Message ---
Source: libx11
Source-Version: 2:1.1.4-1

We believe that the bug you reported is fixed in the latest version of
libx11, which is due to be installed in the Debian FTP archive:

libx11-6-dbg_1.1.4-1_i386.deb
  to pool/main/libx/libx11/libx11-6-dbg_1.1.4-1_i386.deb
libx11-6_1.1.4-1_i386.deb
  to pool/main/libx/libx11/libx11-6_1.1.4-1_i386.deb
libx11-data_1.1.4-1_all.deb
  to pool/main/lib

x11proto-xf86dri: Changes to 'debian-unstable'

[Julien Cristau]

 .gitignore   |   10 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ++
 debian/xsfbs/xsfbs.mk|  312 +
 debian/xsfbs/xsfbs.sh|  900 +++
 4 files changed, 1372 insertions(+)

New commits:
commit 844199da71f29556be3436fa0fead2f0cc0bfc1b
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Jan 8 20:18:49 2008 -0500

Kill the manifest code.
It served its purpose for the monolith and is now dead.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b8f7afd..4822173 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -196,7 +196,6 @@ xsfclean: cleanscripts unpatch
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
-debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \
 debian/po/pothead
 
 # Generate the debconf templates POT file header.
@@ -209,58 +208,6 @@ debian/po/pothead: debian/po/pothead.in
 updatepo: debian/po/pothead
debian/scripts/debconf-updatepo --pot-header=pothead --verbose
 
-# Use the MANIFEST files to determine whether we're shipping everything we
-# expect to ship, and not shipping anything we don't expect to ship.
-.PHONY: check-manifest
-stampdir_targets+=check-manifest
-check-manifest: $(STAMP_DIR)/check-manifest
-$(STAMP_DIR)/check-manifest: $(STAMP_DIR)/install
-   # Compare manifests.
-   (cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) \
- >debian/MANIFEST.$(ARCH).new
-   # Construct MANIFEST files from MANIFEST.$(ARCH).in and
-   # MANIFEST.$(ARCH).all or MANIFEST.all.
-   if expr "$(findstring -DBuildFonts=NO,$(IMAKE_DEFINES))" \
- : "-DBuildFonts=NO" >/dev/null 2>&1; then \
- LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH); 
\
-   else \
- if [ -e debian/MANIFEST.$(ARCH).all ]; then \
-   LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in 
debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \
- else \
-   LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all 
>debian/MANIFEST.$(ARCH); \
- fi; \
-   fi
-   # Confirm that the installed file list has not changed.
-   if [ -e debian/MANIFEST.$(ARCH) ]; then \
- if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then 
\
-   diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new || 
DIFFSTATUS=$$?; \
-   case $${DIFFSTATUS:-0} in \
- 0) ;; \
- 1) if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \
-  echo 'MANIFEST check failed; ignoring problem because 
\$$IGNORE_MANIFEST_CHANGES set' >&2; \
-  echo 'Please ensure that the package maintainer has an 
up-to-date version of the' >&2; \
-  echo 'MANIFEST.$(ARCH).in file.' >&2; \
-else \
-  echo 'MANIFEST check failed; please see debian/README' >&2; \
-  exit 1; \
-fi; \
-;; \
- *) echo "diff reported unexpected exit status $$DIFFSTATUS when 
performing MANIFEST check" >&2; \
-exit 1; \
-;; \
-   esac; \
- fi; \
-   fi
-   >$@
-
-# Because we build (and install) different files depending on whether or not
-# any architecture-independent packages are being created, the list of files we
-# expect to see will differ; see the discussion of the "build" target above.
-.PHONY: check-manifest-arch check-manifest-indep
-check-manifest-arch: IMAKE_DEFINES+= -DBuildSpecsDocs=NO -DBuildFonts=NO 
-DInstallHardcopyDocs=NO
-check-manifest-arch: check-manifest
-check-manifest-indep: check-manifest
-
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.
 #

commit 331c032528ba1faebef1d8eaa56db47f533f0426
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sat Sep 22 23:49:11 2007 -0400

Remove make-orig-tar-gz target

This target wasn't kept up to date and was totally broken for the git
world. The way we use git has made this target pretty well impossible to
use in any form, so it's been supersceded by a script that is currently
located at
http://people.debian.org/~dnusinow/xsf_scripts/git-make-orig-tar-gz

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index bfca7bb..b8f7afd 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -272,29 +272,6 @@ prune-upstream-tree:
dh_testdir
grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf
 
-# Change to what should be the correct directory, ensure it is, and if
-# so, create the .orig.tar.gz file.  Exclude the debian directory and its
-# contents, and any .svn directories and their contents (so that we can safely
-# build an .orig.tar.gz from SVN checkout, not just an export).
-#
-# Note: This ru

libx11_1.1.4-1_i386.changes ACCEPTED

[Debian Installer]

Accepted:
libx11-6-dbg_1.1.4-1_i386.deb
  to pool/main/libx/libx11/libx11-6-dbg_1.1.4-1_i386.deb
libx11-6_1.1.4-1_i386.deb
  to pool/main/libx/libx11/libx11-6_1.1.4-1_i386.deb
libx11-data_1.1.4-1_all.deb
  to pool/main/libx/libx11/libx11-data_1.1.4-1_all.deb
libx11-dev_1.1.4-1_i386.deb
  to pool/main/libx/libx11/libx11-dev_1.1.4-1_i386.deb
libx11-xcb-dev_1.1.4-1_i386.deb
  to pool/main/libx/libx11/libx11-xcb-dev_1.1.4-1_i386.deb
libx11-xcb1-dbg_1.1.4-1_i386.deb
  to pool/main/libx/libx11/libx11-xcb1-dbg_1.1.4-1_i386.deb
libx11-xcb1_1.1.4-1_i386.deb
  to pool/main/libx/libx11/libx11-xcb1_1.1.4-1_i386.deb
libx11_1.1.4-1.diff.gz
  to pool/main/libx/libx11/libx11_1.1.4-1.diff.gz
libx11_1.1.4-1.dsc
  to pool/main/libx/libx11/libx11_1.1.4-1.dsc
libx11_1.1.4.orig.tar.gz
  to pool/main/libx/libx11/libx11_1.1.4.orig.tar.gz


Override entries for your package:
libx11-6-dbg_1.1.4-1_i386.deb - extra libdevel
libx11-6_1.1.4-1_i386.deb - optional libs
libx11-data_1.1.4-1_all.deb - optional x11
libx11-dev_1.1.4-1_i386.deb - optional libdevel
libx11-xcb-dev_1.1.4-1_i386.deb - optional libdevel
libx11-xcb1-dbg_1.1.4-1_i386.deb - extra libdevel
libx11-xcb1_1.1.4-1_i386.deb - optional libs
libx11_1.1.4-1.dsc - source x11

Announcing to [EMAIL PROTECTED]
Closing bugs: 437437 


Thank you for your contribution to Debian.


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

Processing of twm_1.0.4-1_i386.changes

[Archive Administrator]

twm_1.0.4-1_i386.changes uploaded successfully to localhost
along with the files:
  twm_1.0.4-1.dsc
  twm_1.0.4.orig.tar.gz
  twm_1.0.4-1.diff.gz
  twm_1.0.4-1_i386.deb

Greetings,

Your Debian queue daemon


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

twm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |6 
 debian/control   |4 
 src/deftwmrc.c   |   78 -
 src/gram.c   | 2771 ---
 src/gram.h   |  198 ---
 src/lex.c| 1715 --
 6 files changed, 7 insertions(+), 4765 deletions(-)

New commits:
commit 792ea774cb8e3d1e3b8df2c1c298d97487872273
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 03:59:37 2008 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 68acca9..0101bf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-twm (1:1.0.4-1) UNRELEASED; urgency=low
+twm (1:1.0.4-1) unstable; urgency=low
 
   * New upstream release
   * Fixup patch 01_debian_system_twmrc.diff
   * Remove -1 debian revisions from build-deps to please lintian.
   * Add Vcs-* control fields.
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 18:02:38 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sat, 08 Mar 2008 03:59:33 +0100
 
 twm (1:1.0.3-3) unstable; urgency=low
 

commit e4fb74f198c565947a38eb76fa59cca3294c3b4c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 03:59:21 2008 +0100

Minor updates/fixes.

Remove -1 debian revisions from build-deps to please lintian.
Add Vcs-* control fields.

diff --git a/debian/changelog b/debian/changelog
index 92b6d33..68acca9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ twm (1:1.0.4-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Fixup patch 01_debian_system_twmrc.diff
+  * Remove -1 debian revisions from build-deps to please lintian.
+  * Add Vcs-* control fields.
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 18:02:38 +0100
 
diff --git a/debian/control b/debian/control
index a9c26d4..e25761c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,10 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-2), 
libxext-dev (>= 1:1.0.0-1), libxt-dev (>= 1:1.0.0-1), libxmu-dev (>= 
1:1.0.1-1), bison, flex, quilt
+Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-2), 
libxext-dev (>= 1:1.0.0), libxt-dev (>= 1:1.0.0), libxmu-dev (>= 1:1.0.1), 
bison, flex, quilt
 Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/app/twm
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xdm.git
 
 Package: twm
 Architecture: any

commit 94259617b7e7c0504395c6853b228469edefc54e
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 04:07:08 2008 +0100

Delete built sources.

diff --git a/src/deftwmrc.c b/src/deftwmrc.c
deleted file mode 100644
index c0debe0..000
--- a/src/deftwmrc.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* 
- * This file is generated automatically from the default
- * twm bindings file system.twmrc by the twm Imakefile.
- */
-
-unsigned char *defTwmrc[] = {
-(unsigned char *) "",
-(unsigned char *) "NoGrabServer",
-(unsigned char *) "RestartPreviousState",
-(unsigned char *) "DecorateTransients",
-(unsigned char *) "TitleFont 
\"-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*\"",
-(unsigned char *) "ResizeFont 
\"-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*\"",
-(unsigned char *) "MenuFont 
\"-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*\"",
-(unsigned char *) "IconFont 
\"-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*\"",
-(unsigned char *) "IconManagerFont 
\"-adobe-helvetica-bold-r-normal--*-100-*-*-*\"",
-(unsigned char *) "",
-(unsigned char *) "Color",
-(unsigned char *) "{",
-(unsigned char *) "BorderColor \"slategrey\"",
-(unsigned char *) "DefaultBackground \"rgb:2/a/9\"",
-(unsigned char *) "DefaultForeground \"gray85\"",
-(unsigned char *) "TitleBackground \"rgb:2/a/9\"",
-(unsigned char *) "TitleForeground \"gray85\"",
-(unsigned char *) "MenuBackground \"rgb:2/a/9\"",
-(unsigned char *) "MenuForeground \"gray85\"",
-(unsigned char *) "MenuBorderColor \"slategrey\"",
-(unsigned char *) "MenuTitleBackground \"gray70\"",
-(unsigned char *) "MenuTitleForeground \"rgb:2/a/9\"",
-(unsigned char *) "IconBackground \"rgb:2/a/9\"",
-(unsigned char *) "IconForeground \"gray85\"",
-(unsigned char *) "IconBorderColor \"gray85\"",
-(unsigned char *) "IconManagerBackground \"rgb:2/a/9\"",
-(unsigned char *) "IconManagerForeground \"gray85\"",
-(unsigned char *) "}",
-(unsigned char *) "",
-(unsigned char *) "MoveDelta 3",
-(unsigned char *) "Function \"move-or-lower\" { f.move f.deltastop f.lower 
}",
-(unsigned char *) "Function \"move-or-raise\" { f.move f.deltastop f.raise 
}",
-(unsigned char *) "Function \"move-or-iconify\" { f.move f.deltastop 
f.iconify }",
-(unsigned char *) "",
- 

twm: Changes to 'refs/tags/twm-1_1.0.4-1'

[Julien Cristau]

Tag 'twm-1_1.0.4-1' created by Julien Cristau <[EMAIL PROTECTED]> at 2008-03-08 
03:09 +

Tagging upload of twm 1:1.0.4-1 to unstable.

Changes since twm-1_1.0.3-3:
Adam Jackson (1):
  twm 1.0.4

Alan Coopersmith (2):
  Explicitly require libSM & libICE since twm calls them directly
  Change twm_CFLAGS to AM_CFLAGS to make automake-1.10 happier

James Cloos (3):
  Rename .cvsignore to .gitignore
  Add *~ to .gitignore to skip patch/emacs droppings
  Replace static ChangeLog with dist-hook to generate from git log

Julien Cristau (6):
  Merge tag 'twm-1.0.4' of git.freedesktop.org:/git/xorg/app/twm into 
debian-unstable
  New upstream release
  autoreconf
  Delete built sources.
  Minor updates/fixes.
  Prepare changelog for upload

Wolfgang Rupprecht (1):
  X.Org Bug #5691: twm mouse button limit too low

---
 .cvsignore |   17 
 .gitignore |   18 
 ChangeLog  |   73 
 Makefile.am|   10 
 Makefile.in|  154 -
 aclocal.m4 |  200 +-
 config.guess   |   36 
 config.sub |   52 
 configure  |  185 +
 configure.ac   |5 
 debian/changelog   |9 
 debian/control |4 
 debian/patches/01_debian_system_twmrc.diff |6 
 depcomp|   93 
 install-sh |  514 +++--
 man/.cvsignore |3 
 man/.gitignore |3 
 man/Makefile.in|   77 
 missing|   61 
 mkinstalldirs  |5 
 src/.cvsignore |8 
 src/.gitignore |8 
 src/Makefile.am|4 
 src/Makefile.in|  417 
 src/deftwmrc.c |   78 
 src/gram.c | 2771 -
 src/gram.h |  198 --
 src/lex.c  | 1715 -
 src/twm.h  |2 
 ylwrap |  223 ++
 30 files changed, 1253 insertions(+), 5696 deletions(-)
---


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

Processing of libx11_1.1.4-1_i386.changes

[Archive Administrator]

libx11_1.1.4-1_i386.changes uploaded successfully to localhost
along with the files:
  libx11_1.1.4-1.dsc
  libx11_1.1.4.orig.tar.gz
  libx11_1.1.4-1.diff.gz
  libx11-data_1.1.4-1_all.deb
  libx11-6_1.1.4-1_i386.deb
  libx11-6-dbg_1.1.4-1_i386.deb
  libx11-dev_1.1.4-1_i386.deb
  libx11-xcb1_1.1.4-1_i386.deb
  libx11-xcb1-dbg_1.1.4-1_i386.deb
  libx11-xcb-dev_1.1.4-1_i386.deb

Greetings,

Your Debian queue daemon


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

xutils-dev_7.4+1_i386.changes ACCEPTED

[Debian Installer]

Accepted:
xutils-dev_7.4+1.dsc
  to pool/main/x/xutils-dev/xutils-dev_7.4+1.dsc
xutils-dev_7.4+1.tar.gz
  to pool/main/x/xutils-dev/xutils-dev_7.4+1.tar.gz
xutils-dev_7.4+1_i386.deb
  to pool/main/x/xutils-dev/xutils-dev_7.4+1_i386.deb


Override entries for your package:
xutils-dev_7.4+1.dsc - source x11
xutils-dev_7.4+1_i386.deb - optional x11

Announcing to [EMAIL PROTECTED]


Thank you for your contribution to Debian.


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

libx11: Changes to 'refs/tags/libx11-2_1.1.4-1'

[Julien Cristau]

Tag 'libx11-2_1.1.4-1' created by Julien Cristau <[EMAIL PROTECTED]> at 
2008-03-08 02:51 +

Tagging upload of libx11 2:1.1.4-1 to experimental.

Changes since libx11-2_1.1.3-1:
Adam Jackson (2):
  Bug #14029: Don't LockDisplay() recursively.
  libX11 1.1.4

Alan Coopersmith (6):
  X.Org Bug #4312: incorrect comment asterisk in XAnyEvent.3x man page
  XErrorDB updates for Render 0.9 & XFixes 4.0
  Add WM_LOCALE_NAME to list of properties set in XSetWMProperties comment
  Spell out number in XkbGetKeyVirtualModMap man page to avoid cpp errors 
from #
  Add support for building lint library with --enable-lint-library
  Man page typo fixes

Anton Zinoviev (1):
  Additions to the Compose file for UTF-8

Brice Goglin (1):
  Do not call laptop-detect, let the only user call it directly

Daniel Stone (1):
  Colours: Fix --disable-xcms

David Nusinow (2):
  Remove make-orig-tar-gz target
  Kill the manifest code.

Eric Anholt (2):
  Add XF86 keyboard/monitor brightness keysyms to the keysymbdb.
  Bug #2081: Note the range limitation of XSetScreenSaver arguments.

Eric S. Raymond (9):
  Bug #9516: Markup error in XAllocWMHints.3x
  Bug 9523: Markup problems in XQueryExtension.3x
  Bug #9650: Bad markup in XLoadFont.3x manual page
  Bug #9651: Bad markup in XcmsColor.3x
  Bug #9652: Bad markup in XDrawArc.3x
  Bug #9653: Bad markup in XQueryColor.3x
  Bug #9654: Bad markup in XrmGetFileDatabase.3x
  Bug #9655: Bad markup in XrmUniqueQuark.3x
  Bug #9658: Bad markup on XIfEvent.3x

Ian Romanick (1):
  Make sure nls/am_ET.UTF-8/Makefile is created by configure.

James Cloos (15):
  Fix SMP Compose targets
  Add some compose sequences
  Compose fix for Latin-1 (from Debian)
  Add additional Euro signs to compose
  Patch for Catalan locales
  Add compose file for Ethiopic to match new keyboard in xkeyboard-config
  Fix typo
  Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11
  Use the new dead_psili and dead_dasia keysyms added to proto/x11proto 
7.0.11
  Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11
  Fix the  keysyms in the en_US.UTF-8 Compose file
  Update the currency symbols block of en_US.UTF-8/Compose.pre
  Add  compose sequences
  add a comment to en_US.UTF-8/Compose
  Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11

Jamey Sharp (1):
  Two threads can request sequence sync and XID fetch simultaneously.

Jeremy C. Reed (1):
  Fix a mutex reference-counting bug.

Jeremy Huddleston (3):
  Define __DARWIN__ when host_os == darwin* as needed in SetLocale.c
  Use __APPLE__ instead of __DARWIN__
  Added launchd support.

Julien Cristau (11):
  Add patch by Søren Sandman Pedersen from RedHat to fix XIM hangs
  Merge branch 'debian-unstable' of git.debian.org:/git/pkg-xorg/xsfbs into 
debian-experimental
  Merge tag 'libX11-1.1.4' of git.freedesktop.org:/git/xorg/lib/libX11 into 
debian-experimental
  Revert "Add patch by Søren Sandman Pedersen from RedHat to fix XIM hangs"
  New upstream release
  Update the upstream changelog
  autoreconf
  add bug closer
  Add missing file
  Minor packaging fixes/updates
  Prepare changelog for upload

Kim Woelders (1):
  Fix bs_BA entries in locale.dir.pre

Kristian Høgsberg (1):
  Add GLX 1.4 requests and errors.

Samuel Thibault (1):
  X.Org Bug #12983: Typos in ./man/XChangeKeyboardControl.man

Søren Sandmann Pedersen (1):
  XIM: Fix a hand when switching input context.

Timo Aaltonen (1):
  * control: libx11-data Replaces old versions of libx11-6 to enable

Yann Droneaud (1):
  XIM: Properly initialise client event

---
 ChangeLog   |  459 
 Makefile.in |   53 
 aclocal.m4  |  265 
 config.guess|   36 
 config.sub  |   52 
 configure   |  913 +
 configure.ac|   20 
 debian/changelog|   28 
 debian/control  |7 
 debian/libx11-6.NEWS|2 
 debian/patches/003_recognize_glibc_2.3.2_locale_names.diff  |  324 
 debian/patches/004_en_US.UTF-8_Compose_fix_Unicode_plane_1.diff |   70 
 debian/patches/005_Compose_fix_latin1_UTF8.diff |  447 
 debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff  |  404 
 debian/patches/007_iso8859-15_Compose_fix.diff  |   32 
 debian/patches/008_remove_ko_Compose.diff   |8

libx11: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog|7 
 debian/control  |6 
 debian/libx11-6.NEWS|2 
 nls/am_ET.UTF-8/Makefile.in |  463 
 4 files changed, 472 insertions(+), 6 deletions(-)

New commits:
commit 4ea171de7ae3f2b45c1fdc65c4c332f2b20c8d2a
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 03:14:01 2008 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 65f8fcd..3c8fbe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.1.3-2) UNRELEASED; urgency=low
+libx11 (2:1.1.4-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
   * control: libx11-data Replaces old versions of libx11-6 to enable
@@ -24,7 +24,7 @@ libx11 (2:1.1.3-2) UNRELEASED; urgency=low
   * Drop XS- prefix from Vcs-* control fields.
   * Fix malformed trailer line in libx11-6.NEWS (thanks, lintian).
 
- -- Timo Aaltonen <[EMAIL PROTECTED]>  Thu, 29 Nov 2007 21:39:23 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sat, 08 Mar 2008 03:13:07 +0100
 
 libx11 (2:1.1.3-1) experimental; urgency=low
 

commit f3377e822027eab9daea21b2d499d0daa8dc3c81
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 03:27:13 2008 +0100

Minor packaging fixes/updates

Bump Standards-Version to 3.7.3 (no changes).
Drop XS- prefix from Vcs-* control fields.
Fix malformed trailer line in libx11-6.NEWS (thanks, lintian).

diff --git a/debian/changelog b/debian/changelog
index f649dd7..65f8fcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ libx11 (2:1.1.3-2) UNRELEASED; urgency=low
 + 012_ru_RU_UTF-8_XLC_LOCALE.diff: refresh
 + 014_add_Khmer_digraphs.diff: fixup
 + 015_russian_locale_alias.diff: refresh
+  * Bump Standards-Version to 3.7.3 (no changes).
+  * Drop XS- prefix from Vcs-* control fields.
+  * Fix malformed trailer line in libx11-6.NEWS (thanks, lintian).
 
  -- Timo Aaltonen <[EMAIL PROTECTED]>  Thu, 29 Nov 2007 21:39:23 +0200
 
diff --git a/debian/control b/debian/control
index f893f0e..e0586a3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Josh Triplett <[EMAIL 
PROTECTED]>, Jamey Sharp <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5.0.0), pkg-config, xtrans-dev, 
x11proto-core-dev, x11proto-kb-dev, x11proto-input-dev, x11proto-xext-dev, 
x11proto-xf86bigfont-dev, libxcb1-dev (>= 0.9.92), libxcb-xlib0-dev (>= 
0.9.92), quilt
-Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libx11
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libx11.git
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libx11
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libx11.git
 
 Package: libx11-6
 Section: libs
diff --git a/debian/libx11-6.NEWS b/debian/libx11-6.NEWS
index 6dde6ea..0f8acc2 100644
--- a/debian/libx11-6.NEWS
+++ b/debian/libx11-6.NEWS
@@ -15,7 +15,7 @@ libx11 (2:1.1.2-1) experimental; urgency=low
   Bug analysis and workaround by Julien Cristau, Josh Triplett and Christoph
   Pfister.
 
- -- Josh Triplett <[EMAIL PROTECTED]  Wed, 13 Jun 2007 12:11:04 -0700
+ -- Josh Triplett <[EMAIL PROTECTED]>  Wed, 13 Jun 2007 12:11:04 -0700
 
 libx11 (2:1.1-1) experimental; urgency=low
 

commit 67b1266a5455cb7cb24b0864c10db95914e11393
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 03:42:40 2008 +0100

Add missing file

diff --git a/nls/am_ET.UTF-8/Makefile.in b/nls/am_ET.UTF-8/Makefile.in
new file mode 100644
index 000..9606eb4
--- /dev/null
+++ b/nls/am_ET.UTF-8/Makefile.in
@@ -0,0 +1,463 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
[EMAIL PROTECTED]@
+
+#  -*- Makefile -*-
+# Rules for generating files using the C pre-processor
+# (Replaces CppFileTarget from Imake)
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+P

Processing of xutils-dev_7.4+1_i386.changes

[Archive Administrator]

xutils-dev_7.4+1_i386.changes uploaded successfully to localhost
along with the files:
  xutils-dev_7.4+1.dsc
  xutils-dev_7.4+1.tar.gz
  xutils-dev_7.4+1_i386.deb

Greetings,

Your Debian queue daemon


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

xutils-dev: Changes to 'refs/tags/xutils-dev-1_7.4+1'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit 844199da71f29556be3436fa0fead2f0cc0bfc1b
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Jan 8 20:18:49 2008 -0500

Kill the manifest code.
It served its purpose for the monolith and is now dead.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b8f7afd..4822173 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -196,7 +196,6 @@ xsfclean: cleanscripts unpatch
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
-debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \
 debian/po/pothead
 
 # Generate the debconf templates POT file header.
@@ -209,58 +208,6 @@ debian/po/pothead: debian/po/pothead.in
 updatepo: debian/po/pothead
debian/scripts/debconf-updatepo --pot-header=pothead --verbose
 
-# Use the MANIFEST files to determine whether we're shipping everything we
-# expect to ship, and not shipping anything we don't expect to ship.
-.PHONY: check-manifest
-stampdir_targets+=check-manifest
-check-manifest: $(STAMP_DIR)/check-manifest
-$(STAMP_DIR)/check-manifest: $(STAMP_DIR)/install
-   # Compare manifests.
-   (cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) \
- >debian/MANIFEST.$(ARCH).new
-   # Construct MANIFEST files from MANIFEST.$(ARCH).in and
-   # MANIFEST.$(ARCH).all or MANIFEST.all.
-   if expr "$(findstring -DBuildFonts=NO,$(IMAKE_DEFINES))" \
- : "-DBuildFonts=NO" >/dev/null 2>&1; then \
- LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH); 
\
-   else \
- if [ -e debian/MANIFEST.$(ARCH).all ]; then \
-   LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in 
debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \
- else \
-   LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all 
>debian/MANIFEST.$(ARCH); \
- fi; \
-   fi
-   # Confirm that the installed file list has not changed.
-   if [ -e debian/MANIFEST.$(ARCH) ]; then \
- if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then 
\
-   diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new || 
DIFFSTATUS=$$?; \
-   case $${DIFFSTATUS:-0} in \
- 0) ;; \
- 1) if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \
-  echo 'MANIFEST check failed; ignoring problem because 
\$$IGNORE_MANIFEST_CHANGES set' >&2; \
-  echo 'Please ensure that the package maintainer has an 
up-to-date version of the' >&2; \
-  echo 'MANIFEST.$(ARCH).in file.' >&2; \
-else \
-  echo 'MANIFEST check failed; please see debian/README' >&2; \
-  exit 1; \
-fi; \
-;; \
- *) echo "diff reported unexpected exit status $$DIFFSTATUS when 
performing MANIFEST check" >&2; \
-exit 1; \
-;; \
-   esac; \
- fi; \
-   fi
-   >$@
-
-# Because we build (and install) different files depending on whether or not
-# any architecture-independent packages are being created, the list of files we
-# expect to see will differ; see the discussion of the "build" target above.
-.PHONY: check-manifest-arch check-manifest-indep
-check-manifest-arch: IMAKE_DEFINES+= -DBuildSpecsDocs=NO -DBuildFonts=NO 
-DInstallHardcopyDocs=NO
-check-manifest-arch: check-manifest
-check-manifest-indep: check-manifest
-
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.
 #

commit 331c032528ba1faebef1d8eaa56db47f533f0426
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sat Sep 22 23:49:11 2007 -0400

Remove make-orig-tar-gz target

This target wasn't kept up to date and was totally broken for the git
world. The way we use git has made this target pretty well impossible to
use in any form, so it's been supersceded by a script that is currently
located at
http://people.debian.org/~dnusinow/xsf_scripts/git-make-orig-tar-gz

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index bfca7bb..b8f7afd 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -272,29 +272,6 @@ prune-upstream-tree:
dh_testdir
grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf
 
-# Change to what should be the correct directory, ensure it is, and if
-# so, create the .orig.tar.gz file.  Exclude the debian directory and its
-# contents, and any .svn directories and their contents (so that we can safely
-# build an .orig.tar.gz from SVN checkout, not just an export).
-#
-# Note: This rule is for Debian package maintainers' convenience, and is not
-# needed for conventional build scenarios.
-#
-# This rule *IS* the recommended method for creating a new .orig.tar.gz file,
-# for the rare situations when one is needed.

xutils-dev: Changes to 'debian-unstable'

[Julien Cristau]

 debian/xsfbs/xsfbs.mk |  122 --
 debian/xsfbs/xsfbs.sh |7 --
 2 files changed, 30 insertions(+), 99 deletions(-)

New commits:
commit 844199da71f29556be3436fa0fead2f0cc0bfc1b
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Jan 8 20:18:49 2008 -0500

Kill the manifest code.
It served its purpose for the monolith and is now dead.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b8f7afd..4822173 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -196,7 +196,6 @@ xsfclean: cleanscripts unpatch
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
-debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \
 debian/po/pothead
 
 # Generate the debconf templates POT file header.
@@ -209,58 +208,6 @@ debian/po/pothead: debian/po/pothead.in
 updatepo: debian/po/pothead
debian/scripts/debconf-updatepo --pot-header=pothead --verbose
 
-# Use the MANIFEST files to determine whether we're shipping everything we
-# expect to ship, and not shipping anything we don't expect to ship.
-.PHONY: check-manifest
-stampdir_targets+=check-manifest
-check-manifest: $(STAMP_DIR)/check-manifest
-$(STAMP_DIR)/check-manifest: $(STAMP_DIR)/install
-   # Compare manifests.
-   (cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) \
- >debian/MANIFEST.$(ARCH).new
-   # Construct MANIFEST files from MANIFEST.$(ARCH).in and
-   # MANIFEST.$(ARCH).all or MANIFEST.all.
-   if expr "$(findstring -DBuildFonts=NO,$(IMAKE_DEFINES))" \
- : "-DBuildFonts=NO" >/dev/null 2>&1; then \
- LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH); 
\
-   else \
- if [ -e debian/MANIFEST.$(ARCH).all ]; then \
-   LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in 
debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \
- else \
-   LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all 
>debian/MANIFEST.$(ARCH); \
- fi; \
-   fi
-   # Confirm that the installed file list has not changed.
-   if [ -e debian/MANIFEST.$(ARCH) ]; then \
- if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then 
\
-   diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new || 
DIFFSTATUS=$$?; \
-   case $${DIFFSTATUS:-0} in \
- 0) ;; \
- 1) if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \
-  echo 'MANIFEST check failed; ignoring problem because 
\$$IGNORE_MANIFEST_CHANGES set' >&2; \
-  echo 'Please ensure that the package maintainer has an 
up-to-date version of the' >&2; \
-  echo 'MANIFEST.$(ARCH).in file.' >&2; \
-else \
-  echo 'MANIFEST check failed; please see debian/README' >&2; \
-  exit 1; \
-fi; \
-;; \
- *) echo "diff reported unexpected exit status $$DIFFSTATUS when 
performing MANIFEST check" >&2; \
-exit 1; \
-;; \
-   esac; \
- fi; \
-   fi
-   >$@
-
-# Because we build (and install) different files depending on whether or not
-# any architecture-independent packages are being created, the list of files we
-# expect to see will differ; see the discussion of the "build" target above.
-.PHONY: check-manifest-arch check-manifest-indep
-check-manifest-arch: IMAKE_DEFINES+= -DBuildSpecsDocs=NO -DBuildFonts=NO 
-DInstallHardcopyDocs=NO
-check-manifest-arch: check-manifest
-check-manifest-indep: check-manifest
-
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.
 #

commit 331c032528ba1faebef1d8eaa56db47f533f0426
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sat Sep 22 23:49:11 2007 -0400

Remove make-orig-tar-gz target

This target wasn't kept up to date and was totally broken for the git
world. The way we use git has made this target pretty well impossible to
use in any form, so it's been supersceded by a script that is currently
located at
http://people.debian.org/~dnusinow/xsf_scripts/git-make-orig-tar-gz

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index bfca7bb..b8f7afd 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -272,29 +272,6 @@ prune-upstream-tree:
dh_testdir
grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf
 
-# Change to what should be the correct directory, ensure it is, and if
-# so, create the .orig.tar.gz file.  Exclude the debian directory and its
-# contents, and any .svn directories and their contents (so that we can safely
-# build an .orig.tar.gz from SVN checkout, not just an export).
-#
-# Note: This rule is for Debian package maintainers' convenience, and is not
-# needed for conventional build sc

xutils-dev: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |7 +--
 debian/control   |6 --
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 109bd37ce8fb071d60fcb00b998233c3f374668e
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 02:57:34 2008 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index cdb80eb..d9429d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.4+1) UNRELEASED; urgency=low
+xutils-dev (1:7.4+1) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * debian/control:
@@ -11,7 +11,7 @@ xutils-dev (1:7.4+1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.7.3 (no changes).
   * Add Vcs-* control fields.
 
- -- Timo Aaltonen <[EMAIL PROTECTED]>  Mon,  4 Jun 2007 12:12:41 +0300
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sat, 08 Mar 2008 02:57:06 +0100
 
 xutils-dev (1:7.2.ds2-1) unstable; urgency=low
 

commit ece61be9bb86ec87cb268f76e71a47b6cf6b857e
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 03:01:27 2008 +0100

debian/control updates

Add myself to Uploaders, remove Fabio and Branden with their permission.
Bump Standards-Version to 3.7.3 (no changes).
Add Vcs-* control fields.

diff --git a/debian/changelog b/debian/changelog
index a1fbe77..cdb80eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ xutils-dev (1:7.4+1) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * util-macros 1.1.6.
+  * Add myself to Uploaders, remove Fabio and Branden with their permission.
+  * Bump Standards-Version to 3.7.3 (no changes).
+  * Add Vcs-* control fields.
 
  -- Timo Aaltonen <[EMAIL PROTECTED]>  Mon,  4 Jun 2007 12:12:41 +0300
 
diff --git a/debian/control b/debian/control
index 3a0acc2..85b8740 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xutils-dev
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>, Andres Salomon <[EMAIL 
PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Andres Salomon <[EMAIL 
PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, x11proto-core-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git
 
 Package: xutils-dev
 Architecture: any

commit af33f90bc919f6ef1924103d7d3dda6f15bcbfc2
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 14:17:35 2008 +0100

Bump version number.

diff --git a/debian/changelog b/debian/changelog
index 33069bb..a1fbe77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.2.ds2-2) UNRELEASED; urgency=low
+xutils-dev (1:7.4+1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * debian/control:


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

xutils-dev: Changes to 'refs/tags/xutils-dev-1_7.4+1'

[Julien Cristau]

Tag 'xutils-dev-1_7.4+1' created by Julien Cristau <[EMAIL PROTECTED]> at 
2008-03-08 02:03 +

Tagging upload of xutils-dev 1:7.4+1 to unstable.

Changes since xutils-dev-1_7.2.ds2-1:
Julien Cristau (4):
  util-macros 1.1.6.
  Bump version number.
  debian/control updates
  Prepare changelog for upload

Timo Aaltonen (1):
  debian/control: add C/R/P for imake/makedepend/xorg-build-macros/xmkmf to 
allow Ubuntu to sync this in future.

---
 debian/changelog  |   15 +
 debian/control|9 
 util-macros/ChangeLog |   21 +
 util-macros/Makefile.in   |   96 ---
 util-macros/aclocal.m4|  161 +++--
 util-macros/configure |  121 ++---
 util-macros/configure.ac  |2 
 util-macros/install-sh|  514 +-
 util-macros/missing   |   61 ++--
 util-macros/xorg-macros.m4|8 
 util-macros/xorg-macros.m4.in |6 
 util-macros/xorgversion.m4|4 
 12 files changed, 666 insertions(+), 352 deletions(-)
---


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

x11-utils: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog   |2 
 debian/copyright   |   20 
 xprop/ChangeLog|   36 +
 xprop/Makefile.am  |2 
 xprop/Makefile.in  |   49 +-
 xprop/aclocal.m4   | 1298 +++--
 xprop/clientwin.c  |  214 
 xprop/clientwin.h  |   29 +
 xprop/config.guess |   56 +-
 xprop/config.sub   |   66 ++
 xprop/configure|  150 +++---
 xprop/configure.ac |7 
 xprop/depcomp  |   33 -
 xprop/dsimple.c|8 
 xprop/dsimple.h|2 
 xprop/install-sh   |  228 -
 xprop/xprop.c  |   16 
 17 files changed, 1324 insertions(+), 892 deletions(-)

New commits:
commit b8947b78e98c4e08c66ac2a1f1f1d56fbb2d08d9
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 02:48:36 2008 +0100

update debian/copyright for xprop

diff --git a/debian/changelog b/debian/changelog
index 21d2b66..a45beab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11-utils (7.3+2) UNRELEASED; urgency=low
   * xev 1.0.3
   * Refresh patches.
   * xprop 1.0.4
+  * update debian/copyright for xprop
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 01 Feb 2008 01:23:34 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 9851cd9..5f59fe8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -368,6 +368,26 @@ xprop:
   other dealings in this Software without prior written authorization
   from The Open Group.
 
+  Copyright 2007 Kim woelders
+ 
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that copyright
+  notice and this permission notice appear in supporting documentation, and
+  that the name of the copyright holders not be used in advertising or
+  publicity pertaining to distribution of the software without specific,
+  written prior permission.  The copyright holders make no representations
+  about the suitability of this software for any purpose.  It is provided "as
+  is" without express or implied warranty.
+ 
+  THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+  EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+  OF THIS SOFTWARE.
+
 xvinfo:
   Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
   

commit bfb658dafa6a1b295034c132f753564863047ee4
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 02:45:47 2008 +0100

xprop 1.0.4

diff --git a/debian/changelog b/debian/changelog
index 3e5d006..21d2b66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x11-utils (7.3+2) UNRELEASED; urgency=low
   * Drop patch for #291137, which is included in luit 1.0.3.
   * xev 1.0.3
   * Refresh patches.
+  * xprop 1.0.4
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 01 Feb 2008 01:23:34 +0100
 
diff --git a/xprop/ChangeLog b/xprop/ChangeLog
index 6c2b022..ad9d0bb 100644
--- a/xprop/ChangeLog
+++ b/xprop/ChangeLog
@@ -1,3 +1,39 @@
+commit 427023df02bd38ff9dc2af2a2059466f37f4cfd8
+Author: Benjamin Close <[EMAIL PROTECTED]>
+Date:   Wed Dec 19 15:17:34 2007 +1030
+
+Fix build under autoconf 2.57
+
+configure.ac specifies a max version of 2.57 but AC_CHECK_HEADERS_ONCE
+was only introduced to autoconf in 2.59c. Drop the _ONCE to make autoconf 
happy
+
+Bug: 13631
+Found by: tinderbox
+Approved by: daniels@
+
+commit e09956f244099ddd36b1a2cd5d7800d5fc7120c1
+Author: Kim Woelders <[EMAIL PROTECTED]>
+Date:   Thu Dec 6 05:30:43 2007 -0500
+
+Select correct client window in WM’s using virtual roots
+From bug 2185¹
+
+When manually selecting a window, xprop finds the top-level window 
containing
+the pointer and uses XmuClientWindow to attempt to find a client window 
having
+WM_STATE set.
+
+In a WM using virtual roots (e.g. enlightenment, desks other than first) 
this
+fails beacuse the top-level window is a virtual root, and XmuClientWindow 
seems
+to find the first client having WM_STATE set, which only by coincidence 
will be
+the one the user intended to select (i.e. containing the pointer).
+
+The solution is to descend the window hierarchy at the pointer location to 
find
+a window with WM_STATE set.
+
+1] https://bugs.freedesktop.org/show_bug.cgi?id=2185
+
+Signed-off-by: James Cloos <[EMAIL PROTECTED]>
+
 commit 9ccda86dae06375750685977a81f4fb1cabf3d00
 Author: Alan Coopersmith <[EMAIL PROTECTED]>
 Date:   Fri Aug 10 14:52:27 2007 -0700
diff --git a/xprop/Makefile.am b/xprop/Makefile.am
index e4fc5ad..d3fc24a 100644
--- a/xprop/Makefile.am
+++ b/xprop/Makefile

x11-utils: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |2 
 debian/patches/02_xev_flush_standard_output.diff  |8 
 debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff |   22 
 debian/xsfbs/xsfbs.mk |  103 --
 debian/xsfbs/xsfbs.sh |7 
 xev/ChangeLog |  209 
+++-
 xev/INSTALL   |  236 

 xev/Makefile.am   |9 
 xev/Makefile.in   |  160 
+--
 xev/aclocal.m4|  222 
++--
 xev/compile   |  142 --
 xev/config.guess  |   32 
 xev/config.sub|   52 -
 xev/configure |  197 
++-
 xev/configure.ac  |3 
 xev/depcomp   |   93 +
 xev/install-sh|  514 
++
 xev/missing   |   61 -
 xev/xev.c |   24 
 19 files changed, 1103 insertions(+), 993 deletions(-)

New commits:
commit a63010da8c518c3a7ff9b63a2e9673efd049ec82
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 02:41:43 2008 +0100

Refresh patches.

diff --git a/debian/changelog b/debian/changelog
index 494f7cf..3e5d006 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x11-utils (7.3+2) UNRELEASED; urgency=low
 upstream's COPYING file.
   * Drop patch for #291137, which is included in luit 1.0.3.
   * xev 1.0.3
+  * Refresh patches.
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 01 Feb 2008 01:23:34 +0100
 
diff --git a/debian/patches/02_xev_flush_standard_output.diff 
b/debian/patches/02_xev_flush_standard_output.diff
index f336ef6..9c4c381 100644
--- a/debian/patches/02_xev_flush_standard_output.diff
+++ b/debian/patches/02_xev_flush_standard_output.diff
@@ -6,11 +6,9 @@ unreachable code.
 This patch by Branden Robinson.  Thanks to Bill Currie for identifying the
 problem and the solution.  See Debian bug #238638.
 
-Index: xbase-clients/xev/xev.c
-===
 xbase-clients.orig/xev/xev.c   2006-02-18 14:56:32.0 -0500
-+++ xbase-clients/xev/xev.c2006-02-26 19:50:37.0 -0500
-@@ -1045,6 +1045,7 @@
+--- x11-utils.orig/xev/xev.c
 x11-utils/xev/xev.c
+@@ -1065,6 +1065,7 @@
printf ("Unknown event type %d\n", event.type);
break;
}
diff --git 
a/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff 
b/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff
index 2e8a872..e917678 100644
--- a/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff
+++ b/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff
@@ -10,10 +10,8 @@ The user should only be shown a usage messages when:
 
 Not submitted upstream to XFree86 or X.Org.
 
-Index: xlsfonts/dsimple.c
-===
 xlsfonts/dsimple.c.orig2006-07-11 04:53:33.0 +0200
-+++ xlsfonts/dsimple.c 2007-02-11 08:14:45.0 +0100
+--- xlsfonts/dsimple.c.orig
 xlsfonts/dsimple.c
 @@ -188,8 +188,7 @@
if (d == NULL) {
fprintf (stderr, "%s:  unable to open display '%s'\n",
@@ -24,11 +22,9 @@ Index: xlsfonts/dsimple.c
}
  
return(d);
-Index: xprop/dsimple.c
-===
 xprop/dsimple.c.orig   2007-02-11 08:15:17.0 +0100
-+++ xprop/dsimple.c2007-02-11 08:15:40.0 +0100
-@@ -188,8 +188,7 @@
+--- xprop/dsimple.c.orig
 xprop/dsimple.c
+@@ -122,8 +122,7 @@
if (d == NULL) {
fprintf (stderr, "%s:  unable to open display '%s'\n",
 program_name, XDisplayName (display_name));
@@ -38,11 +34,9 @@ Index: xprop/dsimple.c
}
  
return(d);
-Index: xwininfo/dsimple.c
-===
 xwininfo/dsimple.c.orig2007-02-11 08:16:29.0 +0100
-+++ xwininfo/dsimple.c 2007-02-11 08:16:47.0 +0100
-@@ -188,8 +188,7 @@
+--- xwininfo/dsimple.c.orig
 xwininfo/dsimple.c
+@@ -109,8 +109,7 @@
if (d == NULL) {
fprintf (stderr, "%s:  unable to open display '%s'\n",
 program_name, XDisplayName (display_name));

commit af1a9436f0af03ab92e48a8c4de07a0b49527bb4

x11-apps: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |1 
 debian/copyright  |   58 +
 x11perf/ChangeLog |  334 +---
 x11perf/INSTALL   |  236 --
 x11perf/Makefile.am   |   10 
 x11perf/Makefile.in   |  164 +--
 x11perf/Xmark.man |   10 
 x11perf/aclocal.m4|  238 +--
 x11perf/config.guess  |   56 +++--
 x11perf/config.h.in   |9 
 x11perf/config.sub|   78 ++-
 x11perf/configure |  312 --
 x11perf/configure.ac  |3 
 x11perf/depcomp   |   93 +++--
 x11perf/do_blt.c  |  114 +++
 x11perf/do_tests.c|   24 ++
 x11perf/install-sh|  514 ++
 x11perf/missing   |   61 +++--
 x11perf/mkinstalldirs |  158 ---
 x11perf/x11perf.c |  167 +++-
 x11perf/x11perf.h |   37 +++
 x11perf/x11perf.man   |4 
 22 files changed, 1687 insertions(+), 994 deletions(-)

New commits:
commit 8e186d947600ae5c5c532d7fc890e83de7ab027b
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 01:39:35 2008 +0100

Add bitmap and xgc copyright information.

diff --git a/debian/copyright b/debian/copyright
index ce99a9a..70081cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,33 @@
 The contents of this package were downloaded from
 http://xorg.freedesktop.org/releases/individual/app/
-It contains the x11perf, xcalc, xclock, xcursorgen, xedit, xload,
-xmag, xmore, xwud, oclock, xbiff, xclipboard, xconsole, xditview,
-xeyes, xlogo, xman and xwd applications.
+It contains the bitmap, x11perf, xcalc, xclock, xcursorgen, xedit, xload, xmag,
+xmore, xwud, oclock, xbiff, xclipboard, xconsole, xditview, xeyes, xgc, xlogo,
+xman and xwd applications.
+
+bitmap:
+  Copyright 1988, 1993, 1998  The Open Group
+  
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+  
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of The Open Group shall
+  not be used in advertising or otherwise to promote the sale, use or
+  other dealings in this Software without prior written authorization
+  from The Open Group.
 
 oclock:
   Copyright 1989, 1998  The Open Group
@@ -295,6 +320,33 @@ xeyes:
   other dealings in this Software without prior written authorization
   from the X Consortium.
 
+xgc:
+  Copyright (c) 1991  X Consortium
+  
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+  
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of the X Consortium shall
+  not be used in advertising or otherwise to promote the sale, use or
+  other dealings in this Software without prior written authorization
+  from the X Consortium.
+
 xload:
   Copyright (c) 1989  X Consortium
   

commit fe6109ce071a959a7d151f221d8402cdc09d3263
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 01:32:29 2008 +0100

x11perf 1.5

diff --git a/debian/changelog b/debian/changelog
index e6a5152..30395ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-apps (7.3+2) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Re-add bitmap (closes: #445097).
+  * x11perf 1

Re: xorg-server: Changes to 'debian-experimental'

[Julien Cristau]

Hi,

so I pushed preliminary work on 1.4.99.901.  Almost all patches from the
debian-unstable branch are applied upstream. :)
There are still some issues:
- configure is run with --disable-glx --disable-dri --disable-dri2,
  because it needs a new mesa.  I hope the situation will be clearer
  upstream in the next few days...
- xprint is also disabled (doesn't build, because requestingClient is
  not declared; I guess either the #ifdef XPRINT in dix/dispatch.c
  should be changed, or XPRINT should get defined somewhere it's not).
  That's not a blocker as far as I'm concerned, but I guess Drew will
  want to get it fixed asap so it gets in 1.5 upstream.

I've uploaded a tarball (upstream's minus hw/xfree86/doc/README.DRI) to
http://people.debian.org/~jcristau/xorg-server_1.4.99.901.orig.tar.gz
(SHA1: fd8f242c3695c87d259513f313d0736b1a94556f).

Also, I haven't tested yet, but it's too late to do that tonight.

Cheers,
Julien


signature.asc
Description: Digital signature

xorg-server: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog   |2 +-
 debian/control |2 +-
 debian/inputabiver |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e2c6e698eecab0a7191b65ff68e67b533afa234a
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 8 00:23:14 2008 +0100

Oops, the input ABI hasn't changed since 1.4.

diff --git a/debian/changelog b/debian/changelog
index 0f5d934..1b4d128 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,7 +27,7 @@ xorg-server (2:1.4.99.901-1) UNRELEASED; urgency=low
 on libpixman-1-dev to >= 0.9.5.
   * Add build-dep on libxv-dev for Xephyr.
   * Drop XS- prefix from Vcs-* debian/control fields.
-  * Bump videoabiver and inputabiver to 2.9, serverminver to 2:1.4.99.901.
+  * Bump videoabiver to 2.9, serverminver to 2:1.4.99.901.
   * Drop obsolete --with-rgb-path configure option.
   * /etc/X11/xserver/SecurityPolicy is gone, don't install it.
 
diff --git a/debian/control b/debian/control
index 6101d43..408d30d 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
 Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
  xserver-xorg-video, xserver-common, xserver-xorg-video-1.0, 
xserver-xorg-input,
  xserver-xorg-video-1.9, xserver-xorg-input-wacom (<< 0.7.8),
- xserver-xorg-video-2, xserver-xorg-input-2
+ xserver-xorg-video-2
 Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
  xserver-common
 Provides: xserver
diff --git a/debian/inputabiver b/debian/inputabiver
index 8c26915..0cfbf08 100644
--- a/debian/inputabiver
+++ b/debian/inputabiver
@@ -1 +1 @@
-2.9
+2


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

x11-xserver-utils: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |2 
 debian/copyright  |   25 -
 xrandr/COPYING|   29 +
 xrandr/ChangeLog  |  901 --
 xrandr/INSTALL|  236 -
 xrandr/Makefile.am|   12 
 xrandr/Makefile.in|  152 
 xrandr/aclocal.m4 |  220 ++--
 xrandr/autogen.sh |   13 
 xrandr/compile|  142 ---
 xrandr/config.guess   |   32 +
 xrandr/config.sub |   52 ++
 xrandr/configure  |  193 +-
 xrandr/configure.ac   |3 
 xrandr/depcomp|   93 -
 xrandr/install-sh |  514 +++-
 xrandr/missing|   61 +--
 xrandr/xrandr.c   |   49 ++
 xrandr/xrandr.man |   11 
 xrandr/xrandr_test.pl |  329 ++
 20 files changed, 2153 insertions(+), 916 deletions(-)

New commits:
commit 194c7797710c344c1bda74dcd3869a746f760310
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 23:39:23 2008 +0100

update debian/copyright with information from xrandr's COPYING file.

diff --git a/debian/changelog b/debian/changelog
index 1ae38c5..ca4f43c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-xserver-utils (7.3+3) UNRELEASED; urgency=low
   * xrdb 1.0.5
   * xset 1.0.4
   * xrandr 1.2.3
+  * update debian/copyright with information from xrandr's COPYING file.
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 20:27:02 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 8dc97f4..60a9d62 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -159,24 +159,25 @@ xmodmap:
 xrandr:
   Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
   Copyright © 2002 Hewlett Packard Company, Inc.
+  Copyright © 2006 Intel Corporation
   
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation, and that the name of Keith Packard or HP not be used in
-  advertising or publicity pertaining to distribution of the software without
-  specific, written prior permission.  Keith Packard and HP makes no
-  representations about the suitability of this software for any purpose.  It
-  is provided "as is" without express or implied warranty.
-  
-  KEITH PACKARD and HP DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  the above copyright notice appear in all copies and that both that copyright
+  notice and this permission notice appear in supporting documentation, and
+  that the name of the copyright holders not be used in advertising or
+  publicity pertaining to distribution of the software without specific,
+  written prior permission.  The copyright holders make no representations
+  about the suitability of this software for any purpose.  It is provided "as
+  is" without express or implied warranty.
+  
+  THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
   INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
   CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
   DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  PERFORMANCE OF THIS SOFTWARE.
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+  OF THIS SOFTWARE.
 
 xrdb:
  COPYRIGHT 1987, 1991

commit 7a0e4af477d13aef0c2102b276dd593a01d816e4
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 23:35:56 2008 +0100

xrandr 1.2.3

diff --git a/debian/changelog b/debian/changelog
index 7a46e77..1ae38c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-xserver-utils (7.3+3) UNRELEASED; urgency=low
 
   * xrdb 1.0.5
   * xset 1.0.4
+  * xrandr 1.2.3
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 20:27:02 +0100
 
diff --git a/xrandr/COPYING b/xrandr/COPYING
index 7f33cbf..c405625 100644
--- a/xrandr/COPYING
+++ b/xrandr/COPYING
@@ -1,12 +1,21 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
+Copyright © 2002 Hewlett Packard Company, Inc.
+Copyright © 2006 Intel Corporation
 
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission not

Bug#151780: As the novelty of

[Stephanie Emma]

Burn pounds off with Anatrim http://www.asoriade.com




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

Processed: reopening 383642

[Debian Bug Tracking System]

Processing commands for [EMAIL PROTECTED]:

> # Automatically generated email from bts, devscripts version 2.10.18.1
> # damn spammers
> reopen 383642
Bug#383642: xspecs: Build the files as PDF
Bug reopened, originator not changed.

>
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]

Bug#383642: reopening 383642

[Julien Cristau]

# Automatically generated email from bts, devscripts version 2.10.18.1
# damn spammers
reopen 383642 




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

Bug#383642: marked as done (xspecs: Build the files as PDF)

[Debian Bug Tracking System]

Your message dated Fri, 07 Mar 2008 18:37:56 +
with message-id <[EMAIL PROTECTED]>
and subject line talking on cell phones 
has caused the Debian Bug report #383642,
regarding xspecs: Build the files as PDF
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 this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)


-- 
383642: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=383642
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Package: xspecs
Version: 1:1.0.1-2
Severity: wishlist

Hi,

gv and evince are not able to search in the PS files. A PDF file is
searchable. Please, build the files as PDFs to make it easier to work
with them.

Thanks, Jörg.

-- System Information:
Debian Release: unstable/experimental
  APT prefers unstable
  APT policy: (990, 'unstable'), (1, 'experimental')
Architecture: powerpc (ppc)
Shell:  /bin/sh linked to /bin/dash
Kernel: Linux 2.6.17-rc6
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)

-- no debconf information


pgpzumSPFsyxs.pgp
Description: PGP signature
--- End Message ---
--- Begin Message ---
A simple and safe way to weigh less http://www.veriguato.com


--- End Message ---

x11-xserver-utils: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog   |7 
 xrdb/ChangeLog |   14 
 xrdb/Makefile.am   |2 
 xrdb/Makefile.in   |   45 -
 xrdb/aclocal.m4| 1302 
 xrdb/config.guess  |   56 +
 xrdb/config.sub|   66 +
 xrdb/configure |  117 +-
 xrdb/configure.ac  |3 
 xrdb/depcomp   |   33 
 xrdb/install-sh|  228 ++---
 xrdb/xrdb.c|7 
 xset/ChangeLog |   45 +
 xset/INSTALL   |  236 -
 xset/Makefile.in   |  140 +--
 xset/aclocal.m4|  220 ++---
 xset/autogen.sh|   13 
 xset/compile   |  142 ---
 xset/config.guess  |   28 
 xset/config.sub|   44 -
 xset/configure |  387 -
 xset/configure.ac  |2 
 xset/depcomp   |   93 +-
 xset/install-sh|  514 
 xset/missing   |   61 -
 xset/mkinstalldirs |  158 ---
 xset/xset.c| 2155 ++---
 xset/xset.man  |7 
 28 files changed, 3084 insertions(+), 3041 deletions(-)

New commits:
commit a7dc94904b2393dcf4069de3d847614407f6adb6
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 20:29:03 2008 +0100

* xset 1.0.4

diff --git a/debian/changelog b/debian/changelog
index 35a983f..7a46e77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11-xserver-utils (7.3+3) UNRELEASED; urgency=low
 
   * xrdb 1.0.5
+  * xset 1.0.4
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 20:27:02 +0100
 
diff --git a/xset/ChangeLog b/xset/ChangeLog
index 3855654..43366f3 100644
--- a/xset/ChangeLog
+++ b/xset/ChangeLog
@@ -1,3 +1,48 @@
+commit b6343fa846eeadb6736f383577b91dbb46d46971
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Tue Jan 15 18:11:25 2008 -0800
+
+Delete duplicated #include statements
+
+commit e92294748383b0eaca6cb7f3883cf909077963a1
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Tue Jan 15 18:10:37 2008 -0800
+
+Convert function declarations from K&R to ANSI C
+
+commit 685fe4692583d383ffec8e0db52ea055fca0ed11
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Tue Jan 15 17:54:14 2008 -0800
+
+Make code formatting consistent
+
+Too many different indent styles/levels made code hard to read
+
+commit 5dfbc61487623448c82d043c4f4f29d5e047d498
+Author: gsr.bugs <[EMAIL PROTECTED]>
+Date:   Thu Nov 15 00:04:34 2007 +0200
+
+Manpage: Add mention of mouse acceleration with zero threshold
+
+xset m A/B 0 gives a different behaviour, smooth acceleration, than typical
+A/B C (C not zero) which is two speed. This behaviour is, for some people,
+nice. But the point is that it is not documented in man page, so nobody
+can just test it except if discovered due some reason more complex than 
read
+the docs.
+
+commit 6d56c1f8d25ce84c797c3b72070073bc44d1a7ac
+Merge: c4f7c40... 3decc85...
+Author: James Cloos <[EMAIL PROTECTED]>
+Date:   Mon Sep 3 06:02:50 2007 -0400
+
+Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/app/xset
+
+commit c4f7c402ad52c784c01655b5d3a9d4d33c6598d6
+Author: James Cloos <[EMAIL PROTECTED]>
+Date:   Mon Sep 3 05:51:47 2007 -0400
+
+Add *~ to .gitignore to skip patch/emacs droppings
+
 commit 3decc85623f023a31b8c19526b29092a9f2d0357
 Author: Alan Coopersmith <[EMAIL PROTECTED]>
 Date:   Mon Aug 27 16:37:20 2007 -0700
diff --git a/xset/INSTALL b/xset/INSTALL
index 23e5f25..e69de29 100644
--- a/xset/INSTALL
+++ b/xset/INSTALL
@@ -1,236 +0,0 @@
-Installation Instructions
-*
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or 

x11-xkb-utils: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |   11 +
 debian/control|   10 
 debian/copyright  |   67 ++
 debian/xsfbs/xsfbs.mk |  103 +-
 debian/xsfbs/xsfbs.sh |7 
 xkbcomp/COPYING   |   94 -
 xkbcomp/ChangeLog |  330 
 xkbcomp/INSTALL   |  236 --
 xkbcomp/Makefile.am   |   10 
 xkbcomp/Makefile.in   |  174 
 xkbcomp/aclocal.m4|  238 +--
 xkbcomp/action.c  |4 
 xkbcomp/compat.c  |3 
 xkbcomp/config.guess  |   56 +++--
 xkbcomp/config.h.in   |9 
 xkbcomp/config.sub|   78 ++-
 xkbcomp/configure |  216 -
 xkbcomp/configure.ac  |3 
 xkbcomp/depcomp   |   93 +++--
 xkbcomp/expr.h|2 
 xkbcomp/geometry.c|6 
 xkbcomp/install-sh|  514 ++
 xkbcomp/keycodes.c|4 
 xkbcomp/keytypes.c|2 
 xkbcomp/misc.c|9 
 xkbcomp/misc.h|   24 +-
 xkbcomp/missing   |   61 +++--
 xkbcomp/parseutils.h  |2 
 xkbcomp/symbols.c |2 
 xkbcomp/utils.c   |   18 -
 xkbcomp/utils.h   |   20 -
 xkbcomp/vmod.c|3 
 xkbcomp/xkbcomp.c |5 
 xkbcomp/xkbparse.c|  387 ++---
 xkbcomp/xkbparse.y|5 
 xkbcomp/xkbpath.c |2 
 xkbcomp/xkbpath.h |2 
 xkbcomp/xkbscan.c |2 
 xkbcomp/ylwrap|  223 +
 39 files changed, 1909 insertions(+), 1126 deletions(-)

New commits:
commit 2dd401d73b361d3fce04f66e16e520ef5d1ee78c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 20:22:39 2008 +0100

debian/control updates

Drop debian revisions from build-deps.
Bump Standards-Version to 3.7.3 (no changes).
Drop the XS- prefix from Vcs-* debian/control fields.

diff --git a/debian/changelog b/debian/changelog
index 5fbf19e..499888d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
   * xkbcomp 1.0.4.
   * Complete debian/copyright's information about xkbcomp from upstream's
 COPYING file.
+  * Drop debian revisions from build-deps.
+  * Bump Standards-Version to 3.7.3 (no changes).
+  * Drop the XS- prefix from Vcs-* debian/control fields.
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 20:10:33 +0100
 
diff --git a/debian/control b/debian/control
index ab3ec0d..9a1410f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-1),
- libxaw7-dev (>= 1:1.0.1-1), libxkbfile-dev (>= 1:1.0.1-1), quilt
+Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0),
+ libxaw7-dev (>= 1:1.0.1), libxkbfile-dev (>= 1:1.0.1), quilt
 # Reasons for build-depends:
 # debhelper for the packaging, pkg-config needed by configure scripts
 # Individual apps:
@@ -13,9 +13,9 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev 
(>= 2:1.0.0-1),
 # xkbevd: libx11-dev, libxkbfile-dev, (bison)
 # xkbprint: libx11-dev, libxkbfile-dev
 # xkbutils: libx11-dev, libxaw7-dev, libxkbfile-dev
-Standards-Version: 3.7.2.0
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xkb-utils
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xkb-utils.git
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xkb-utils
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xkb-utils.git
 
 Package: x11-xkb-utils
 Architecture: any

commit 611579495cefaf0b3489d152daea1f54d04cc188
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 20:14:37 2008 +0100

Complete debian/copyright's information about xkbcomp

Upstream has a COPYING file now, use that.

diff --git a/debian/changelog b/debian/changelog
index 46a5167..5fbf19e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
 
   * xkbcomp 1.0.4.
+  * Complete debian/copyright's information about xkbcomp from upstream's
+COPYING file.
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 20:10:33 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 688d7ba..0b76678 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -50,6 +50,73 @@ xkbcomp:
   OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
   THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+  Copyright 1988, 1998  The Open Group
+  
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+  
+  The above copyri

x11proto-print: Changes to 'debian-unstable'

[Julien Cristau]

 .gitignore   |   11 
 ChangeLog|  198 ++-
 Makefile.am  |   10 
 Makefile.in  |  349 +++--
 Printstr.h   |4 
 aclocal.m4   | 1061 ++--
 configure| 2544 ---
 configure.ac |2 
 debian/changelog |   13 
 debian/control   |8 
 debian/copyright |2 
 debian/rules |2 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ++
 debian/xsfbs/xsfbs.mk|  312 
 debian/xsfbs/xsfbs.sh|  900 +
 install-sh   |  659 ++
 missing  |  193 +-
 mkinstalldirs|   92 +
 18 files changed, 4417 insertions(+), 2093 deletions(-)

New commits:
commit 3a06692b936a5d9ff5111da9fda03eca5da51e9a
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 20:06:23 2008 +0100

Misc updates

Remove old URL from debian/copyright.
Strip XS- prefix from Vcs fields in debian/control.
Remove Branden from Uploaders, with his permission.
Bump Standards-Version to 3.7.3 (no changes).

diff --git a/debian/changelog b/debian/changelog
index 9a13e21..3db48d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,13 +2,15 @@ x11proto-print (1.0.4-1) UNRELEASED; urgency=low
 
   [ Brice Goglin ]
   * Update the long description.
-  * Add URL in debian/copyright.
-  * Add XS-Vcs-* to debian/control.
+  * Update URL in debian/copyright.
+  * Add Vcs-* to debian/control.
   * Remove Fabio from Uploaders, with his permission.
 
   [ Julien Cristau ]
   * New upstream release.
   * Install the upstream ChangeLog.
+  * Remove Branden from Uploaders, with his permission.
+  * Bump Standards-Version to 3.7.3 (no changes).
 
  -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 14 Aug 2007 00:10:40 +0200
 
diff --git a/debian/control b/debian/control
index dab2d59..412d857 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: x11proto-print
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: Drew Parsons <[EMAIL PROTECTED]>, David Nusinow <[EMAIL 
PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]>, Andres Salomon <[EMAIL 
PROTECTED]>
+Uploaders: Drew Parsons <[EMAIL PROTECTED]>, David Nusinow <[EMAIL 
PROTECTED]>, Andres Salomon <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-print
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-print.git
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-print
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-print.git
 
 Package: x11proto-print-dev
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 278e414..722b032 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,6 @@ http://xorg.freedesktop.org/releases/individual/proto/
 This package was debianized by Drew Parsons <[EMAIL PROTECTED]> on
 Sunday, April 16 2006 15:34:09.
 
-Downloaded from http://xorg.freedesktop.org/releases/X11R7.0/src/proto/.
-
 (c) Copyright 1996 Hewlett-Packard Company
 (c) Copyright 1996 International Business Machines Corp.
 (c) Copyright 1996 Sun Microsystems, Inc.

commit d0fd93e5d7cc4d86cb60c16f6f8ccb50c0449d60
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 20:02:29 2008 +0100

autoreconf

diff --git a/Makefile.in b/Makefile.in
index 8fdae14..640003e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,6 +31,45 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+subdir = .
+DIST_COMMON = $(am__configure_deps) $(print_HEADERS) \
+   $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+   $(srcdir)/printproto.pc.in $(top_srcdir)/configu

x11proto-print: Changes to 'upstream-unstable'

[Julien Cristau]

 .gitignore   |1 +
 ChangeLog|   10 --
 Makefile.am  |   10 ++
 Printstr.h   |4 +---
 configure.ac |2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 1a3f6429362c505c1ab5df5fcc00cb913381c8c0
Author: Eamon Walsh <[EMAIL PROTECTED]>
Date:   Fri Dec 14 01:09:37 2007 -0500

Update package version number for devPrivates rework.

diff --git a/configure.ac b/configure.ac
index 3ffac39..26d4dbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([PrintProto], [1.0.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([PrintProto], [1.0.4], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

commit 257f7118e71ef4aa59bec55cd43bf1bdd228d152
Author: James Cloos <[EMAIL PROTECTED]>
Date:   Thu Dec 6 16:39:03 2007 -0500

Replace static ChangeLog with dist-hook to generate from git log

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 03b1497..000
--- a/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-2005-12-14  Kevin E. Martin  
-
-   * configure.ac:
-   Update package version number for final X11R7 release candidate.
-
-2005-12-03  Kevin E. Martin  
-
-   * configure.ac:
-   Update package version number for X11R7 RC3 release.
-
diff --git a/Makefile.am b/Makefile.am
index 0ce1e0e..5492c79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,3 +7,13 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = printproto.pc
 
 EXTRA_DIST = autogen.sh printproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+   (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv 
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git 
directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog

commit d284123348eeffdc8419144c7999c2b82b0cddc0
Author: James Cloos <[EMAIL PROTECTED]>
Date:   Mon Sep 3 05:54:11 2007 -0400

Add *~ to .gitignore to skip patch/emacs droppings

diff --git a/.gitignore b/.gitignore
index 8359630..56a6724 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ configure
 install-sh
 missing
 printproto.pc
+*~

commit e58036978c7c9077fe90517cd9e3e3c8035ca1f2
Author: Eamon Walsh <[EMAIL PROTECTED]>
Date:   Tue Aug 28 09:50:44 2007 -0400

Updates to printproto as part of devPrivates rework.

diff --git a/Printstr.h b/Printstr.h
index 45ac7a5..86fa001 100644
--- a/Printstr.h
+++ b/Printstr.h
@@ -758,7 +758,7 @@ typedef struct _XpContext {
 struct _XpClient *clientHead; /* list of clients */
 CARD32 state;
 VisualID pageWin;
-DevUnion *devPrivates;
+PrivateRec *devPrivates;
 XpDriverFuncs funcs;
ClientPtr clientSlept;
int imageRes;
@@ -766,11 +766,9 @@ typedef struct _XpContext {
 
 #include   /* FontResolutionPtr */
 
-extern Bool XpAllocateContextPrivate(int, unsigned);
 extern FontResolutionPtr XpGetClientResolutions(ClientPtr, int *);
 extern XpContextPtr XpContextOfClient(ClientPtr);
 extern XpContextPtr XpGetPrintContext(ClientPtr);
-extern int XpAllocateContextPrivateIndex(void);
 extern int XpRehashPrinterList(void);
 extern void XpSetFontResFunc(ClientPtr);
 extern void XpUnsetFontResFunc(ClientPtr);

commit e0972b5ba2e9a39f5afa6ad17668dfa517e04cea
Author: Egbert Eich <[EMAIL PROTECTED]>
Date:   Fri Mar 5 13:38:51 2004 +

23. Merged with XFree86 4.4.0. Added changes that went into infected files.
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).

diff --git a/Print.h b/Print.h
index dc9c66d..2d45082 100644
--- a/Print.h
+++ b/Print.h
@@ -57,7 +57,7 @@
  **
  **
  */
-/* $XFree86: xc/include/extensions/Print.h,v 1.5 2001/01/17 17:53:15 dawes Exp 
$ */
+/* $XFree86: xc/include/extensions/Print.h,v 1.4 2000/01/25 18:37:31 dawes Exp 
$ */
 
 #ifndef _XpPrint_H_
 #define _XpPrint_H_
diff --git a/Printstr.h b/Printstr.h
index a518da8..164e2f3 100644
--- a/Printstr.h
+++ b/Printstr.h
@@ -43,7 +43,7 @@
  **
  **
  */
-/* $XFree86: xc/include/extensions/Printstr.h,v 1.6 2001/08/23 12:46:11 alanh 
Exp $ */
+/* $XFree86: xc/include/extensions/Printstr.h,v 1.5 2001/08/01 00:44:35 tsi 
Exp $ */
 
 
 #ifndef _XpPrintstr_H_

commit 498f7aff528f11f2ad33a659c1634ae74d291aba
Author: Kaleb Keithley <[EMAIL PROTECTED]>
Date:   Mon Nov 17 19:03:40 2003 +

merge XFree86 4.3.0.1 to -CURRENT

diff --git a/Print.h b/Print.h
index 3a8e4f2..dc9c66d 

xinit: Changes to 'debian-unstable'

[Julien Cristau]

 .gitignore  |2 
 ChangeLog   |  209 
 INSTALL |5 
 Makefile.am |   58 +--
 Makefile.in |  128 ---
 aclocal.m4  |   84 +++-
 config.guess|   32 +
 config.h.in |6 
 config.sub  |   44 ++
 configure   |  338 ++--
 configure.ac|   38 ++
 cpprules.in |   37 ++
 debian/changelog|   11 
 debian/patches/001_debian_xinitrc.diff  |   36 +-
 debian/patches/02_startx_hostname.diff  |   52 +--
 debian/patches/04_startx_paths.diff |   20 -
 debian/patches/06_move_serverauthfile_into_tmp.diff |   20 -
 debian/patches/series   |6 
 debian/xsfbs/xsfbs.mk   |   76 
 depcomp |   33 +
 install-sh  |  228 +++--
 org.x.X11.plist.cpp |   27 +
 startx.cpp  |  188 +++
 xinit.c |   98 -
 xinitrc.cpp |   28 +
 25 files changed, 1308 insertions(+), 496 deletions(-)

New commits:
commit 676c9ad95e52c7f05ca2fbdd575956699d2b4391
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 19:34:58 2008 +0100

autoreconf

diff --git a/INSTALL b/INSTALL
index 5458714..d3c5b40 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ Installation Instructions
 *
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@ The simplest way to compile this package is:
  all sorts of other programs in order to regenerate files that came
  with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
 Compilers and Options
 =
 
diff --git a/Makefile.in b/Makefile.in
index fb4ae9d..d1abbd2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,6 +35,13 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
+# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
+# to cpp, because that trick does not work on all ANSI C preprocessors.
+# Delete line numbers from the cpp output (-P is not portable, I guess).
+# Allow XCOMM to be preceded by whitespace and provide a means of generating
+# output lines with trailing backslashes.
+# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
+
 
 
 VPATH = @srcdir@
@@ -56,11 +63,12 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = xinit$(EXEEXT)
-subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-   $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-   compile config.guess config.sub depcomp install-sh missing
+   $(top_srcdir)/configure $(top_srcdir)/cpprules.in AUTHORS \
+   COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \
+   depcomp install-sh missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -71,14 +79,15 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
-   "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(xinitrcdir)"
+   "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(launchagentsdir)" \
+   "$(DESTDIR)$(xinitrcdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_xinit_OBJECTS = xinit-xinit.$(OBJEXT)
 xinit

xinit: Changes to 'upstream-unstable'

[Julien Cristau]

 .gitignore  |2 
 Makefile.am |   58 
 configure.ac|   38 +-
 cpprules.in |   37 ++
 org.x.X11.plist.cpp |   27 +++
 startx.cpp  |  188 ++--
 xinit.c |   98 +--
 xinitrc.cpp |   28 +++
 8 files changed, 348 insertions(+), 128 deletions(-)

New commits:
commit 3eaee22196a03d88c419c42470baf562552c1a3b
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Thu Mar 6 17:09:45 2008 -0500

xinit 1.0.8

diff --git a/configure.ac b/configure.ac
index 2a364ee..0d13f8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xinit,[1.0.7], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
+AC_INIT(xinit,[1.0.8], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 96c8650369a99e344b4e3510f713b331d83c4272
Author: Jeremy Huddleston <[EMAIL PROTECTED]>
Date:   Sun Mar 2 10:32:58 2008 -0800

Apple: Use -c in the launchd plist, so broken .profile/.bashrc don't much 
up startx

diff --git a/org.x.X11.plist.cpp b/org.x.X11.plist.cpp
index 2e597ca..3ee22bd 100644
--- a/org.x.X11.plist.cpp
+++ b/org.x.X11.plist.cpp
@@ -9,6 +9,7 @@
 #ifdef __APPLE__
/bin/bash
--login
+   -c
 #endif
__bindir__/startx


commit aa026deef43a8c1479e6a558194e0a473bbdaeb0
Author: Jeremy Huddleston <[EMAIL PROTECTED]>
Date:   Sat Mar 1 17:30:47 2008 -0800

Apple: Adding support for an xinitrc.d directory on OSX, so fink doesn't 
need to clobber files

diff --git a/cpprules.in b/cpprules.in
index 2e50207..f32eafc 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -10,6 +10,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
-e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \
-e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
-e '/^[ ]*XHASH/s/XHASH/\#/' \
+   -e '/XSLASHGLOB/s/XSLASHGLOB/\/\*/' \
-e '/[EMAIL PROTECTED]@$$/s/[EMAIL PROTECTED]@$$/\\/'
 
 # Strings to replace in man pages
diff --git a/xinitrc.cpp b/xinitrc.cpp
index e42002d..89a65ca 100644
--- a/xinitrc.cpp
+++ b/xinitrc.cpp
@@ -87,20 +87,13 @@ XCOMM This is the fallback case if nothing else is executed 
above
 
 #ifdef __APPLE__
 
-if [ -x /usr/X11/bin/xset ] ; then
-   
fontpath="/usr/X11/lib/X11/fonts/misc/,/usr/X11/lib/X11/fonts/TTF/,/usr/X11/lib/X11/fonts/OTF,/usr/X11/lib/X11/fonts/Type1/,/usr/X11/lib/X11/fonts/75dpi:unscaled/,/usr/X11/lib/X11/fonts/100dpi/:unscaled,/usr/X11/lib/X11/fonts/75dpi:unscaled/,/usr/X11/lib/X11/fonts/100dpi/:unscaled"
-
-   [ -e "$HOME"/.fonts/fonts.dir ] && fontpath="$fontpath,$HOME/.fonts"
-   [ -e "$HOME"/Library/Fonts/fonts.dir ] && 
fontpath="$fontpath,$HOME/Library/Fonts"
-   [ -e /Library/Fonts/fonts.dir ] && fontpath="$fontpath,/Library/Fonts"
-   [ -e /System/Library/Fonts/fonts.dir ] && 
fontpath="$fontpath,/System/Library/Fonts"
-
-   /usr/X11/bin/xset fp= "$fontpath"
-   unset fontpath
+if [ -d XINITDIR/xinitrc.d ] ; then
+   for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
+   [ -x "$f" ] && . "$f"
+   done
+   unset f
 fi
 
-[ -x /usr/bin/quartz-wm ] && exec /usr/bin/quartz-wm
-
 #endif
 
 TWM &

commit 916b1ab10d10efbdf3a544534acb95f9d28692cf
Author: Jeremy Huddleston <[EMAIL PROTECTED]>
Date:   Mon Feb 18 15:53:46 2008 -0800

Apple: font caching and defaults
Quieted defaults "error" messages by initializing default values
Do font caching in startx, so users with custom ~/.xinitrc won't have to
worry about updating it.
Add "cache_fonts" defaults item to toggle whether or not to cache fonts at 
startup
Fall back on fc-cache if font_cache.sh is not present.

diff --git a/startx.cpp b/startx.cpp
index bde93fb..c31fd7f 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -79,7 +79,30 @@ clientargs=""
 serverargs=""
 
 #ifdef __APPLE__
-if [ x`defaults read org.x.X11 no_auth` = x0 ] || ! defaults read org.x.X11 
no_auth ; then
+
+XCOMM Initialize defaults (this will cut down on "safe" error messages)
+if ! defaults read org.x.X11 cache_fonts >& /dev/null ; then
+defaults write org.x.X11 cache_fonts -bool true
+fi
+
+if ! defaults read org.x.X11 no_auth >& /dev/null ; then
+defaults write org.x.X11 no_auth -bool false
+fi
+
+if ! defaults read org.x.X11 nolisten_tcp >& /dev/null ; then
+defaults write org.x.X11 nolisten_tcp -bool true
+fi
+
+XCOMM First, start caching fonts
+if [ x`defaults read org.x.X11 cache_fonts` = x1 ] ; then
+if [ -x /usr/X11/bin/font_cache.sh ] ; then
+/usr/X11/bin/font_cache.sh &
+elif [ -x /usr/X11/bin/fc-cache ] ; then
+/usr/X11/bin/f

Bug#433825: xserver-xorg-video-intel: Error in I830WaitLpRing(), timeout for 2 seconds, on i945GM

[Nigel Sim]

I appear to be having this same issue with version 2:2.2.1-1 of the
intel driver, on an Apple MacBook. (All xorg latest from debian unstable
as of 20080308).

For me to trigger the bug I go to youtube and start a video (using
Shockwave Flash 9.0 r48 Firefox plugin). First text on the screen will
become corrupted (looks like horizontal smudging), and then a few
seconds later X will crash. Log attached.

I have found the following setting prevents this issue:
Option "NoAccel""true"

Nigel
/var/lib/x11/X.roster does not exist.

/var/lib/x11/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx 1 root root 13 2007-10-24 21:04 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 1673980 2008-02-01 14:06 /usr/bin/Xorg

Contents of /var/lib/x11/xorg.conf.roster:
xserver-xorg

VGA-compatible devices on PCI bus:
00:02.0 VGA compatible controller: Intel Corporation Mobile 945GM/GMS, 
943/940GML Express Integrated Graphics Controller (rev 03)

/etc/X11/xorg.conf does not match checksum in /var/lib/x11/xorg.conf.md5sum.

Xorg X server configuration file status:
lrwxrwxrwx 1 root root 25 2008-03-07 23:51 /etc/X11/xorg.conf -> 
/etc/X11/xorg.conf.native

Contents of /etc/X11/xorg.conf:
Section "ServerLayout"
Identifier "X.org Configured"
Screen  0  "Screen0" 0 0
InputDevice"Mouse0" "CorePointer"
InputDevice"Keyboard0" "CoreKeyboard"
EndSection

Section "Files"
RgbPath  "/etc/X11/rgb"
ModulePath   "/usr/lib/xorg/modules"
FontPath "/usr/share/fonts/X11/misc"
FontPath "/usr/share/fonts/X11/cyrillic"
FontPath "/usr/share/fonts/X11/100dpi/:unscaled"
FontPath "/usr/share/fonts/X11/75dpi/:unscaled"
FontPath "/usr/share/fonts/X11/Type1"
FontPath "/usr/share/fonts/X11/100dpi"
FontPath "/usr/share/fonts/X11/75dpi"
FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
EndSection

Section "Module"
Load  "extmod"
#Load  "dri"
Load  "dbe"
Load  "glx"
Load  "xtrap"
Load  "GLcore"
Load  "record"
EndSection

Section "InputDevice"
Identifier  "Keyboard0"
Driver  "kbd"
EndSection

Section "InputDevice"
Identifier  "Mouse0"
Driver  "mouse"
Option  "Protocol" "auto"
Option  "Device" "/dev/input/mice"
Option  "ZAxisMapping" "4 5 6 7"
EndSection

Section "InputDevice"
Identifier  "Touchpad"
Driver  "synaptics"
Option  "Device" "/dev/input/mice"
Option  "SHMConfig" "true"
EndSection

Section "Monitor"
#DisplaySize  340   270 # mm
Identifier   "Monitor0"
VendorName   "SAM"
ModelName"SyncMaster"
 ### Comment all HorizSync and VertRefresh values to use DDC:
HorizSync30.0 - 81.0
VertRefresh  56.0 - 75.0
Option  "DPMS"
EndSection

Section "Device"
### Available Driver options are:-
### Values: : integer, : float, : "True"/"False",
### : "String", : " Hz/kHz/MHz"
### [arg]: arg optional
#Option "NoAccel"   # []
#Option "SWcursor"  # []
#Option "ColorKey"  # 
#Option "CacheLines"# 
#Option "Dac6Bit"   # []
#Option "DRI"   # []
#Option "NoDDC" # []
#Option "ShowCache" # []
#Option "XvMCSurfaces"  # 
#Option "PageFlip"  # []
Option "PageFlip"   "false"
Identifier  "Card0"
Driver  "intel"
VendorName  "Intel Corporation"
BoardName   "Mobile 945GM/GMS, 943/940GML Express Integrated Graphics 
Controller"
BusID   "PCI:0:2:0"
EndSection

Section "Screen"
Identifier "Screen0"
Device "Card0"
Monitor"Monitor0"
DefaultDepth 16
SubSection "Display"
Virtual 2560 1024
EndSubSection
EndSection



Xorg X server log files on system:
-rw-r--r-- 1 root root 34062 2008-03-08 00:25 /var/log/Xorg.0.log

Contents of most recent Xorg X server log file
/var/log/Xorg.0.log:

This is a pre-release version of the X server from The X.Org Foundation.
It is not supported in any way.
Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.
Select the "xorg" product for bugs you find in this release.
Before reporting bugs in pre-release versions please check the
latest version in the X.Org Foundation git repository.
See http://wiki.x.org/wiki/GitPage for git access instructions.

X.Org X Server 1.4.0.90
Release Date: 5 September 2007
X Protocol Version 11, Revision 0
Build Operating System: Linux Debian (xorg-server 2:1.4.1~git20080131-1)
Current Operating System: Linux goldman 2.6.24 #1

Re: [ANNOUNCE] xcompmgr 1.1.4

[Julien Cristau]

On Thu, Mar  6, 2008 at 17:03:02 -0500, Adam Jackson wrote:

> git tag: xcompmgr-1.1.4
> 
> http://xorg.freedesktop.org/archive/individual/app/xcompmgr-1.1.4.tar.bz2
> MD5: 3eb1c2b7a6ceaec4ee872cb06d202d91  xcompmgr-1.1.4.tar.bz2
> SHA1: f9b0a46a719c69309208f4f970c598528aad9814  xcompmgr-1.1.4.tar.bz2
> 
> http://xorg.freedesktop.org/archive/individual/app/xcompmgr-1.1.4.tar.gz
> MD5: 82f800447b08b0fec6a59be41dec961a  xcompmgr-1.1.4.tar.gz
> SHA1: 948d6e4ea288e90896e176187ea66d0ae75e7a34  xcompmgr-1.1.4.tar.gz
> 
Hi Gustavo,

I notice that xcompmgr in Debian is only in experimental, and an old
version.  Do you plan to update it and get it into sid soon?

Thanks,
Julien


signature.asc
Description: Digital signature

xauth: Changes to 'debian-unstable'

[Julien Cristau]

 COPYING   |   25 +-
 ChangeLog |   40 +++
 INSTALL   |   53 ++---
 Makefile.am   |2 
 Makefile.in   |  207 +++-
 aclocal.m4|  200 ++-
 config.guess  |   36 ++-
 config.sub|   52 -
 configure |  173 +---
 configure.ac  |3 
 debian/changelog  |9 
 debian/control|8 
 debian/xsfbs/xsfbs.mk |  103 +-
 debian/xsfbs/xsfbs.sh |7 
 depcomp   |   93 +++--
 gethost.c |   10 
 install-sh|  514 ++
 missing   |   61 +++--
 process.c |3 
 19 files changed, 951 insertions(+), 648 deletions(-)

New commits:
commit 3c6c40b381617de2d812537327439bb738fc
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 18:30:21 2008 +0100

debian/control updates

Bump Standards-Version to 3.7.3
Drop XS- prefix from Vcs debian/control fields
Drop debian revisions from Build-Depends to please lintian

diff --git a/debian/changelog b/debian/changelog
index 5228587..30ea5dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 xauth (1:1.0.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.7.3
+  * Drop XS- prefix from Vcs debian/control fields
+  * Drop debian revisions from Build-Depends to please lintian
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 18:24:18 +0100
 
diff --git a/debian/control b/debian/control
index 91e3bb3..d952161 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-1), 
libxext-dev (>= 1:1.0.0-1), libxmuu-dev (>= 1:1.0.1-1)
-Standards-Version: 3.7.2.0
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xauth
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xauth.git
+Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0), 
libxext-dev (>= 1:1.0.0), libxmuu-dev (>= 1:1.0.1)
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xauth
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xauth.git
 
 Package: xauth
 Architecture: any

commit 65666a53dcb4a54e81901263b6592e983f9af242
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 18:24:58 2008 +0100

update changelogs

diff --git a/ChangeLog b/ChangeLog
index e1b4ea2..2a0ae74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+commit 85459f9fee2ad4d5954e8f549df9a269cf3bff76
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date:   Fri Mar 7 18:20:15 2008 +0100
+
+Change xauth_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+Makefile.am:27: compiling `gethost.c' with per-target flags requires 
`AM_PROG_CC_C_O' in `configure.ac'
+
+commit a9c0960c94b9299bcf2bb08c05a6f66579d4a862
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date:   Thu Mar 6 16:56:33 2008 -0500
+
+xauth 1.0.3
+
+commit 65a0917d4661e370b50beed8f06f5577bfeea59f
+Author: Jeremy Huddleston <[EMAIL PROTECTED]>
+Date:   Thu Jan 10 21:15:56 2008 -0800
+
+get_address_info: don't allow duplicate entries to be returned in the list
+OS-X's getaddrinfo() can return duplicate entries (and does for localhost 
with
+the default 10.5 /etc/hosts).  This caused some annoying crashes which this
+patch takes care of.
+
+See http://trac.macosforge.org/projects/xquartz/ticket/44
+
+commit 40e1769f4c631713c32c73a5244f3d65aea89ab7
+Author: Jeremy Huddleston <[EMAIL PROTECTED]>
+Date:   Sat Dec 1 20:01:23 2007 -0800
+
+Added support for launchd socket
+From Martin Costabel
+
+commit 60615bc52f685b7ddfd574e10ed8fdcf2b6e43f5
+Author: Daniel Drake <[EMAIL PROTECTED]>
+Date:   Wed May 16 14:24:00 2007 -0800
+
+Bug #10971: xauth COPYING file
+
+X.Org Bugzilla #10971 
+
 commit a1602ecd22a800a6c5348c00fece3287cdcf00ce
 Author: Alan Coopersmith <[EMAIL PROTECTED]>
 Date:   Tue Dec 12 15:00:29 2006 -0800
diff --git a/debian/changelog b/debian/changelog
index 9677192..5228587 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xauth (1:1.0.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 18:24:18 +0100
+
 xauth (1:1.0.2-2) unstable; urgency=low
 
   * Add upstream URL to debian/copyright.

commit 1f8102788b982f2df3955af1fd562009ed7003ca
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 18:23:55 2008 +0100

autoreconf

diff --git a/INSTALL b/INSTALL
index 23e5f25..d3c5b40 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *
 
-Copyright (C) 1994, 1995, 19

xauth: Changes to 'upstream-unstable'

[Julien Cristau]

 COPYING  |   25 +
 Makefile.am  |2 +-
 configure.ac |3 +--
 gethost.c|   10 +-
 process.c|3 +++
 5 files changed, 31 insertions(+), 12 deletions(-)

New commits:
commit 85459f9fee2ad4d5954e8f549df9a269cf3bff76
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 18:20:15 2008 +0100

Change xauth_CFLAGS to AM_CFLAGS to make automake-1.10 happier

Makefile.am:27: compiling `gethost.c' with per-target flags requires 
`AM_PROG_CC_C_O' in `configure.ac'

diff --git a/Makefile.am b/Makefile.am
index 948c2aa..24a12c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = xauth
 
-xauth_CFLAGS = $(XAUTH_CFLAGS)
+AM_CFLAGS = $(XAUTH_CFLAGS)
 xauth_LDADD = $(XAUTH_LIBS)
 
 xauth_SOURCES =\

commit a9c0960c94b9299bcf2bb08c05a6f66579d4a862
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Thu Mar 6 16:56:33 2008 -0500

xauth 1.0.3

diff --git a/configure.ac b/configure.ac
index fa1a83e..ffe378c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,3 @@
-
 dnl  Copyright 2005 Red Hat, Inc.
 dnl 
 dnl  Permission to use, copy, modify, distribute, and sell this software and 
its
@@ -22,7 +21,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xauth,[1.0.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
+AC_INIT(xauth,[1.0.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 65a0917d4661e370b50beed8f06f5577bfeea59f
Author: Jeremy Huddleston <[EMAIL PROTECTED]>
Date:   Thu Jan 10 21:15:56 2008 -0800

get_address_info: don't allow duplicate entries to be returned in the list
OS-X's getaddrinfo() can return duplicate entries (and does for localhost 
with
the default 10.5 /etc/hosts).  This caused some annoying crashes which this
patch takes care of.

See http://trac.macosforge.org/projects/xquartz/ticket/44

diff --git a/gethost.c b/gethost.c
index a0f30da..94c1d99 100644
--- a/gethost.c
+++ b/gethost.c
@@ -307,7 +307,15 @@ struct addrlist *get_address_info (
family = FamilyInternet6;
}
 
-   if (len > 0 && src != NULL) {
+   struct addrlist *duplicate;
+   for(duplicate = retval; duplicate != NULL; duplicate = 
duplicate->next) {
+   if(duplicate->family == family && duplicate->len == len &&
+   memcmp(duplicate->address, src, len) == 0) {
+   break;
+}
+   }
+
+   if (len > 0 && src != NULL && duplicate == NULL) {
struct addrlist *newrv = malloc (sizeof(struct addrlist));
if (newrv) {
newrv->address = malloc (len);

commit 40e1769f4c631713c32c73a5244f3d65aea89ab7
Author: Jeremy Huddleston <[EMAIL PROTECTED]>
Date:   Sat Dec 1 20:01:23 2007 -0800

Added support for launchd socket
From Martin Costabel

diff --git a/process.c b/process.c
index 4cb2b56..1e61d49 100644
--- a/process.c
+++ b/process.c
@@ -484,6 +484,9 @@ get_displayname_auth(char *displayname, AuthList **authl)
 cp = strchr(displayname, '/');
 if (cp && strncmp (cp, "/unix:", 6) == 0)
   prelen = (cp - displayname);
+
+if (strncmp (displayname, "/tmp/launch", 11) == 0)
+displayname = strrchr(displayname, '/') + 1;
 
 if (!parse_displayname (displayname + ((prelen > 0) ? prelen + 1 : 0),
&family, &host, &dpynum, &scrnum, &rest)) {

commit 60615bc52f685b7ddfd574e10ed8fdcf2b6e43f5
Author: Daniel Drake <[EMAIL PROTECTED]>
Date:   Wed May 16 14:24:00 2007 -0800

Bug #10971: xauth COPYING file

X.Org Bugzilla #10971 

diff --git a/COPYING b/COPYING
index 7f33cbf..0ad0f43 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,21 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 1989, 1993, 1998  The Open Group
 
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
 
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON

twm: Changes to 'upstream-unstable'

[Julien Cristau]

 .cvsignore  |   17 -
 .gitignore  |   18 +
 ChangeLog   |   73 
 Makefile.am |   10 +++
 configure.ac|5 +--
 man/.cvsignore  |3 --
 man/.gitignore  |3 ++
 src/.cvsignore  |8 --
 src/.gitignore  |8 ++
 src/Makefile.am |4 +--
 src/twm.h   |2 -
 11 files changed, 44 insertions(+), 107 deletions(-)

New commits:
commit 1fa03c39bddace4d787c55703f3081bcaf36511b
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Thu Mar 6 16:52:54 2008 -0500

twm 1.0.4

diff --git a/configure.ac b/configure.ac
index 455182d..7a514d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,3 @@
-
 dnl  Copyright 2005 Red Hat, Inc.
 dnl 
 dnl  Permission to use, copy, modify, distribute, and sell this software and 
its
@@ -22,7 +21,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(twm,[1.0.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],twm)
+AC_INIT(twm,[1.0.4], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],twm)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit d28dffd63bd5070445b15d1b9b70f3303ec5e333
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Thu Feb 21 08:16:39 2008 -0800

Change twm_CFLAGS to AM_CFLAGS to make automake-1.10 happier

src/Makefile.am:35: compiling `add_window.c' with per-target flags requires 
`AM_PROG_CC_C_O' in `configure.ac'

diff --git a/src/Makefile.am b/src/Makefile.am
index a5fe637..dc0fe72 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,8 +27,8 @@ bin_PROGRAMS = twm
 rcdir = ${datadir}/X11/twm
 dist_rc_DATA = system.twmrc
 
-twm_CFLAGS = $(TWM_CFLAGS) -DXVENDORNAME=\"The\ X.Org\ Foundation\" 
-DXORG_RELEASE=\"Release\ $(VERSION)\" -D_BSD_SOURCE
-twm_CFLAGS += -DSYSTEM_INIT_FILE=\"${datadir}/X11/twm/system.twmrc\"
+AM_CFLAGS = $(TWM_CFLAGS) -DXVENDORNAME=\"The\ X.Org\ Foundation\" 
-DXORG_RELEASE=\"Release\ $(VERSION)\" -D_BSD_SOURCE
+AM_CFLAGS += -DSYSTEM_INIT_FILE=\"${datadir}/X11/twm/system.twmrc\"
 
 twm_LDADD = $(TWM_LIBS)
 

commit ca9494bf50c9314597f4e88efa5bf5d66c1cd38f
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Thu Feb 21 08:14:01 2008 -0800

Explicitly require libSM & libICE since twm calls them directly

diff --git a/configure.ac b/configure.ac
index c7be74d..455182d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_CHECK_FUNC([mkstemp],
AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.]))
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(TWM, x11 xext xt xmu)
+PKG_CHECK_MODULES(TWM, x11 xext xt xmu ice sm)
 AC_SUBST(TWM_CFLAGS)
 AC_SUBST(TWM_LIBS)
 

commit f0543e7ff17f6e8aefbd6cc003d0679a706a8535
Author: James Cloos <[EMAIL PROTECTED]>
Date:   Thu Dec 6 16:37:07 2007 -0500

Replace static ChangeLog with dist-hook to generate from git log

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 5475530..000
--- a/ChangeLog
+++ /dev/null
@@ -1,73 +0,0 @@
-2006-06-03  Alan Coopersmith  <[EMAIL PROTECTED]>
-
-   * src/session.c (ReadWinConfigEntry): 
-   Coverity #369: If malloc of entry->wm_command fails, error cleanup
-   was still trying to read pointers from it to free.
-
-2006-06-02  Alan Coopersmith  <[EMAIL PROTECTED]>
-
-   * src/menus.c (ExecuteFunction): 
-   Coverity #1508: Variable "action" not freed or pointed-to
-
-2005-12-20  Kevin E. Martin  
-
-   * configure.ac:
-   Update package version for X11R7 release.
-
-2005-12-14  Kevin E. Martin  
-
-   * configure.ac:
-   Update package version number for final X11R7 release candidate.
-
-2005-12-06  Kevin E. Martin  
-
-   * man/Makefile.am:
-   Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03  Kevin E. Martin  
-
-   * configure.ac:
-   Update package version number for X11R7 RC3 release.
-
-2005-11-19  Kevin E. Martin  
-
-   * configure.ac:
-   Update dependencies to work with separate build roots.
-
-2005-10-18  Kevin E. Martin  
-
-   * configure.ac:
-   Update package version number for RC1 release.
-
-2005-10-16  Alan Coopersmith  <[EMAIL PROTECTED]>
-
-   * src/Makefile.am: 
-   Capitalize O in "X.Org Foundation"
-   
-   * configure.ac: 
-   * man/Makefile.am: 
-   Use cpp to substitute variables in man pages
-
-2005-10-15  Kevin E. Martin  
-
-   * src/Makefile.am: Have generated files be cleaned by maintainer
-   to pass check-tarball test.
-
-2005-10-09  Alan Coopersmith  <[EMAIL PROTECTED]>
-
-   * src/Makefile.am (deftwmrc.c): 
-   * src/deftwmrc.c:
-   * src/parse.c: 
-   * src/parse.h: 
-   Bug #3755 
-   twm can't handle 8-bit characters in .twmrc (Tomohiro KUBOITA)
-
-2005-08-02  Keith Packard  <[EMAIL PROTECTED]>
-
-   * src/Makefile.am:
-2005-08-02  Keith Packard  <[EMAIL PROTE

twm: Changes to 'debian-unstable'

[Julien Cristau]

 .cvsignore |   17 
 .gitignore |   18 +
 ChangeLog  |   73 
 Makefile.am|   10 
 Makefile.in|  154 +---
 aclocal.m4 |  200 ++-
 config.guess   |   36 +-
 config.sub |   52 ++
 configure  |  185 +-
 configure.ac   |5 
 debian/changelog   |7 
 debian/patches/01_debian_system_twmrc.diff |6 
 depcomp|   93 -
 install-sh |  514 -
 man/.cvsignore |3 
 man/.gitignore |3 
 man/Makefile.in|   77 ++--
 missing|   61 +--
 mkinstalldirs  |5 
 src/.cvsignore |8 
 src/.gitignore |8 
 src/Makefile.am|4 
 src/Makefile.in|  417 ---
 src/twm.h  |2 
 ylwrap |  223 
 25 files changed, 1248 insertions(+), 933 deletions(-)

New commits:
commit 4c83c09b4bb96108377f26d367860f364cfff86d
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 18:04:25 2008 +0100

autoreconf

diff --git a/Makefile.in b/Makefile.in
index d0fc552..05e2197 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,15 +34,11 @@
 #  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -56,18 +52,18 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
compile config.guess config.sub depcomp install-sh missing \
-   mkinstalldirs
-subdir = .
+   mkinstalldirs ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
@@ -75,10 +71,13 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
-   install-exec-recursive install-info-recursive \
-   install-recursive installcheck-recursive installdirs-recursive \
-   pdf-recursive ps-recursive uninstall-info-recursive \
-   uninstall-recursive
+   install-dvi-recursive install-exec-recursive \
+   install-html-recursive install-info-recursive \
+   install-pdf-recursive install-ps-recursive install-recursive \
+   installcheck-recursive installdirs-recursive pdf-recursive \
+   ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -96,8 +95,6 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -120,6 +117,7 @@ ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 FILE_MAN_DIR =

xfonts-utils: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog   |4 
 debian/control |4 
 debian/patches/001_mkfontdir_location_fix.diff |   13 
 debian/patches/series  |1 
 mkfontdir/COPYING  |   49 +-
 mkfontdir/ChangeLog|  217 +-
 mkfontdir/Makefile.am  |   16 
 mkfontdir/Makefile.in  |  135 --
 mkfontdir/aclocal.m4   |  183 
 mkfontdir/config.guess |   32 +
 mkfontdir/config.sub   |   52 ++
 mkfontdir/configure|  129 +++---
 mkfontdir/configure.ac |2 
 mkfontdir/install-sh   |  514 +
 mkfontdir/missing  |   61 +-
 mkfontdir/mkfontdir.man|   20 
 mkfontdir/mkinstalldirs|  158 ---
 17 files changed, 992 insertions(+), 598 deletions(-)

New commits:
commit 0aad0fe92cacab904817ec4ed28328db89796cc3
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 17:56:16 2008 +0100

debian/control updates

Bump Standards-Version to 3.7.3
Add Vcs-* fields

diff --git a/debian/changelog b/debian/changelog
index e9d973c..760eba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xfonts-utils (1:7.4+1) UNRELEASED; urgency=low
   * mkfontscale 1.0.4
   * mkfontdir 1.0.4
 + drop 001_mkfontdir_location_fix.diff, fixed upstream
+  * Bump Standards-Version to 3.7.3
+  * Add Vcs-* fields
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 17:41:15 +0100
 
diff --git a/debian/control b/debian/control
index 6ca7b36..5bfce49 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,9 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>
 Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, libxfont-dev (>= 
1:1.0.0), libx11-dev (>= 2:1.0.0)
-Standards-Version: 3.7.2.0
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-utils
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git
 
 Package: xfonts-utils
 Architecture: any

commit 7778c5a637cebeab4189119a22c1ebc835cd52cd
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 17:53:19 2008 +0100

mkfontdir 1.0.4

drop patch 001_mkfontdir_location_fix.diff, fixed upstream

diff --git a/debian/changelog b/debian/changelog
index 71190d4..e9d973c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xfonts-utils (1:7.4+1) UNRELEASED; urgency=low
 
   * Change versioning to more or less match X.Org katamaris
   * mkfontscale 1.0.4
+  * mkfontdir 1.0.4
++ drop 001_mkfontdir_location_fix.diff, fixed upstream
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 17:41:15 +0100
 
diff --git a/debian/patches/001_mkfontdir_location_fix.diff 
b/debian/patches/001_mkfontdir_location_fix.diff
deleted file mode 100644
index 5c8427f..000
--- a/debian/patches/001_mkfontdir_location_fix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xfonts-utils/mkfontdir/Makefile.am
-===
 xfonts-utils.orig/mkfontdir/Makefile.am2006-05-08 23:13:04.0 
-0400
-+++ xfonts-utils/mkfontdir/Makefile.am 2006-06-12 22:45:15.0 -0400
-@@ -24,7 +24,7 @@
- appman_PRE = mkfontdir.man
- 
- mkfontdir: mkfontdir.cpp
--  $(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < 
mkfontdir.cpp | $(SED) s/XCOMM/\#/ > $@
-+  $(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < 
${srcdir}/mkfontdir.cpp | $(SED) s/XCOMM/\#/ > $@
- 
- EXTRA_DIST = mkfontdir.cpp
- CLEANFILES = $(bin_SCRIPTS)
diff --git a/debian/patches/series b/debian/patches/series
index 4d4f0eb..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-001_mkfontdir_location_fix.diff
diff --git a/mkfontdir/COPYING b/mkfontdir/COPYING
index 7f33cbf..17251ea 100644
--- a/mkfontdir/COPYING
+++ b/mkfontdir/COPYING
@@ -1,12 +1,45 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 1993, 1994, 1998  The Open Group
 
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
 
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included
+in all copies or su

xfonts-utils: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|7 
 debian/xsfbs/xsfbs.mk   |   76 
 debian/xsfbs/xsfbs.sh   |7 
 mkfontscale/COPYING |   25 +
 mkfontscale/ChangeLog   |  272 +++--
 mkfontscale/Makefile.am |   10 
 mkfontscale/Makefile.in |  188 ++-
 mkfontscale/aclocal.m4  |  238 --
 mkfontscale/compile |   99 --
 mkfontscale/config.guess|  701 +---
 mkfontscale/config.h.in |9 
 mkfontscale/config.sub  |  278 +
 mkfontscale/configure   |  268 +---
 mkfontscale/configure.ac|4 
 mkfontscale/depcomp |  188 +--
 mkfontscale/hash.c  |   42 --
 mkfontscale/install-sh  |  659 +++--
 mkfontscale/missing |  193 +++-
 mkfontscale/mkfontscale.c   |4 
 mkfontscale/mkfontscale.man |   19 -
 mkfontscale/mkinstalldirs   |  111 --
 21 files changed, 2045 insertions(+), 1353 deletions(-)

New commits:
commit 0fee501d57ec3e2a2992f5aa6fd6e8c653cb2a43
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 17:43:01 2008 +0100

mkfontscale 1.0.4

diff --git a/debian/changelog b/debian/changelog
index d099cbd..71190d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfonts-utils (1:7.4+1) UNRELEASED; urgency=low
+
+  * Change versioning to more or less match X.Org katamaris
+  * mkfontscale 1.0.4
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 17:41:15 +0100
+
 xfonts-utils (1:1.0.1-2) unstable; urgency=low
 
   * update-fonts-{alias,dir,scale}: stop messing with X11R6 dirs
diff --git a/mkfontscale/COPYING b/mkfontscale/COPYING
index 7f33cbf..31965e8 100644
--- a/mkfontscale/COPYING
+++ b/mkfontscale/COPYING
@@ -1,12 +1,19 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 2002-2003 by Juliusz Chroboczek
 
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/mkfontscale/ChangeLog b/mkfontscale/ChangeLog
index 4498be4..c6f8dfb 100644
--- a/mkfontscale/ChangeLog
+++ b/mkfontscale/ChangeLog
@@ -1,31 +1,265 @@
-2005-12-20  Kevin E. Martin  
+commit 1cb9c0074c5075bbce63ff3601712f34bbb74ca1
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date:   Sun Feb 24 21:34:00 2008 -0500
 
-   * configure.ac:
-   Update package version for X11R7 release.
+Bug #11337: Use strcasecmp() instead of broken open-coded version.
+
+Also, use tolower() instead of broken open-coded version.
 
-2005-12-14  Kevin E. Martin  
+commit 11651914cb1700528524bd3aabe2372629ce86c8
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Mon Jan 7 14:28:30 2008 -0800
 
-   * configure.ac:
-   Update package version number for final X11R7 release candidate.
+Fix typo in man page
 
-2005-12-06  Kevin E. Martin  
+commit 963552c24bf90610f2b3e2e77277ad77e2b21210
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Mon Jan 7 14:26:56 2008 -0800
 
-   * Makefile.am:
-   Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+Convert (1) to (__appmansuffix__) in man page
 
-2005-12-03  Kevin E. Martin  
+commit 3e8bfcc4d87cd26b9426be1ab8941e1a8d709d3c
+Author: James Cloos <[EMAIL PROTECTED]>
+Date:   Thu Dec 6 16:37:03 2007 -0500
 
-   * configure.ac:
-   Update package version number for X11R7 RC3 release.
+Replace static ChangeLog with dist-hook to generate from git log
 
-2005-11-19  Kevin E. Martin  
+commit d59c58bc3e09fd4adf773cd2e0a8c8c0e6018b08
+Author: James Cloos <[EMAIL PROTECTED]>
+Date:   Mon Sep 3 05:51:05 2

Bug#462441: xserver-xorg-input-kbd: Stucked modifier keys. Was: alt key gets stuck

[Andrea Vettorello]

Package: xserver-xorg-input-kbd
Version: 1:1.2.2-3
Followup-For: Bug #462441

I can reliably lock any modifier key (Alt, Control, Super) using Sawfish "cycle 
windows" simply keeping the keys pressed until the autorepeat starts (Alt-Tab, 
Ctrl-Tab or any other combination I've tried). Seems similar to bug #374026. 
I've a confirmation from a another Lenny/Sid user and from a Fedora user ( 
https://bugzilla.redhat.com/show_bug.cgi?id=436084 ).

I wasn't able to find an older working xserver-xorg-input-kbd package, but if 
I'm not wrong, on Fedora this happens with evdev instead of kbd as in my case.


--
Andrea

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.24-1-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages xserver-xorg-input-kbd depends on:
ii  libc6  2.7-9 GNU C Library: Shared libraries
ii  xserver-xorg-core  2:1.4.1~git20080131-1 Xorg X server - core server

xserver-xorg-input-kbd recommends no packages.

-- no debconf information



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

libx11: Changes to 'upstream-experimental'

[Julien Cristau]

 configure.ac   |   20 
 man/XAddHost.man   |   14 
 man/XAllocSizeHints.man|   32 
 man/XAllocStandardColormap.man |4 
 man/XAllocWMHints.man  |   29 
 man/XAnyEvent.man  |8 
 man/XButtonEvent.man   |   78 
 man/XChangeKeyboardControl.man |   12 
 man/XChangeKeyboardMapping.man |4 
 man/XCirculateEvent.man|   10 
 man/XCirculateRequestEvent.man |   10 
 man/XClientMessageEvent.man|8 
 man/XColormapEvent.man |   12 
 man/XConfigureEvent.man|8 
 man/XConfigureRequestEvent.man |   10 
 man/XConfigureWindow.man   |4 
 man/XCreateColormap.man|6 
 man/XCreateGC.man  |   44 
 man/XCreateWindow.man  |   34 
 man/XCreateWindowEvent.man |   20 
 man/XCrossingEvent.man |   30 
 man/XDestroyWindowEvent.man|8 
 man/XDrawArc.man   |   25 
 man/XDrawText.man  |   16 
 man/XErrorEvent.man|   12 
 man/XExposeEvent.man   |   10 
 man/XFocusChangeEvent.man  |   14 
 man/XFontSetExtents.man|4 
 man/XGetVisualInfo.man |4 
 man/XGetWindowAttributes.man   |   42 
 man/XGraphicsExposeEvent.man   |   26 
 man/XGravityEvent.man  |8 
 man/XIfEvent.man   |2 
 man/XKeymapEvent.man   |   10 
 man/XLoadFont.man  |   93 
 man/XMapEvent.man  |   26 
 man/XMapRequestEvent.man   |8 
 man/XOpenIM.man|2 
 man/XPropertyEvent.man |   10 
 man/XQueryColor.man|   10 
 man/XQueryExtension.man|3 
 man/XReparentEvent.man |8 
 man/XResizeRequestEvent.man|8 
 man/XSelectionClearEvent.man   |8 
 man/XSelectionEvent.man|   10 
 man/XSelectionRequestEvent.man |8 
 man/XSetScreenSaver.man|2 
 man/XStringListToTextProperty.man  |8 
 man/XUnmapEvent.man|8 
 man/XVisibilityEvent.man   |8 
 man/XcmsCIELabQueryMaxC.man|2 
 man/XcmsCIELuvQueryMaxC.man|2 
 man/XcmsColor.man  |  132 
 man/XmbDrawText.man|   16 
 man/XmbTextListToTextProperty.man  |   18 
 man/XrmGetFileDatabase.man |   17 
 man/XrmInitialize.man  |   24 
 man/XrmUniqueQuark.man |   16 
 man/xkb/XkbGetKeyVirtualModMap.man |2 
 modules/im/ximcp/imDefIc.c |4 
 modules/im/ximcp/imDefLkup.c   |9 
 modules/im/ximcp/imTrX.c   |2 
 nls/Makefile.am|1 
 nls/am_ET.UTF-8/.gitignore |4 
 nls/am_ET.UTF-8/Compose.pre|  341 ++
 nls/am_ET.UTF-8/Makefile.am|3 
 nls/compose.dir.pre|9 
 nls/el_GR.UTF-8/Compose.pre|  437 +++
 nls/en_US.UTF-8/Compose.pre| 4938 -
 nls/iso8859-15/Compose.pre |4 
 nls/iso8859-3/Compose.pre  |4 
 nls/iso8859-9/Compose.pre  |4 
 nls/iso8859-9e/Compose.pre |4 
 nls/locale.alias.pre   |   30 
 nls/locale.dir.pre |   13 
 nls/pt_BR.UTF-8/Compose.pre|  400 +-
 src/ConnDis.c  |   12 
 src/CrCmap.c   |2 
 src/FreeCmap.c |3 
 src/GetColor.c |2 
 src/LookupCol.c|2 
 src/Makefile.am|   13 
 src/ParseCol.c |2 
 src/SetLocale.c|4 
 src/SetStCmap.c|3 
 src/StNColor.c |2 
 src/WMProps.c  |1 
 src/XErrorDB   |   26 
 src/XKeysymDB  |5 
 src/Xrm.c  |2 
 src/xcb_disp.c |   21 
 src/xcb_io.c   |8 
 src/xkb/XKBBind.c  |2 
 src/xlibi18n/XimintP.h |8 
 src/xlibi18n/XlcPubI.h |2 
 95 files changed, 4461 insertions(+), 2893 deletions(-)

New commits:
commit 5e98aed13e529638df744e45893c471d5f2014fb
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Thu Mar 6 16:10:33 2008 -0500

libX11 1.1.4

diff --git a/configure.ac b/configure.ac
index 7ab9b7f..1567a56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([libX11],
-1.1.3,
+1.1.4,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 libX11)
 AC_CONFIG_SRCDIR([Makefile.am])

commit 8e085971dc661da9f80ff6b67747459c0fb15c08
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Thu Feb 28 20:17:41 2008 -0800

Man page typo fixes

diff --git a/man/XOpenIM.man b/man/XOpenIM.man
index b89b0ff..56171bb 100644
--- a/man

libx11: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog   |  459 
 Makefile.in |   53 
 aclocal.m4  |  265 
 config.guess|   36 
 config.sub  |   52 
 configure   |  913 +
 configure.ac|   20 
 debian/changelog|   22 
 debian/patches/003_recognize_glibc_2.3.2_locale_names.diff  |  324 
 debian/patches/004_en_US.UTF-8_Compose_fix_Unicode_plane_1.diff |   70 
 debian/patches/005_Compose_fix_latin1_UTF8.diff |  447 
 debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff  |  404 
 debian/patches/007_iso8859-15_Compose_fix.diff  |   32 
 debian/patches/008_remove_ko_Compose.diff   |8 
 debian/patches/009_iso8859-15_Compose_Eurosign.diff |   17 
 debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff  |   48 
 debian/patches/014_add_Khmer_digraphs.diff  |   14 
 debian/patches/015_russian_locale_alias.diff|8 
 debian/patches/016_fedora_xim_hang.diff |   66 
 debian/patches/series   |4 
 debian/xsfbs/xsfbs.mk   |   76 
 debian/xsfbs/xsfbs.sh   |7 
 depcomp |   33 
 include/Makefile.in |   21 
 install-sh  |  228 
 ltmain.sh   |   58 
 man/Makefile.in |   21 
 man/XAddHost.man|   14 
 man/XAllocSizeHints.man |   32 
 man/XAllocStandardColormap.man  |4 
 man/XAllocWMHints.man   |   29 
 man/XAnyEvent.man   |8 
 man/XButtonEvent.man|   78 
 man/XChangeKeyboardControl.man  |   12 
 man/XChangeKeyboardMapping.man  |4 
 man/XCirculateEvent.man |   10 
 man/XCirculateRequestEvent.man  |   10 
 man/XClientMessageEvent.man |8 
 man/XColormapEvent.man  |   12 
 man/XConfigureEvent.man |8 
 man/XConfigureRequestEvent.man  |   10 
 man/XConfigureWindow.man|4 
 man/XCreateColormap.man |6 
 man/XCreateGC.man   |   44 
 man/XCreateWindow.man   |   34 
 man/XCreateWindowEvent.man  |   20 
 man/XCrossingEvent.man  |   30 
 man/XDestroyWindowEvent.man |8 
 man/XDrawArc.man|   25 
 man/XDrawText.man   |   16 
 man/XErrorEvent.man |   12 
 man/XExposeEvent.man|   10 
 man/XFocusChangeEvent.man   |   14 
 man/XFontSetExtents.man |4 
 man/XGetVisualInfo.man  |4 
 man/XGetWindowAttributes.man|   42 
 man/XGraphicsExposeEvent.man|   26 
 man/XGravityEvent.man   |8 
 man/XIfEvent.man|2 
 man/XKeymapEvent.man|   10 
 man/XLoadFont.man   |   93 
 man/XMapEvent.man   |   26 
 man/XMapRequestEvent.man|8 
 man/XOpenIM.man |2 
 man/XPropertyEvent.man  |   10 
 man/XQueryColor.man |   10 
 man/XQueryExtension.man |3 
 man/XReparentEvent.man  |8 
 man/XResizeRequestEvent.man  

libpciaccess_0.10-1_i386.changes ACCEPTED

[Debian Installer]

Accepted:
libpciaccess-dev_0.10-1_i386.deb
  to pool/main/libp/libpciaccess/libpciaccess-dev_0.10-1_i386.deb
libpciaccess0_0.10-1_i386.deb
  to pool/main/libp/libpciaccess/libpciaccess0_0.10-1_i386.deb
libpciaccess_0.10-1.diff.gz
  to pool/main/libp/libpciaccess/libpciaccess_0.10-1.diff.gz
libpciaccess_0.10-1.dsc
  to pool/main/libp/libpciaccess/libpciaccess_0.10-1.dsc
libpciaccess_0.10.orig.tar.gz
  to pool/main/libp/libpciaccess/libpciaccess_0.10.orig.tar.gz


Override entries for your package:
libpciaccess-dev_0.10-1_i386.deb - optional libdevel
libpciaccess0_0.10-1_i386.deb - optional libs
libpciaccess_0.10-1.dsc - source devel

Announcing to [EMAIL PROTECTED]


Thank you for your contribution to Debian.


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

libxinerama_1.0.3-1_i386.changes ACCEPTED

[Debian Installer]

Accepted:
libxinerama-dev_1.0.3-1_i386.deb
  to pool/main/libx/libxinerama/libxinerama-dev_1.0.3-1_i386.deb
libxinerama1-dbg_1.0.3-1_i386.deb
  to pool/main/libx/libxinerama/libxinerama1-dbg_1.0.3-1_i386.deb
libxinerama1_1.0.3-1_i386.deb
  to pool/main/libx/libxinerama/libxinerama1_1.0.3-1_i386.deb
libxinerama_1.0.3-1.diff.gz
  to pool/main/libx/libxinerama/libxinerama_1.0.3-1.diff.gz
libxinerama_1.0.3-1.dsc
  to pool/main/libx/libxinerama/libxinerama_1.0.3-1.dsc
libxinerama_1.0.3.orig.tar.gz
  to pool/main/libx/libxinerama/libxinerama_1.0.3.orig.tar.gz


Override entries for your package:
libxinerama-dev_1.0.3-1_i386.deb - optional libdevel
libxinerama1-dbg_1.0.3-1_i386.deb - extra libdevel
libxinerama1_1.0.3-1_i386.deb - optional libs
libxinerama_1.0.3-1.dsc - source x11

Announcing to [EMAIL PROTECTED]


Thank you for your contribution to Debian.


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

Processing of libxinerama_1.0.3-1_i386.changes

[Archive Administrator]

libxinerama_1.0.3-1_i386.changes uploaded successfully to localhost
along with the files:
  libxinerama_1.0.3-1.dsc
  libxinerama_1.0.3.orig.tar.gz
  libxinerama_1.0.3-1.diff.gz
  libxinerama1_1.0.3-1_i386.deb
  libxinerama1-dbg_1.0.3-1_i386.deb
  libxinerama-dev_1.0.3-1_i386.deb

Greetings,

Your Debian queue daemon


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

x11proto-core: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |6 ++
 debian/control   |1 +
 2 files changed, 7 insertions(+)

New commits:
commit 51227c9949726d5f68a3f2a002c03f9766629efb
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 15:13:32 2008 +0100

debian/control: x-dev is in Section: libdevel, not x11.

Maybe x-dev should actually be removed instead...

diff --git a/debian/changelog b/debian/changelog
index 70ad05f..aef1170 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-core (7.0.12-2) UNRELEASED; urgency=low
+
+  * debian/control: x-dev is in Section: libdevel, not x11.
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 15:12:44 +0100
+
 x11proto-core (7.0.12-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 08e9287..e5b9c89 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Description: X11 core wire protocol and auxiliary headers
  This package is built from the X.org xproto proto module.
 
 Package: x-dev
+Section: libdevel
 Architecture: all
 Depends: x11proto-core-dev
 Description: dummy package for transition purposes


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

Processed: bug 329901 is forwarded to https://bugs.freedesktop.org/show_bug.cgi?id=3040

[Debian Bug Tracking System]

Processing commands for [EMAIL PROTECTED]:

> # Automatically generated email from bts, devscripts version 2.10.18.1
> forwarded 329901 https://bugs.freedesktop.org/show_bug.cgi?id=3040
Bug#329901: xterm freezes when starting mc
Noted your statement that Bug has been forwarded to 
https://bugs.freedesktop.org/show_bug.cgi?id=3040.

>
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]

libxinerama: Changes to 'debian-unstable'

[Julien Cristau]

 ChangeLog |   29 
 INSTALL   |   53 -
 Makefile.am   |2 
 Makefile.in   |  160 ++--
 aclocal.m4|  927 
 config.guess  |   60 +
 config.h.in   |9 
 config.sub|   66 +
 configure | 1857 ++
 configure.ac  |2 
 debian/changelog  |   14 
 debian/control|   14 
 debian/xsfbs/xsfbs.mk |  110 --
 debian/xsfbs/xsfbs.sh |7 
 depcomp   |   93 ++
 install-sh|  514 +
 ltmain.sh |  277 ---
 man/Makefile.in   |   87 +-
 man/Xinerama.man  |2 
 missing   |   61 -
 mkinstalldirs |5 
 src/Makefile.in   |  144 ++-
 src/Xinerama.c|5 
 23 files changed, 2969 insertions(+), 1529 deletions(-)

New commits:
commit d1597aecd360c88ae82dc7eba0e9a122b4fcae0c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 15:06:42 2008 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 45e27be..d50bfa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxinerama (2:1.0.3-1) UNRELEASED; urgency=low
+libxinerama (2:1.0.3-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * Bump the epoch so that this can be synced to Ubuntu in the future.
@@ -12,7 +12,7 @@ libxinerama (2:1.0.3-1) UNRELEASED; urgency=low
 + drop -1 revisions from build-depends to please lintian
 + use ${binary:Version} instead of ${Source-Version}
 
- -- Timo Aaltonen <[EMAIL PROTECTED]>  Fri,  4 May 2007 23:43:59 +0300
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 15:06:39 +0100
 
 libxinerama (1:1.0.2-1) unstable; urgency=low
 

commit 12cd52e1260217664e1cdc7511b3e1ff0db83900
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 15:04:36 2008 +0100

More debian/control updates

drop -1 revisions from build-depends to please lintian
use ${binary:Version} instead of ${Source-Version}

diff --git a/debian/changelog b/debian/changelog
index acae358..45e27be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ libxinerama (2:1.0.3-1) UNRELEASED; urgency=low
 + add myself to Uploaders, remove Fabio and Branden with their permission
 + bump Standards-Version to 3.7.3
 + drop the XS- prefix from Vcs fields
++ drop -1 revisions from build-depends to please lintian
++ use ${binary:Version} instead of ${Source-Version}
 
  -- Timo Aaltonen <[EMAIL PROTECTED]>  Fri,  4 May 2007 23:43:59 +0300
 
diff --git a/debian/control b/debian/control
index c9fe939..0f487a5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libx11-dev (>= 1:0.99.2-1), libxext-dev 
(>= 1:0.99.1-1), x11proto-xinerama-dev, pkg-config
+Build-Depends: debhelper (>= 4.0.0), libx11-dev (>= 1:0.99.2), libxext-dev (>= 
1:0.99.1), x11proto-xinerama-dev, pkg-config
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxinerama
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxinerama.git
@@ -28,7 +28,7 @@ Package: libxinerama1-dbg
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxinerama1 (= 
${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxinerama1 (= 
${binary:Version})
 Description: X11 Xinerama extension library (debug package)
  libXinerama provides an X Window System client interface to the XINERAMA
  extension to the X protocol.
@@ -47,7 +47,7 @@ Description: X11 Xinerama extension library (debug package)
 Package: libxinerama-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxinerama1 (= 
${Source-Version}), libx11-dev, libxext-dev, x11proto-xinerama-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxinerama1 (= 
${binary:Version}), libx11-dev, libxext-dev, x11proto-xinerama-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X11 Xinerama extension library (development headers)
  libXinerama provides an X Window System client interface to the XINERAMA

commit ec31254a80ce544d71d7248e90049f5b498b61e3
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 14:57:13 2008 +0100

debian/control updates

add myself to Uploaders, remove Fabio and Branden with their permission
bump Standards-Version to 3.7.3
drop the XS- prefix from Vcs fields

diff --git a/debian/changelog b/debian/changelog
index 1ea5de3..acae358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ libxinerama (2:1.0.3-1) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * New upstream release.
+  * debian/control updates:
++ add myself to Uploaders, remove Fabio and Branden with their permission

libxinerama: Changes to 'refs/tags/libxinerama-2_1.0.3-1'

[Julien Cristau]

Tag 'libxinerama-2_1.0.3-1' created by Julien Cristau <[EMAIL PROTECTED]> at 
2008-03-07 14:07 +

Tagging upload of libxinerama 2:1.0.3-1 to unstable.

Changes since libxinerama-1_1.0.2-1:
Adam Jackson (2):
  Bug #13660: XineramaQueryScreens() always modifies the 'number' 
outparameter.
  libXinerama 1.0.3

Branden Robinson (1):
  Test for existence of debian/patches directory before creating a symlink 
to it.

Brice Goglin (5):
  Fix displaying of patches applied by quilt.
  Minor fixes in the patching system.
  Fix "display the output of quilt push/pop".
  Fix typo in Xinerama.man
  Do not call laptop-detect, let the only user call it directly

David Nusinow (2):
  Remove make-orig-tar-gz target
  Kill the manifest code.

James Cloos (1):
  Add missing PHONY line for automatic ChangeLog generation

Julien Cristau (7):
  Merge tag 'libXinerama-1.0.3' of 
git.freedesktop.org:/git/xorg/lib/libXinerama into debian-unstable
  Merge git.debian.org:/git/pkg-xorg/xsfbs into debian-unstable
  autoreconf
  update changelogs for new release
  debian/control updates
  More debian/control updates
  Prepare changelog for upload

Timo Aaltonen (1):
  Bump the epoch so that this can be synced to Ubuntu in the future.

---
 ChangeLog |   29 
 INSTALL   |   53 -
 Makefile.am   |2 
 Makefile.in   |  160 ++--
 aclocal.m4|  927 
 config.guess  |   60 +
 config.h.in   |9 
 config.sub|   66 +
 configure | 1857 ++
 configure.ac  |2 
 debian/changelog  |   16 
 debian/control|   14 
 debian/xsfbs/xsfbs.mk |  110 --
 debian/xsfbs/xsfbs.sh |7 
 depcomp   |   93 ++
 install-sh|  514 +
 ltmain.sh |  277 ---
 man/Makefile.in   |   87 +-
 man/Xinerama.man  |2 
 missing   |   61 -
 mkinstalldirs |5 
 src/Makefile.in   |  144 ++-
 src/Xinerama.c|5 
 23 files changed, 2973 insertions(+), 1527 deletions(-)
---


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

libxinerama: Changes to 'upstream-unstable'

[Julien Cristau]

 Makefile.am  |2 ++
 configure.ac |2 +-
 man/Xinerama.man |2 +-
 src/Xinerama.c   |5 ++---
 4 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit cbfc4113a44053c2dfacd14475ff14f43817f3c1
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Thu Mar 6 15:42:56 2008 -0500

libXinerama 1.0.3

diff --git a/configure.ac b/configure.ac
index c1c9844..8fc368c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
 
-AC_INIT(libXinerama, 1.0.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama)
+AC_INIT(libXinerama, 1.0.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 7c169beed2d8324c95385d248777f21c721b332e
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Sun Feb 24 20:30:03 2008 -0500

Bug #13660: XineramaQueryScreens() always modifies the 'number' 
outparameter.

This makes the code match the man page.

diff --git a/src/Xinerama.c b/src/Xinerama.c
index fa2b197..eff7633 100644
--- a/src/Xinerama.c
+++ b/src/Xinerama.c
@@ -307,12 +307,11 @@ XineramaQueryScreens(
*number = rep.number;
} else
_XEatData(dpy, rep.length << 2);
+} else {
+   *number = 0;
 }
 
 UnlockDisplay (dpy);
 SyncHandle ();
 return scrnInfo;
 }
-
-
-

commit 52040eaaba626dd998f7a5421a923de0b0e06ad2
Author: James Cloos <[EMAIL PROTECTED]>
Date:   Thu Dec 6 15:51:17 2007 -0500

Add missing PHONY line for automatic ChangeLog generation

diff --git a/Makefile.am b/Makefile.am
index 7642d24..e02c660 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,8 @@ pkgconfig_DATA = xinerama.pc
 EXTRA_DIST = xinerama.pc.in autogen.sh ChangeLog
 MAINTAINERCLEANFILES = ChangeLog
 
+.PHONY: ChangeLog
+
 ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv 
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git 
directory not found: installing possibly empty changelog.' >&2)
 

commit 5362a27db8fddfb03ade3b2c622a2256d91de9eb
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Wed Jul 25 21:41:28 2007 +0200

Fix typo in Xinerama.man

Reported by Emanuele Rocca <[EMAIL PROTECTED]> in
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432256

diff --git a/man/Xinerama.man b/man/Xinerama.man
index d6b5be7..bec9f80 100644
--- a/man/Xinerama.man
+++ b/man/Xinerama.man
@@ -103,7 +103,7 @@ incompatible, it returns zero.
 .SS \fBXineramaIsActive()\fR
 
 .LP
-The XineramaActive function returns a Boolean operator used to determine if 
+The XineramaIsActive function returns a Boolean operator used to determine if 
 Xinerama is activated on the screen. Returns True for active and False for 
 not active.
 .sp


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

Processing of libpciaccess_0.10-1_i386.changes

[Archive Administrator]

libpciaccess_0.10-1_i386.changes uploaded successfully to localhost
along with the files:
  libpciaccess_0.10-1.dsc
  libpciaccess_0.10.orig.tar.gz
  libpciaccess_0.10-1.diff.gz
  libpciaccess0_0.10-1_i386.deb
  libpciaccess-dev_0.10-1_i386.deb

Greetings,

Your Debian queue daemon


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

libpciaccess: Changes to 'debian-unstable'

[Julien Cristau]

 ChangeLog|  516 +++
 aclocal.m4   |4 
 configure|   24 +-
 configure.ac |3 
 debian/changelog |7 
 debian/rules |2 
 src/common_capability.c  |2 
 src/common_device_name.c |5 
 src/common_init.c|2 
 src/common_map.c |2 
 src/freebsd_pci.c|2 
 src/linux_devmem.c   |3 
 src/linux_sysfs.c|2 
 src/pciaccess_private.h  |7 
 14 files changed, 556 insertions(+), 25 deletions(-)

New commits:
commit e5114d5de66eeae3c188f406e7e6da36e57fc6a4
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 14:44:43 2008 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 60e59a6..bc28582 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libpciaccess (0.10-1) UNRELEASED; urgency=low
+libpciaccess (0.10-1) unstable; urgency=low
 
   * New upstream release.
   * Install the upstream changelog.
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 14:33:19 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 14:43:39 +0100
 
 libpciaccess (0.9.1+git20080219-1) unstable; urgency=low
 

commit 781fba56e1009021fc99dfc182faf625bf2707b2
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 14:35:18 2008 +0100

Update debian/changelog, add and install the upstream ChangeLog

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000..28340f8
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,516 @@
+commit ac119e0b1d5fdbb6bd447b6cef1ddca59840fe40
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date:   Thu Mar 6 15:31:51 2008 -0500
+
+libpciaccess 0.10
+
+commit 0ac748d0da1361075efa48a6238f2328d24ba1a8
+Author: Doug Chapman <[EMAIL PROTECTED]>
+Date:   Thu Mar 6 14:22:17 2008 -0500
+
+Bug #14818: Actually return the PCI vendor name, instead of NULL.
+
+commit adc46f65d7a097ea0e8427a2496586a420c99d55
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date:   Tue Feb 19 14:45:40 2008 +0100
+
+Don't export private symbols.
+
+commit 25de45d250811474e86cb9a09caf258aef699196
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date:   Tue Feb 19 14:26:54 2008 +0100
+
+Use  when using glibc, not just on linux
+
+This fixes the build on GNU/kFreeBSD.
+
+commit ceda00d33fbf3d491e3f7e53302acd2b8b74a305
+Author: James Cloos <[EMAIL PROTECTED]>
+Date:   Thu Dec 6 16:38:51 2007 -0500
+
+Replace static ChangeLog with dist-hook to generate from git log
+
+commit e392082abb5696c8837224da86cc0af4f21d7010
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date:   Tue Oct 23 15:19:36 2007 +0200
+
+Bit-fields have to have type _Bool, signed int, or unsigned int.
+
+ISO/IEC 9899:1999 (E), 6.7.2.1 Structure and union specifiers, (4).
+_Bool is only supported for C99 and up, and 1-bit signed types don't make
+sense -> unsigned int.
+
+commit 5b9ca552a17de37bbac84f0cf5b4430d108e576c
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date:   Thu Oct 18 15:59:14 2007 -0700
+
+Update bug reporting link.
+
+commit 57a942b3cca314a56735e0a4198cac2f25b653dd
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date:   Wed Oct 10 15:20:51 2007 -0700
+
+FreeBSD: for 64-bit BARs, skip the resource slot used for the upper 32 
bits.
+
+This gets us the same resource numbering as on Linux.
+
+commit 127ae628a2090bb00df81adce831b8b031d3b4a8
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date:   Wed Oct 10 14:55:45 2007 -0700
+
+FreeBSD: Don't try to unset an MTRR if we didn't set it.
+
+commit 28fea32f987a74d365d01bc5870a8bce1c393d59
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date:   Wed Oct 10 14:32:38 2007 -0700
+
+Add domain output to scanpci.
+
+commit 393145db90578d7d598fccf949b249217066a67c
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date:   Wed Oct 10 14:32:09 2007 -0700
+
+FreeBSD: Add support for multiple PCI domains.
+
+commit 7d809e149b59f22e24723db7360a4c38a9145b45
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date:   Tue Oct 9 12:13:49 2007 -0700
+
+FreeBSD: Fix unmap_range to return an error value.
+
+commit 042735df2aa5846fcabfd74c5f73877132728b25
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date:   Tue Oct 9 12:12:34 2007 -0700
+
+FreeBSD: don't set the MTRR if it's the default mode (uncacheable).
+
+commit 4bdaca5295eeacdaeb80f2e7d0fa17674dcbc77a
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Thu Sep 27 15:22:51 2007 -0700
+
+Need to link with -ldevinfo on Solaris
+
+commit 63983e2397d813246b851771c13397ff700e239e
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Wed Sep 26 17:26:47 2007 -0700
+
+Fix Solaris build: missing static prototype & typo in variable name
+
+commit 8c77862e70eac7f61cd402e9ef33a5b0ca1c6426
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date:   Tue Sep 11 15:07:55 2007 +
+
+Add FreeBSD MTRR setting support.
+
+commit 82a2ff0bb091e097bacb66273f55a287afb15abf
+Author: Ian Romanick <[EMAIL PRO

libpciaccess: Changes to 'refs/tags/libpciaccess-0.10-1'

[Julien Cristau]

Tag 'libpciaccess-0.10-1' created by Julien Cristau <[EMAIL PROTECTED]> at 
2008-03-07 13:45 +

Tagging upload of libpciaccess 0.10-1 to unstable.

Changes since libpciaccess-0.9.1+git20080219-1:
Adam Jackson (1):
  libpciaccess 0.10

Doug Chapman (1):
  Bug #14818: Actually return the PCI vendor name, instead of NULL.

Julien Cristau (6):
  Use  when using glibc, not just on linux
  Don't export private symbols.
  Merge tag 'libpciaccess-0.10' of 
git.freedesktop.org:/git/xorg/lib/libpciaccess into debian-unstable
  autoreconf
  Update debian/changelog, add and install the upstream ChangeLog
  Prepare changelog for upload

---
 ChangeLog|  516 +++
 aclocal.m4   |4 
 configure|   24 +-
 configure.ac |3 
 debian/changelog |7 
 debian/rules |2 
 src/common_capability.c  |2 
 src/common_device_name.c |5 
 src/common_init.c|2 
 src/common_map.c |2 
 src/freebsd_pci.c|2 
 src/linux_devmem.c   |3 
 src/linux_sysfs.c|2 
 src/pciaccess_private.h  |7 
 14 files changed, 556 insertions(+), 25 deletions(-)
---


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

libpciaccess: Changes to 'upstream-unstable'

[Julien Cristau]

 configure.ac |3 +--
 src/common_capability.c  |2 +-
 src/common_device_name.c |5 +++--
 src/common_init.c|2 +-
 src/common_interface.c   |2 +-
 src/common_map.c |2 +-
 src/freebsd_pci.c|2 +-
 src/linux_devmem.c   |3 ++-
 src/linux_sysfs.c|2 +-
 src/pciaccess_private.h  |7 +++
 10 files changed, 19 insertions(+), 11 deletions(-)

New commits:
commit ac119e0b1d5fdbb6bd447b6cef1ddca59840fe40
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Thu Mar 6 15:31:51 2008 -0500

libpciaccess 0.10

diff --git a/configure.ac b/configure.ac
index 8e53427..8f4e55d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,3 @@
-
 dnl (C) Copyright IBM Corporation 2006
 dnl All Rights Reserved.
 dnl
@@ -41,7 +40,7 @@ dnl refers to ${prefix}.  Thus we have to use `eval' twice.
 
 AC_PREREQ([2.57])
 
-AC_INIT(libpciaccess, 0.10.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess],
 libpciaccess)
+AC_INIT(libpciaccess, 0.10, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess],
 libpciaccess)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 0ac748d0da1361075efa48a6238f2328d24ba1a8
Author: Doug Chapman <[EMAIL PROTECTED]>
Date:   Thu Mar 6 14:22:17 2008 -0500

Bug #14818: Actually return the PCI vendor name, instead of NULL.

diff --git a/src/common_device_name.c b/src/common_device_name.c
index 66c2104..b105187 100644
--- a/src/common_device_name.c
+++ b/src/common_device_name.c
@@ -228,7 +228,7 @@ populate_vendor( struct pci_id_leaf * vend, int 
fill_device_data )
/* vendor_name may already be set from a previous invocation
 * of this function with fill_device_data = 0.
 */
-   if (vend->vendor_name != NULL) {
+   if (vend->vendor_name == NULL) {
vend->vendor_name = strdup( & buf[ num_tabs + 6 ] );
}
 

commit adc46f65d7a097ea0e8427a2496586a420c99d55
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Tue Feb 19 14:45:40 2008 +0100

Don't export private symbols.

diff --git a/src/common_capability.c b/src/common_capability.c
index 48f6ed4..31d59eb 100644
--- a/src/common_capability.c
+++ b/src/common_capability.c
@@ -59,7 +59,7 @@
  * later to try again for the second capability.  This could lead to memory
  * leaks or other quirky behavior.
  */
-int
+_pci_hidden int
 pci_fill_capabilities_generic( struct pci_device * dev )
 {
 struct pci_device_private * const dev_priv =
diff --git a/src/common_device_name.c b/src/common_device_name.c
index 12f88f5..66c2104 100644
--- a/src/common_device_name.c
+++ b/src/common_device_name.c
@@ -46,6 +46,7 @@
 #endif
 
 #include "pciaccess.h"
+#include "pciaccess_private.h"
 
 #define DO_MATCH(a,b)  (((a) == PCI_MATCH_ANY) || ((a) == (b)))
 
@@ -92,7 +93,7 @@ struct pci_device_leaf {
 /**
  * Root of the PCI vendor ID search tree.
  */
-struct pci_id_node * tree = NULL;
+_pci_hidden struct pci_id_node * tree = NULL;
 
 /**
  * Name of the file containing the PCI ID information.
diff --git a/src/common_init.c b/src/common_init.c
index 94048ea..1092faf 100644
--- a/src/common_init.c
+++ b/src/common_init.c
@@ -35,7 +35,7 @@
 #include "pciaccess.h"
 #include "pciaccess_private.h"
 
-struct pci_system * pci_sys;
+_pci_hidden struct pci_system * pci_sys;
 
 /**
  * Initialize the PCI subsystem for access.
diff --git a/src/common_map.c b/src/common_map.c
index a64577b..ac1c668 100644
--- a/src/common_map.c
+++ b/src/common_map.c
@@ -46,7 +46,7 @@
  *
  * \sa pci_device_unmap_range
  */
-int
+_pci_hidden int
 pci_device_generic_unmap_range(struct pci_device *dev,
   struct pci_device_mapping *map)
 {
diff --git a/src/freebsd_pci.c b/src/freebsd_pci.c
index 0c7cf61..67ca9e3 100644
--- a/src/freebsd_pci.c
+++ b/src/freebsd_pci.c
@@ -439,7 +439,7 @@ static const struct pci_system_methods freebsd_pci_methods 
= {
 /**
  * Attempt to access the FreeBSD PCI interface.
  */
-int
+_pci_hidden int
 pci_system_freebsd_create( void )
 {
 struct pci_conf_io pciconfio;
diff --git a/src/linux_devmem.c b/src/linux_devmem.c
index 8650efd..a68ea11 100644
--- a/src/linux_devmem.c
+++ b/src/linux_devmem.c
@@ -61,7 +61,8 @@
  * Before using the VGA special case code, this function should check that
  * VGA access are routed to the device.  Right?
  */
-int pci_device_linux_devmem_read_rom(struct pci_device *dev, void *buffer)
+_pci_hidden int
+pci_device_linux_devmem_read_rom(struct pci_device *dev, void *buffer)
 {
 struct pci_device_private *priv = (struct pci_device_private *) dev;
 int fd;
diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
index 3671f28..84cdb84 100644
--- a/src/linux_sysfs.c
+++ b/src/linux_sysfs.c
@@ -96,7 +96,7 @@ static int populate_entries(struct pci_system * pci_sys);
 /**
  * Attempt to access PCI subsystem using Linux's sysfs interface.
  */
-int
+_pci_hidden int
 pc

x11proto-core override disparity

[Debian Installer]

There are disparities between your recently accepted upload and the
override file for the following file(s):

x-dev_7.0.12-1_all.deb: package says section is x11, override says libdevel.

Either the package or the override file is incorrect.  If you think
the override is correct and the package wrong please fix the package
so that this disparity is fixed in the next upload.  If you feel the
override is incorrect then please reply to this mail and explain why.

[NB: this is an automatically generated mail; if you replied to one
like it before and have not received a response yet, please ignore
this mail.  Your reply needs to be processed by a human and will be in
due course, but until then the installer will send these automated
mails; sorry.]

--
Debian distribution maintenance software

(This message was generated automatically; if you believe that there
is a problem with it please contact the archive administrators by
mailing [EMAIL PROTECTED])


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

x11proto-core_7.0.12-1_i386.changes ACCEPTED

[Debian Installer]

Accepted:
x-dev_7.0.12-1_all.deb
  to pool/main/x/x11proto-core/x-dev_7.0.12-1_all.deb
x11proto-core-dev_7.0.12-1_all.deb
  to pool/main/x/x11proto-core/x11proto-core-dev_7.0.12-1_all.deb
x11proto-core_7.0.12-1.diff.gz
  to pool/main/x/x11proto-core/x11proto-core_7.0.12-1.diff.gz
x11proto-core_7.0.12-1.dsc
  to pool/main/x/x11proto-core/x11proto-core_7.0.12-1.dsc
x11proto-core_7.0.12.orig.tar.gz
  to pool/main/x/x11proto-core/x11proto-core_7.0.12.orig.tar.gz


Override entries for your package:
x-dev_7.0.12-1_all.deb - optional libdevel
x11proto-core-dev_7.0.12-1_all.deb - optional x11
x11proto-core_7.0.12-1.dsc - source x11

Announcing to [EMAIL PROTECTED]


Thank you for your contribution to Debian.


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

x11proto-input_1.4.3-1_i386.changes ACCEPTED

[Debian Installer]

Accepted:
x11proto-input-dev_1.4.3-1_all.deb
  to pool/main/x/x11proto-input/x11proto-input-dev_1.4.3-1_all.deb
x11proto-input_1.4.3-1.diff.gz
  to pool/main/x/x11proto-input/x11proto-input_1.4.3-1.diff.gz
x11proto-input_1.4.3-1.dsc
  to pool/main/x/x11proto-input/x11proto-input_1.4.3-1.dsc
x11proto-input_1.4.3.orig.tar.gz
  to pool/main/x/x11proto-input/x11proto-input_1.4.3.orig.tar.gz


Override entries for your package:
x11proto-input-dev_1.4.3-1_all.deb - optional x11
x11proto-input_1.4.3-1.dsc - source x11

Announcing to [EMAIL PROTECTED]


Thank you for your contribution to Debian.


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

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit 375908557fd11e37e8d686f1ff6a372aa2c239de
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Thu Mar 6 00:19:09 2008 -0500

xserver 1.4.99.901

diff --git a/configure.ac b/configure.ac
index 0f58f32..f3b238a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.99.900, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit 2a47accff8dccded4dfe031f9366c028ba927824
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Wed Mar 5 23:56:49 2008 -0500

Fix distcheck.

diff --git a/GL/apple/Makefile.am b/GL/apple/Makefile.am
index 33ad157..c064c03 100644
--- a/GL/apple/Makefile.am
+++ b/GL/apple/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
 if HAVE_AGL_FRAMEWORK
 noinst_LIBRARIES = libAGLcore.a 
 libAGLcore_a_SOURCES = aglGlx.c \
-  $(top_srcdir)/hw/darwin/quartz/xpr/x-list.c \
-  $(top_srcdir)/hw/darwin/quartz/xpr/x-list.h \
-  $(top_srcdir)/hw/darwin/quartz/xpr/x-hash.c \
-  $(top_srcdir)/hw/darwin/quartz/xpr/x-hash.h \
+  $(top_srcdir)/hw/xquartz/xpr/x-list.c \
+  $(top_srcdir)/hw/xquartz/xpr/x-list.h \
+  $(top_srcdir)/hw/xquartz/xpr/x-hash.c \
+  $(top_srcdir)/hw/xquartz/xpr/x-hash.h \
   $(top_srcdir)/hw/dmx/glxProxy/compsize.c
 endif
 
diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am
index 9f9c87f..acd249c 100644
--- a/hw/xfree86/x86emu/Makefile.am
+++ b/hw/xfree86/x86emu/Makefile.am
@@ -21,6 +21,7 @@ EXTRA_DIST = validate.c \
  x86emu/ops.h \
  x86emu/prim_asm.h \
  x86emu/prim_ops.h \
+x86emu/prim_x86_gcc.h \
  x86emu/regs.h \
  x86emu/types.h \
  x86emu/x86emui.h
diff --git a/include/Makefile.am b/include/Makefile.am
index 0654b57..673a976 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -50,10 +50,10 @@ sdk_HEADERS =   \
validate.h  \
window.h\
windowstr.h \
-   xkbsrv.h\
xorg-server.h
 endif
 
 AM_CFLAGS = $(DIX_CFLAGS)
 
-EXTRA_DIST = $(sdk_HEADERS) do-not-use-config.h dix-config.h xorg-config.h
+EXTRA_DIST = $(sdk_HEADERS) do-not-use-config.h dix-config.h xorg-config.h \
+   xkb-config.h xkbfile.h xkbsrv.h xkbstr.h
diff --git a/xkb/Makefile.am b/xkb/Makefile.am
index e750d60..5b594c1 100644
--- a/xkb/Makefile.am
+++ b/xkb/Makefile.am
@@ -47,7 +47,7 @@ libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) 
$(XKBFILE_SRCS) \
 $(X11_SRCS)
 libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c
 
-EXTRA_DIST = xkb.h xkbDflts.h
+EXTRA_DIST = xkbDflts.h xkbgeom.h xkb.h
 
 xkbcompileddir = $(XKB_COMPILED_DIR)
 dist_xkbcompiled_DATA = README.compiled

commit 9de621afee4c9ad0d58d71968ec2c32a7fcc7753
Author: Eamon Walsh <[EMAIL PROTECTED]>
Date:   Tue Mar 4 22:39:41 2008 -0500

xselinux: Implement polyinstantiation support and related protocol.

(cherry picked from commit d4101140f4e569f18554cf0cbf43138d08bd1277)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index a7d3999..18c6526 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -60,31 +60,36 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
IN THE SOFTWARE.
  * Globals
  */
 
-/* private state record */
+/* private state keys */
 static DevPrivateKey subjectKey = &subjectKey;
 static DevPrivateKey objectKey = &objectKey;
+static DevPrivateKey dataKey = &dataKey;
 
-/* This is what we store for security state */
+/* subject state (clients and devices only) */
 typedef struct {
 security_id_t sid;
+security_id_t dev_create_sid;
+security_id_t win_create_sid;
+security_id_t sel_create_sid;
+security_id_t prp_create_sid;
+security_id_t sel_use_sid;
+security_id_t prp_use_sid;
 struct avc_entry_ref aeref;
 char *command;
 int privileged;
 } SELinuxSubjectRec;
 
+/* object state */
 typedef struct {
 security_id_t sid;
 int poly;
 } SELinuxObjectRec;
 
-/* selection manager */
+/* selection and property atom cache */
 typedef struct {
-Atom selection;
-security_id_t sid;
-} SELinuxSelectionRec;
-
-static ClientPtr securityManager;
-static Window securityWindow;
+SELinuxObjectRec prp;
+SELinuxObjectRec sel;
+} SELinuxAtomRec;
 
 /* audit file descriptor */
 static int audit_fd;
@@ -123,9 +128,9 @@ static unsigned numKnownTypes;
 static security_id_t *knownEvents;
 static unsigned numKnownEvents;
 
-/* Array of selection SID structures */
-static SELinuxSelectionRec *knownSelections;
-

Processing of x11proto-core_7.0.12-1_i386.changes

[Archive Administrator]

x11proto-core_7.0.12-1_i386.changes uploaded successfully to localhost
along with the files:
  x11proto-core_7.0.12-1.dsc
  x11proto-core_7.0.12.orig.tar.gz
  x11proto-core_7.0.12-1.diff.gz
  x11proto-core-dev_7.0.12-1_all.deb
  x-dev_7.0.12-1_all.deb

Greetings,

Your Debian queue daemon


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

Processing of x11proto-input_1.4.3-1_i386.changes

[Archive Administrator]

x11proto-input_1.4.3-1_i386.changes uploaded successfully to localhost
along with the files:
  x11proto-input_1.4.3-1.dsc
  x11proto-input_1.4.3.orig.tar.gz
  x11proto-input_1.4.3-1.diff.gz
  x11proto-input-dev_1.4.3-1_all.deb

Greetings,

Your Debian queue daemon


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

libxfont_1.3.2-1_i386.changes ACCEPTED

[Debian Installer]

Accepted:
libxfont-dev_1.3.2-1_i386.deb
  to pool/main/libx/libxfont/libxfont-dev_1.3.2-1_i386.deb
libxfont1-dbg_1.3.2-1_i386.deb
  to pool/main/libx/libxfont/libxfont1-dbg_1.3.2-1_i386.deb
libxfont1_1.3.2-1_i386.deb
  to pool/main/libx/libxfont/libxfont1_1.3.2-1_i386.deb
libxfont_1.3.2-1.diff.gz
  to pool/main/libx/libxfont/libxfont_1.3.2-1.diff.gz
libxfont_1.3.2-1.dsc
  to pool/main/libx/libxfont/libxfont_1.3.2-1.dsc
libxfont_1.3.2.orig.tar.gz
  to pool/main/libx/libxfont/libxfont_1.3.2.orig.tar.gz


Override entries for your package:
libxfont-dev_1.3.2-1_i386.deb - optional libdevel
libxfont1-dbg_1.3.2-1_i386.deb - extra libdevel
libxfont1_1.3.2-1_i386.deb - optional libs
libxfont_1.3.2-1.dsc - source x11

Announcing to [EMAIL PROTECTED]


Thank you for your contribution to Debian.


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

xtrans_1.1-1_i386.changes ACCEPTED

[Debian Installer]

Accepted:
xtrans-dev_1.1-1_all.deb
  to pool/main/x/xtrans/xtrans-dev_1.1-1_all.deb
xtrans_1.1-1.diff.gz
  to pool/main/x/xtrans/xtrans_1.1-1.diff.gz
xtrans_1.1-1.dsc
  to pool/main/x/xtrans/xtrans_1.1-1.dsc
xtrans_1.1.orig.tar.gz
  to pool/main/x/xtrans/xtrans_1.1.orig.tar.gz


Override entries for your package:
xtrans-dev_1.1-1_all.deb - optional x11
xtrans_1.1-1.dsc - source x11

Announcing to [EMAIL PROTECTED]


Thank you for your contribution to Debian.


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

x11proto-core: Changes to 'refs/tags/x11proto-core-7.0.12-1'

[Julien Cristau]

Tag 'x11proto-core-7.0.12-1' created by Julien Cristau <[EMAIL PROTECTED]> at 
2008-03-07 12:55 +

Tagging upload of x11proto-core 7.0.12-1 to unstable.

Changes since x11proto-core-7.0.11-1:
Adam Jackson (1):
  x11proto 7.0.12

Alan Coopersmith (1):
  Make Xalloca.h work with Sun C++ compiler

Ben Byer (1):
  fd_mask needs to be defined on OS X, too

Branden Robinson (1):
  Test for existence of debian/patches directory before creating a symlink 
to it.

Brice Goglin (4):
  Fix displaying of patches applied by quilt.
  Minor fixes in the patching system.
  Fix "display the output of quilt push/pop".
  Do not call laptop-detect, let the only user call it directly

Daniel Stone (1):
  Check headers before testing for fds_bits access method (bug #8442)

David Nusinow (2):
  Remove make-orig-tar-gz target
  Kill the manifest code.

Jeremy Huddleston (2):
  Changed __DARWIN__ to __APPLE__
  Fixed #ifdef checks that were using i386 to use __i386__

Julien Cristau (7):
  Merge git.debian.org:/git/pkg-xorg/xsfbs into debian-unstable
  Merge git.debian.org:/git/pkg-xorg/xsfbs into debian-unstable
  Merge tag 'xproto-7.0.12' of git.freedesktop.org:/git/xorg/proto/x11proto 
into debian-unstable
  Update changelogs for new release
  autoreconf
  debian/control updates
  Prepare changelog for upload

---
 ChangeLog  |   50 ++
 Makefile.in|   44 +-
 Xalloca.h  |9 
 Xos.h  |2 
 Xos_r.h|2 
 Xosdefs.h  |4 
 Xpoll.h.in |2 
 aclocal.m4 |   38 +-
 config.guess   |   32 +
 config.sub |   44 ++
 configure  |  930 +++--
 configure.ac   |   28 +
 debian/changelog   |9 
 debian/control |6 
 debian/xsfbs/xsfbs.mk  |  110 +
 debian/xsfbs/xsfbs.sh  |7 
 do-not-use-config.h.in |   39 ++
 install-sh |  228 ++--
 18 files changed, 1283 insertions(+), 301 deletions(-)
---


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

x11proto-core: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |7 +--
 debian/control   |6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 176b03da61de23921160cb45e5d86caeebe7503a
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 13:55:22 2008 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index c486724..70ad05f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-x11proto-core (7.0.12-1) UNRELEASED; urgency=low
+x11proto-core (7.0.12-1) unstable; urgency=low
 
   * New upstream release.
   * debian/control updates:
 + bump Standards-Version to 3.7.3 (no changes)
 + drop the XS- prefix from the Vcs fields
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 13:20:52 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 13:55:18 +0100
 
 x11proto-core (7.0.11-1) unstable; urgency=low
 

commit 28c5e3fd46150eb9f618d6faee5788f59cca2b25
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 13:54:58 2008 +0100

debian/control updates

bump Standards-Version to 3.7.3 (no changes)
drop the XS- prefix from the Vcs fields

diff --git a/debian/changelog b/debian/changelog
index 4037a46..c486724 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 x11proto-core (7.0.12-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/control updates:
++ bump Standards-Version to 3.7.3 (no changes)
++ drop the XS- prefix from the Vcs fields
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 13:20:52 +0100
 
diff --git a/debian/control b/debian/control
index 5790bf2..08e9287 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>
 Build-Depends: debhelper (>= 5.0.0)
-Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-core
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-core.git
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-core
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-core.git
 
 Package: x11proto-core-dev
 Architecture: all


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

x11proto-input: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |8 ++--
 debian/control   |8 
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 327d8c58eeb946bebd5481ad818c40e0afc0dbbd
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 13:50:20 2008 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index f4c6312..d11be2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-input (1.4.3-1) UNRELEASED; urgency=low
+x11proto-input (1.4.3-1) unstable; urgency=low
 
   [ Brice Goglin ]
   * Update the long description.
@@ -12,7 +12,7 @@ x11proto-input (1.4.3-1) UNRELEASED; urgency=low
 + bump Standards-Version to 3.7.3 (no changes)
 + drop the XS- prefix from Vcs fields
 
- -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 14 Aug 2007 00:09:52 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 13:50:08 +0100
 
 x11proto-input (1.4.2-1) unstable; urgency=low
 

commit 88914d16ad3681969d24cae75f009e8e45b4f992
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 13:49:09 2008 +0100

debian/control updates

add myself to Uploaders, and remove Branden with his permission
bump Standards-Version to 3.7.3 (no changes)
drop the XS- prefix from Vcs fields

diff --git a/debian/changelog b/debian/changelog
index ac51707..f4c6312 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ x11proto-input (1.4.3-1) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * New upstream release.
+  * debian/control updates:
++ add myself to Uploaders, and remove Branden with his permission
++ bump Standards-Version to 3.7.3 (no changes)
++ drop the XS- prefix from Vcs fields
 
  -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 14 Aug 2007 00:09:52 +0200
 
diff --git a/debian/control b/debian/control
index 8815d00..102426d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: x11proto-input
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Andres Salomon <[EMAIL PROTECTED]>, Drew Parsons <[EMAIL 
PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Andres Salomon <[EMAIL 
PROTECTED]>, Drew Parsons <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>
 Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-input
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-input.git
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-input
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-input.git
 
 Package: x11proto-input-dev
 Architecture: all


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

x11proto-input: Changes to 'refs/tags/x11proto-input-1.4.3-1'

[Julien Cristau]

Tag 'x11proto-input-1.4.3-1' created by Julien Cristau <[EMAIL PROTECTED]> at 
2008-03-07 12:52 +

Tagging upload of x11proto-input 1.4.3-1 to unstable.

Changes since x11proto-input-1.4.2-1:
Adam Jackson (1):
  inputproto 1.4.3

Branden Robinson (4):
  Set svn:keywords property to "Id" (keyword already present).
  Note probable out-of-dateness of maplink() function body.
  Add high-level documentation to XSFBS shell library, intended to reduce
  Test for existence of debian/patches directory before creating a symlink 
to it.

Brice Goglin (5):
  Fix displaying of patches applied by quilt.
  Minor fixes in the patching system.
  Fix "display the output of quilt push/pop".
  Various fixed in debian/control and copyright
  Do not call laptop-detect, let the only user call it directly

David Nusinow (13):
  Move xsfbs back to its rightful place
  Make us error out if we call patch and don't have quilt installed
  Fix the last commit and fix spelling error. Thanks Brice Goglin for the 
spelling catch.
  Fix for bug #371152. Thanks Joey Hess.
  Pull patches from ubuntu for ARCHITECTURE, LAPTOP, RECONFIGURE, 
FIRSTINST, and UPGRADE variables
  Move the files so they'll be put in debian/xsfbs automatically when pulled
  Update serverabi generation to also account for driver Provides
  Fix name of serverminver
  Add support for X server input ABI versioning
  Fix typo that prevented the input abi versioning from working.
  Fix one missed bit from the serverabiver -> serverminver rename
  Remove make-orig-tar-gz target
  Kill the manifest code.

Eamon Walsh (1):
  XI.h needs X.h for CARD32 on 64-bit systems.

James Cloos (3):
  Add *~ to .gitignore to skip patch/emacs droppings
  Merge branch 'master' of 
ssh://git.freedesktop.org/git/xorg/proto/inputproto
  Replace static ChangeLog with dist-hook to generate from git log

Jesse Barnes (1):
  Use Xmd.h instead of X.h to pull in CARD32 definition

Julien Cristau (9):
  Add new "serverabi" rule to generate drivers dependency on the server.
  Fix copy/paste typo in the input driver provides.
  Merge tag 'inputproto-1.4.3' of 
git.freedesktop.org:/git/xorg/proto/inputproto into debian-unstable
  delete xsfbs to allow proper import
  Merge git.debian.org:/git/pkg-xorg/xsfbs into debian-unstable
  autoreconf
  Update changelog
  debian/control updates
  Prepare changelog for upload

Peter Hutterer (1):
  Bump to 1.4.2.1

---
 .gitignore   |1 
 ChangeLog|4 
 Makefile.am  |   10 
 Makefile.in  |  132 ++
 XI.h |3 
 aclocal.m4   |  161 ++--
 configure|  121 +
 configure.ac |2 
 debian/changelog |   16 +
 debian/control   |   16 -
 debian/copyright |3 
 debian/xsfbs/xsfbs-autoreconf.mk |2 
 debian/xsfbs/xsfbs.mk|  131 +++--
 debian/xsfbs/xsfbs.sh|9 
 install-sh   |  514 ++-
 missing  |   61 ++--
 mkinstalldirs|5 
 17 files changed, 723 insertions(+), 468 deletions(-)
---


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

Processing of xtrans_1.1-1_i386.changes

[Archive Administrator]

xtrans_1.1-1_i386.changes uploaded successfully to localhost
along with the files:
  xtrans_1.1-1.dsc
  xtrans_1.1.orig.tar.gz
  xtrans_1.1-1.diff.gz
  xtrans-dev_1.1-1_all.deb

Greetings,

Your Debian queue daemon


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

Processing of libxfont_1.3.2-1_i386.changes

[Archive Administrator]

libxfont_1.3.2-1_i386.changes uploaded successfully to localhost
along with the files:
  libxfont_1.3.2-1.dsc
  libxfont_1.3.2.orig.tar.gz
  libxfont_1.3.2-1.diff.gz
  libxfont1_1.3.2-1_i386.deb
  libxfont1-dbg_1.3.2-1_i386.deb
  libxfont-dev_1.3.2-1_i386.deb

Greetings,

Your Debian queue daemon


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

libxfont: Changes to 'refs/tags/libxfont-1_1.3.2-1'

[Julien Cristau]

Tag 'libxfont-1_1.3.2-1' created by Julien Cristau <[EMAIL PROTECTED]> at 
2008-03-07 12:37 +

Tagging upload of libxfont 1:1.3.2-1 to unstable.

Changes since libxfont-1_1.3.1-2:
Adam Jackson (1):
  libXfont 1.3.2

Jens Granseuer (1):
  fix build with gcc 2.95.

Julien Cristau (4):
  Merge tag 'libXfont-1.3.2' of git.freedesktop.org:/git/xorg/lib/libXfont 
into debian-unstable
  New upstream release
  autoreconf
  Prepare changelog for upload

Matthieu Herrb (3):
  catalogue.c: prevent a one character overflow
  ftsystem.c is not needed anymore.
  Fix for CVE-2008-0006 - PCF Font parser buffer overflow.

Tilman Sauerbeck (1):
  Replaced one instance of bcopy() with memcpy().

---
 ChangeLog |   49 ++
 Makefile.in   |   42 +-
 aclocal.m4|  253 
 config.guess  |   32 +
 config.sub|   44 +-
 configure |  766 --
 configure.ac  |5 
 debian/changelog  |7 
 debian/patches/CVE-2008-0006.diff |   24 -
 debian/patches/series |1 
 depcomp   |   33 -
 install-sh|  228 +--
 ltmain.sh |   58 ++
 src/FreeType/Makefile.am  |2 
 src/FreeType/Makefile.in  |   22 -
 src/FreeType/ftsystem.c   |  331 
 src/Makefile.in   |   29 -
 src/Speedo/Makefile.in|   21 -
 src/Type1/Makefile.in |   21 -
 src/bitmap/Makefile.in|   21 -
 src/bitmap/pcfread.c  |6 
 src/builtins/Makefile.in  |   21 -
 src/builtins/dir.c|   18 
 src/builtins/file.c   |3 
 src/fc/Makefile.in|   21 -
 src/fontcache/Makefile.in |   21 -
 src/fontfile/Makefile.in  |   21 -
 src/fontfile/catalogue.c  |2 
 src/stubs/Makefile.in |   21 -
 src/util/Makefile.in  |   21 -
 30 files changed, 1204 insertions(+), 940 deletions(-)
---


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

libxfont: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4a100855622cdbdc18a65a3f4b9f7c85aafd8cea
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 13:32:47 2008 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index c53f854..eb88142 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libxfont (1:1.3.2-1) UNRELEASED; urgency=low
+libxfont (1:1.3.2-1) unstable; urgency=low
 
   * New upstream release
   * Drop CVE-2008-0006.diff, included upstream.
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 12:09:20 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 13:32:43 +0100
 
 libxfont (1:1.3.1-2) unstable; urgency=high
 


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

xtrans: Changes to 'refs/tags/xtrans-1.1-1'

[Julien Cristau]

Tag 'xtrans-1.1-1' created by Julien Cristau <[EMAIL PROTECTED]> at 2008-03-07 
12:30 +

Tagging upload of xtrans 1.1-1 to unstable.

Changes since xtrans-1.0.4-1:
Adam Jackson (2):
  Add support for the abstract socket namespace under Linux.
  xtrans 1.1

Ben Byer (5):
  suppress warning about socket directory ownership on OS X
  changes to support launchd on OS X
  removed cvs tags
  Fix for incorrect processing of recycled launchd socket on OS X
  make launchd error messages less scary

Branden Robinson (1):
  Test for existence of debian/patches directory before creating a symlink 
to it.

Brice Goglin (4):
  Fix displaying of patches applied by quilt.
  Minor fixes in the patching system.
  Fix "display the output of quilt push/pop".
  Do not call laptop-detect, let the only user call it directly

David Nusinow (2):
  Remove make-orig-tar-gz target
  Kill the manifest code.

Dodji Seketeli (2):
  libxtrans: fix linux compilation breakage
  libxtrans: fixed a typo in my last commit

Jeremy Huddleston (1):
  Fixed #ifdef checks that were using i386 to use __i386__

Julien Cristau (6):
  Merge tag 'xtrans-1.1' of git.freedesktop.org:/git/xorg/lib/libxtrans 
into debian-unstable
  Merge git.debian.org:/git/pkg-xorg/xsfbs into debian-unstable
  autoreconf for new release
  update changelogs for new release
  debian/control updates
  Prepare changelog for upload.

---
 ChangeLog |   93 
 INSTALL   |5 -
 Makefile.in   |   49 +-
 Xtrans.c  |   91 +--
 Xtrans.h  |6 -
 Xtransdnet.c  |6 -
 Xtransint.h   |   16 +--
 Xtranslcl.c   |6 -
 Xtranssock.c  |  198 +--
 Xtranstli.c   |6 -
 Xtransutil.c  |8 -
 aclocal.m4|   38 
 configure |   22 ++--
 configure.ac  |5 -
 debian/changelog  |   10 ++
 debian/control|8 -
 debian/xsfbs/xsfbs.mk |  110 
 debian/xsfbs/xsfbs.sh |7 -
 install-sh|  228 ++
 transport.c   |6 -
 20 files changed, 560 insertions(+), 358 deletions(-)
---


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

xtrans: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |8 ++--
 debian/control   |8 
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit d589396a320af047b3a90c2ff58dd1d6ccab4d04
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 13:30:05 2008 +0100

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 0a7d44c..550b6b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xtrans (1.1-1) UNRELEASED; urgency=low
+xtrans (1.1-1) unstable; urgency=low
 
   * New upstream release.
   * debian/control updates:
@@ -6,7 +6,7 @@ xtrans (1.1-1) UNRELEASED; urgency=low
 + Bump Standards-Version to 3.7.3 (no changes)
 + Drop the XS- prefix for Vcs headers
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 12:00:05 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 13:29:58 +0100
 
 xtrans (1.0.4-1) unstable; urgency=low
 

commit 7eedf86c585915cb86f3cf80f6aa90ed833e21b7
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 13:29:39 2008 +0100

debian/control updates

Add myself to Uploaders
Bump Standards-Version to 3.7.3 (no changes)
Drop the XS- prefix for Vcs headers

diff --git a/debian/changelog b/debian/changelog
index fd3b19d..0a7d44c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 xtrans (1.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/control updates:
++ Add myself to Uploaders
++ Bump Standards-Version to 3.7.3 (no changes)
++ Drop the XS- prefix for Vcs headers
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 12:00:05 +0100
 
diff --git a/debian/control b/debian/control
index 7d60d28..848e6fd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: xtrans
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL 
PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5.0.0), quilt
-Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xtrans
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xtrans.git
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xtrans
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xtrans.git
 
 Package: xtrans-dev
 Architecture: all


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

x11proto-core: Changes to 'debian-unstable'

[Julien Cristau]

 ChangeLog  |   50 ++
 Makefile.in|   44 +-
 Xalloca.h  |9 
 Xos.h  |2 
 Xos_r.h|2 
 Xosdefs.h  |4 
 Xpoll.h.in |2 
 aclocal.m4 |   38 +-
 config.guess   |   32 +
 config.sub |   44 ++
 configure  |  930 +++--
 configure.ac   |   28 +
 debian/changelog   |6 
 debian/xsfbs/xsfbs.mk  |  110 +
 debian/xsfbs/xsfbs.sh  |7 
 do-not-use-config.h.in |   39 ++
 install-sh |  228 ++--
 17 files changed, 1277 insertions(+), 298 deletions(-)

New commits:
commit 4a74728fa67bbdfeee7567fca75d677fb433ff2f
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 13:22:52 2008 +0100

autoreconf

diff --git a/Makefile.in b/Makefile.in
index 4af14ff..1bea313 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -86,6 +86,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -93,7 +94,9 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -327,8 +330,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | \
- $(AWK) '{ files[$$0] = 1; } \
-  END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
 tags: TAGS
 
@@ -340,8 +343,8 @@ TAGS:  $(HEADERS) $(SOURCES) do-not-use-config.h.in 
Xfuncproto.h.in $(TAGS_DEPEN
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | \
- $(AWK) '{ files[$$0] = 1; } \
-  END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  test -n "$$unique" || unique=$$empty_fix; \
  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -351,13 +354,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES) do-not-use-config.h.in Xfuncproto.h.in 
$(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
-   here=`pwd`; \
list='$(SOURCES) $(HEADERS) do-not-use-config.h.in Xfuncproto.h.in 
$(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | \
- $(AWK) '{ files[$$0] = 1; } \
-  END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 $$tags $$unique
@@ -413,6 +415,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
 
+dist-lzma: distdir
+   tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+   $(am__remove_distdir)
+
 dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -440,6 +446,8 @@ distcheck: dist
  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+   *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -593,15 +601,15 @@ uninstall-am: uninstall-nodist_xprotoHEADERS 
uninstall-pkgconfigDATA \
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-generic ctags dist dist-all dist-bzip2 dist-gzip \
-   dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
-   distclean-generic distclean-hdr distclean-tags distcleancheck \
-   distdir distuninstallcheck dvi dvi-a

x11proto-core: Changes to 'upstream-unstable'

[Julien Cristau]

 Xalloca.h|9 -
 Xos.h|2 +-
 Xos_r.h  |2 +-
 Xosdefs.h|4 ++--
 Xpoll.h.in   |2 +-
 configure.ac |   28 +---
 6 files changed, 34 insertions(+), 13 deletions(-)

New commits:
commit d34310efef11264ddff79320b8c6f03705b1208a
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Wed Mar 5 22:09:16 2008 -0500

x11proto 7.0.12

diff --git a/configure.ac b/configure.ac
index 9806ae3..f62d508 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([Xproto], [7.0.11], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.12], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 AC_CONFIG_HEADER([do-not-use-config.h])

commit e4ad7a8080e4ac0b868fa7cf39bc5ad9a6e0bee1
Author: Jeremy Huddleston <[EMAIL PROTECTED]>
Date:   Sun Feb 10 19:07:49 2008 -0800

Fixed #ifdef checks that were using i386 to use __i386__

"""
It's simply obsolete, sloppy, compiler namespace pollution.  The
compiler is not allowed to predefine symbols that might conflict with
ordinary identifiers.  For backwards compatibility gcc currently
predefines i386 when compiling for x86 32-bit (but not 64-bit), but that
will go away.  It is also not defined if you specify -ansi when invoking
the compiler, because then it is seriously standards compliant.  Other
compilers shouldn't define it either.  Correct code shouldn't rely on it
being defined.  However __i386__ is safe and proper.
"""

diff --git a/Xos.h b/Xos.h
index b6b93a5..67bf679 100644
--- a/Xos.h
+++ b/Xos.h
@@ -149,7 +149,7 @@ extern int sys_nerr;
  */
 #if defined(X_NOT_POSIX)
 #include 
-#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(i386) && 
(defined(SYSV) || defined(SVR4))) || defined(__sxg__)
+#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(__i386__) 
&& (defined(SYSV) || defined(SVR4))) || defined(__sxg__)
 #include 
 #endif
 #ifdef WIN32
diff --git a/Xos_r.h b/Xos_r.h
index f52bde7..7ce72ac 100644
--- a/Xos_r.h
+++ b/Xos_r.h
@@ -237,7 +237,7 @@ extern void XtProcessUnlock(
 
 #elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API)
 /* Use regular, unsafe API. */
-# if defined(X_NOT_POSIX) && !defined(i386) && !defined(SYSV)
+# if defined(X_NOT_POSIX) && !defined(__i386__) && !defined(SYSV)
 extern struct passwd *getpwuid(), *getpwnam();
 # endif
 typedef int _Xgetpwparams; /* dummy */
diff --git a/Xosdefs.h b/Xosdefs.h
index be90d5e..14971c4 100644
--- a/Xosdefs.h
+++ b/Xosdefs.h
@@ -86,7 +86,7 @@ in this Software without prior written authorization from The 
Open Group.
 #endif
 #endif
 
-#ifdef i386
+#ifdef __i386__
 #ifdef SYSV
 #if !defined(ISC) && !defined(__SCO__) && !defined(_SEQUENT_) && \
!defined(__UNIXWARE__) && !defined(sun)

commit e49280c1c33622dbf288b0ac4f8324b01ff9b4aa
Author: Jeremy Huddleston <[EMAIL PROTECTED]>
Date:   Mon Dec 10 21:33:01 2007 -0800

Changed __DARWIN__ to __APPLE__

diff --git a/Xosdefs.h b/Xosdefs.h
index 075d798..be90d5e 100644
--- a/Xosdefs.h
+++ b/Xosdefs.h
@@ -133,7 +133,7 @@ in this Software without prior written authorization from 
The Open Group.
 #define NULL_NOT_ZERO
 #endif
 
-#ifdef __DARWIN__
+#ifdef __APPLE__
 #define NULL_NOT_ZERO
 #endif
 

commit 5ae4d304ecb5fb4af0435c9f2efde3d2da5905d1
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Tue Oct 30 18:44:49 2007 -0700

Make Xalloca.h work with Sun C++ compiler

diff --git a/Xalloca.h b/Xalloca.h
index 67f2671..c561718 100644
--- a/Xalloca.h
+++ b/Xalloca.h
@@ -62,7 +62,8 @@ from The Open Group.
 #define XALLOCA_H 1
 
 #ifndef INCLUDE_ALLOCA_H
-# if defined(__SUNPRO_C)  /* Need to add more here to match Imake *.cf's */
+/* Need to add more here to match Imake *.cf's */
+# if defined(HAVE_ALLOCA_H) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 #  define INCLUDE_ALLOCA_H
 # endif
 #endif
@@ -111,16 +112,14 @@ from The Open Group.
  * decide that you don't want to use alloca, you might want to fix it here.
  */
 /* alloca might be a macro taking one arg (hi, Sun!), so give it one. */
-#ifndef __sgi  /* IRIX 5/6 has definition */
-# ifndef __QNX__
+#if !defined(__sgi) && !defined(__QNX__) && !defined(__cplusplus)
 #  define __Xnullarg   /* as nothing */
 #  ifndef X_NOT_STDC_ENV
  extern void *alloca(__Xnullarg);
 #  else
  extern char *alloca(__Xnullarg);
 #  endif
-# endif /* __QNX__ */
-#endif /* __sgi */
+#endif /* !__sgi && !__QNX && !__cplusplus */
 #define ALLOCATE_LOCAL(size) alloca((int)(size))
 #  endif /* who does alloca */
 #endif /* NCR */

commit 5ccc71161283fdb2c42da1eeb4049650f6a2f429
Author: Ben Byer <[EMAIL PROTECTED]>
Date:   Tue Oct 30 18:40:47 2007 -0700

fd_mask needs to be defined on OS X, too

diff --git a/Xpoll.h.in b/Xpoll.h.in

x11proto-input: Changes to 'debian-unstable'

[Julien Cristau]

 .gitignore   |1 
 ChangeLog|4 
 Makefile.am  |   10 
 Makefile.in  |  132 ++
 XI.h |3 
 aclocal.m4   |  161 ++--
 configure|  121 +
 configure.ac |2 
 debian/changelog |6 
 debian/xsfbs/xsfbs-autoreconf.mk |2 
 debian/xsfbs/xsfbs.mk|  131 +++--
 debian/xsfbs/xsfbs.sh|9 
 install-sh   |  514 ++-
 missing  |   61 ++--
 mkinstalldirs|5 
 15 files changed, 699 insertions(+), 463 deletions(-)

New commits:
commit dec34bc189570c312be854bf5b02a22c9bfe216c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 13:15:15 2008 +0100

Update changelog

diff --git a/debian/changelog b/debian/changelog
index 9206b11..ac51707 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-x11proto-input (1.4.2-2) UNRELEASED; urgency=low
+x11proto-input (1.4.3-1) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * Update the long description.
   * Add URL in debian/copyright.
   * Remove Fabio from Uploaders, with his permission.
 
+  [ Julien Cristau ]
+  * New upstream release.
+
  -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 14 Aug 2007 00:09:52 +0200
 
 x11proto-input (1.4.2-1) unstable; urgency=low

commit 8d53ff2b205b1ffa22ab58326bd3174fce220d15
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 12:28:38 2008 +0100

autoreconf

diff --git a/Makefile.in b/Makefile.in
index 9d6a2ad..3c60fc6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -45,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = inputproto.pc
 SOURCES =
@@ -85,6 +81,7 @@ DEFS = @DEFS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -93,6 +90,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -104,11 +102,16 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -132,8 +135,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 inputdir = $(includedir)/X11/extensions
 input_HEADERS = \
XI.h \
@@ -142,7 +148,8 @@ input_HEADERS = \
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = inputproto.pc
-EXTRA_DIST = autogen.sh inputproto.pc.in
+EXTRA_DIST = autogen.sh inputproto.pc.in ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
 all: all-am
 
 .SUFFIXES:
@@ -181,10 +188,9 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 inputproto.pc: $(top_builddir)/config.status $(srcdir)/inputproto.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-uninstall-info-am:
 install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
-   test -z "$(pkg

x11proto-input: Changes to 'upstream-unstable'

[Julien Cristau]

 .gitignore   |1 +
 ChangeLog|4 
 Makefile.am  |   10 ++
 XI.h |3 ++-
 configure.ac |2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 3edc1bf23b07ea47d7e1e32047e15c67333c663e
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Wed Mar 5 22:06:19 2008 -0500

inputproto 1.4.3

diff --git a/configure.ac b/configure.ac
index c010699..b07f4ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.2.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.4.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

commit 096b20bf5492d248b5c8ff0c1c28e221d59db724
Author: Jesse Barnes <[EMAIL PROTECTED]>
Date:   Mon Jan 21 15:28:49 2008 -0800

Use Xmd.h instead of X.h to pull in CARD32 definition

On 64 bit hosts, CARD32 may be undefined unless we use Xmd.h to define it 
for
us.  Apparently X.h is no longer sufficient.

diff --git a/XI.h b/XI.h
index 0bfefcc..fe4981a 100644
--- a/XI.h
+++ b/XI.h
@@ -52,7 +52,7 @@ SOFTWARE.
 #ifndef _XI_H_
 #define _XI_H_
 
-#include  /* CARD32 */
+#include  /* CARD32 */
 
 #define sz_xGetExtensionVersionReq 8
 #define sz_xGetExtensionVersionReply   32

commit 9359e625787761e6b3df15f29bbf842c67a9516d
Author: James Cloos <[EMAIL PROTECTED]>
Date:   Thu Dec 6 16:39:02 2007 -0500

Replace static ChangeLog with dist-hook to generate from git log

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index c722b51..000
--- a/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2005-12-14  Kevin E. Martin  
-
-   * configure.ac:
-   Update package version number for final X11R7 release candidate.
diff --git a/Makefile.am b/Makefile.am
index e39ea0a..f8d4a32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,3 +8,13 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = inputproto.pc
 
 EXTRA_DIST = autogen.sh inputproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+   (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv 
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git 
directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog

commit 4b22047f347d8fd65a36b2fc90e1a87dff8e93e3
Author: Eamon Walsh <[EMAIL PROTECTED]>
Date:   Thu Sep 27 12:27:19 2007 -0400

XI.h needs X.h for CARD32 on 64-bit systems.

diff --git a/XI.h b/XI.h
index ae52292..0bfefcc 100644
--- a/XI.h
+++ b/XI.h
@@ -50,9 +50,10 @@ SOFTWARE.
 /* Definitions used by the server, library and client */
 
 #ifndef _XI_H_
-
 #define _XI_H_
 
+#include  /* CARD32 */
+
 #define sz_xGetExtensionVersionReq 8
 #define sz_xGetExtensionVersionReply   32
 #define sz_xListInputDevicesReq4

commit 369dd283cfcf006e2cfe3496ebc5157839a3d04e
Author: James Cloos <[EMAIL PROTECTED]>
Date:   Mon Sep 3 05:54:06 2007 -0400

Add *~ to .gitignore to skip patch/emacs droppings

diff --git a/.gitignore b/.gitignore
index 2c3bca3..503dd99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ configure
 install-sh
 missing
 inputproto.pc
+*~

commit 96b0c13a5a689b3a6dbc4249ca4ef364f778c003
Author: Peter Hutterer <[EMAIL PROTECTED]>
Date:   Fri Aug 31 17:58:27 2007 +0930

Bump to 1.4.2.1

No source changes, the 1.4.2 tarball had a busted configure script.

diff --git a/configure.ac b/configure.ac
index 72f9882..c010699 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.4.2.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION


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

libxfont: Changes to 'debian-unstable'

[Julien Cristau]

 ChangeLog |   49 ++
 Makefile.in   |   42 +-
 aclocal.m4|  253 
 config.guess  |   32 +
 config.sub|   44 +-
 configure |  766 --
 configure.ac  |5 
 debian/changelog  |7 
 debian/patches/CVE-2008-0006.diff |   24 -
 debian/patches/series |1 
 depcomp   |   33 -
 install-sh|  228 +--
 ltmain.sh |   58 ++
 src/FreeType/Makefile.am  |2 
 src/FreeType/Makefile.in  |   22 -
 src/FreeType/ftsystem.c   |  331 
 src/Makefile.in   |   29 -
 src/Speedo/Makefile.in|   21 -
 src/Type1/Makefile.in |   21 -
 src/bitmap/Makefile.in|   21 -
 src/bitmap/pcfread.c  |6 
 src/builtins/Makefile.in  |   21 -
 src/builtins/dir.c|   18 
 src/builtins/file.c   |3 
 src/fc/Makefile.in|   21 -
 src/fontcache/Makefile.in |   21 -
 src/fontfile/Makefile.in  |   21 -
 src/fontfile/catalogue.c  |2 
 src/stubs/Makefile.in |   21 -
 src/util/Makefile.in  |   21 -
 30 files changed, 1204 insertions(+), 940 deletions(-)

New commits:
commit 4a4b85aadb90e498333a32a5d02e2bb5a509366f
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 12:13:30 2008 +0100

autoreconf

diff --git a/Makefile.in b/Makefile.in
index 84e6f8d..b2a7913 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -131,6 +131,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -160,6 +161,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MATH_LIBS = @MATH_LIBS@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -459,8 +461,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | \
- $(AWK) '{ files[$$0] = 1; } \
-  END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
 tags: TAGS
 
@@ -485,8 +487,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in 
$(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | \
- $(AWK) '{ files[$$0] = 1; } \
-  END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  test -n "$$unique" || unique=$$empty_fix; \
  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -496,13 +498,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
-   here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | \
- $(AWK) '{ files[$$0] = 1; } \
-  END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 $$tags $$unique
@@ -575,6 +576,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
 
+dist-lzma: distdir
+   tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+   $(am__remove_distdir)
+
 dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -602,6 +607,8 @@ distcheck: dist
  GZIP=$(GZIP_ENV) gunzip

libxfont: Changes to 'upstream-unstable'

[Julien Cristau]

 configure.ac |5 
 src/FreeType/Makefile.am |2 
 src/FreeType/ftsystem.c  |  331 ---
 src/bitmap/pcfread.c |6 
 src/builtins/dir.c   |   18 +-
 src/builtins/file.c  |3 
 src/fontfile/catalogue.c |2 
 7 files changed, 19 insertions(+), 348 deletions(-)

New commits:
commit 0fd2a1428df56d8b29e148b08dcec2dfed9302fa
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Wed Mar 5 22:04:06 2008 -0500

libXfont 1.3.2

diff --git a/configure.ac b/configure.ac
index 63737ad..7d7ba75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,3 @@
-dnl 
-dnl  $Id$
-dnl 
 dnl  Copyright © 2003 Keith Packard
 dnl 
 dnl  Permission to use, copy, modify, distribute, and sell this software and 
its
@@ -26,7 +23,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ([2.57])
 
 AC_INIT([libXfont],
-   1.3.1,
+   1.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
 dnl

commit b76df66d2c507898472bba0f9986ef5700029a36
Author: Matthieu Herrb <[EMAIL PROTECTED]>
Date:   Thu Jan 17 15:30:37 2008 +0100

Fix for CVE-2008-0006 - PCF Font parser buffer overflow.

diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
index fd41849..c5db255 100644
--- a/src/bitmap/pcfread.c
+++ b/src/bitmap/pcfread.c
@@ -588,6 +588,9 @@ pcfReadFont(FontPtr pFont, FontFilePtr file,
 pFont->info.lastRow = pcfGetINT16(file, format);
 pFont->info.defaultCh = pcfGetINT16(file, format);
 if (IS_EOF(file)) goto Bail;
+if (pFont->info.firstCol > pFont->info.lastCol ||
+   pFont->info.firstRow > pFont->info.lastRow ||
+   pFont->info.lastCol-pFont->info.firstCol > 255) goto Bail;
 
 nencoding = (pFont->info.lastCol - pFont->info.firstCol + 1) *
(pFont->info.lastRow - pFont->info.firstRow + 1);
@@ -726,6 +729,9 @@ pcfReadFontInfo(FontInfoPtr pFontInfo, FontFilePtr file)
 pFontInfo->lastRow = pcfGetINT16(file, format);
 pFontInfo->defaultCh = pcfGetINT16(file, format);
 if (IS_EOF(file)) goto Bail;
+if (pFontInfo->firstCol > pFontInfo->lastCol ||
+   pFontInfo->firstRow > pFontInfo->lastRow ||
+   pFontInfo->lastCol-pFontInfo->firstCol > 255) goto Bail;
 
 nencoding = (pFontInfo->lastCol - pFontInfo->firstCol + 1) *
(pFontInfo->lastRow - pFontInfo->firstRow + 1);

commit 2297c6390a1609fe810c2cd5b3443f3722610944
Author: Matthieu Herrb <[EMAIL PROTECTED]>
Date:   Thu Oct 18 21:46:49 2007 +0200

ftsystem.c is not needed anymore.

diff --git a/src/FreeType/Makefile.am b/src/FreeType/Makefile.am
index a138314..8e67837 100644
--- a/src/FreeType/Makefile.am
+++ b/src/FreeType/Makefile.am
@@ -13,5 +13,3 @@ libft_la_SOURCES =\
ftfuncs.c   \
fttools.c   \
xttcap.c
-
-EXTRA_DIST = ftsystem.c
diff --git a/src/FreeType/ftsystem.c b/src/FreeType/ftsystem.c
deleted file mode 100644
index ae5aa00..000
--- a/src/FreeType/ftsystem.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/***/
-/* */
-/*  ftsystem.c */
-/* */
-/*ANSI-specific FreeType low-level system interface (body).*/
-/* */
-/*  Copyright 1996-2001, 2002 by   */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.  */
-/* */
-/*  Modified for XFree86.  */
-/* */
-/*  This file is part of the FreeType project, and may only be used,   */
-/*  modified, and distributed under the terms of the FreeType project  */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute */
-/*  this file you indicate that you have read the license and  */
-/*  understand and accept it fully.*/
-/* */
-/***/
-
-/* Modified for XFree86 */
-/* $XFree86$ */
-
-  /*/
-  /*   */
-  /* This file contains the default interface used by FreeType to access   */
-  /* low-level, i.e. memory management, i/o access as well as thread   */
-  /* synchronisation.  It can be replaced by user-specific routines if */
-  /* necessary.*/
-  /*

xtrans: Changes to 'debian-unstable'

[Julien Cristau]

 ChangeLog |   93 
 INSTALL   |5 -
 Makefile.in   |   49 +-
 Xtrans.c  |   91 +--
 Xtrans.h  |6 -
 Xtransdnet.c  |6 -
 Xtransint.h   |   16 +--
 Xtranslcl.c   |6 -
 Xtranssock.c  |  198 +--
 Xtranstli.c   |6 -
 Xtransutil.c  |8 -
 aclocal.m4|   38 
 configure |   22 ++--
 configure.ac  |5 -
 debian/changelog  |6 +
 debian/xsfbs/xsfbs.mk |  110 
 debian/xsfbs/xsfbs.sh |7 -
 install-sh|  228 ++
 transport.c   |6 -
 19 files changed, 552 insertions(+), 354 deletions(-)

New commits:
commit 6ad7ce2d4af2647bdcfd80eca7e1ba1ca3263b46
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 12:01:02 2008 +0100

update changelogs for new release

diff --git a/ChangeLog b/ChangeLog
index 0c06d3f..fcadcc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,96 @@
+commit 662994b9096181117cec4cae88f24bf6da806159
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date:   Wed Mar 5 21:02:28 2008 -0500
+
+xtrans 1.1
+
+commit 2afe206ec9569e0d62caa6d91c3fb057b0efa23d
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date:   Wed Mar 5 20:48:59 2008 -0500
+
+Add support for the abstract socket namespace under Linux.
+
+Unlike normal unix sockets, the abstract namespace is not bound to the
+filesystem.  This has some notable advantages; /tmp need not exist, the
+socket directory need not have magic permissions, etc.  xtrans servers
+will listen on both the normal and abstract socket endpoints; clients
+will attempt to connect to the abstract socket before connecting to the
+corresponding filesystem socket.
+
+Based on a patch by Bill Crawford.
+
+commit c8ed67f16f71042ef134a4d2189c20dd200a0648
+Author: Jeremy Huddleston <[EMAIL PROTECTED]>
+Date:   Sun Feb 10 19:04:40 2008 -0800
+
+Fixed #ifdef checks that were using i386 to use __i386__
+
+"""
+
+It's simply obsolete, sloppy, compiler namespace pollution.  The
+compiler is not allowed to predefine symbols that might conflict with
+ordinary identifiers.  For backwards compatibility gcc currently
+predefines i386 when compiling for x86 32-bit (but not 64-bit), but that
+will go away.  It is also not defined if you specify -ansi when invoking
+the compiler, because then it is seriously standards compliant.  Other
+compilers shouldn't define it either.  Correct code shouldn't rely on it
+being defined.  However __i386__ is safe and proper.
+
+"""
+
+commit 9970b5b6f8237685267b7972282319cf21ea
+Author: Ben Byer <[EMAIL PROTECTED]>
+Date:   Sun Dec 2 07:36:51 2007 -0800
+
+make launchd error messages less scary
+
+commit cd1da5cec49fb7fe6238a00d9ba550b3ed78fa08
+Author: Ben Byer <[EMAIL PROTECTED]>
+Date:   Wed Nov 14 03:57:57 2007 -0800
+
+Fix for incorrect processing of recycled launchd socket on OS X
+
+commit 3da4d6c1dc05f9e1291b023a97535eb67f0830e2
+Author: Ben Byer <[EMAIL PROTECTED]>
+Date:   Wed Nov 14 03:55:42 2007 -0800
+
+removed cvs tags
+
+commit 496cf2c46d2123c3bed3e6878f8f9a62e87ce559
+Author: Dodji Seketeli <[EMAIL PROTECTED]>
+Date:   Tue Sep 11 12:52:44 2007 +0200
+
+libxtrans: fixed a typo in my last commit
+
+* Xtranssock.c: (SocketReopen): oops fix a typo in my last commit.
+
+commit 88e141225113fcc4ebe5e8fe361e75673cdbf9ff
+Author: Dodji Seketeli <[EMAIL PROTECTED]>
+Date:   Tue Sep 11 08:48:03 2007 +0200
+
+libxtrans: fix linux compilation breakage
+
+* Xtranssock.c:
+  (SocketReopen): protect use of BSD4.4 socket with BSD44SOCKETS 
macro.
+  protect use of strlcnpy with HAVE_STRLCPY macro.
+  That one is defined (or not) by the xserver configure.
+
+commit 6217f34977bfa17b66b89df5d45420774abedcb3
+Author: Ben Byer <[EMAIL PROTECTED]>
+Date:   Wed Sep 5 18:29:44 2007 -0700
+
+changes to support launchd on OS X
+
+commit 4d0cfe491046df26027db291530b247b7f24df5b
+Author: Ben Byer <[EMAIL PROTECTED]>
+Date:   Wed Sep 5 18:04:01 2007 -0700
+
+suppress warning about socket directory ownership on OS X
+
+We don't need to warn the user about the fact that the socket
+directory is not owned by root under OS X; on that platform,
+it's never owned by root, as the X server runs as the normal user.
+
 commit de93d67f6d48c7c08f2554cb85515bcf7dfbffb2
 Author: Alan Coopersmith <[EMAIL PROTECTED]>
 Date:   Tue Aug 21 17:54:23 2007 -0700
diff --git a/debian/changelog b/debian/changelog
index fcd25c2..fd3b19d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xtrans (1.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 12:00:05 +01

xtrans: Changes to 'upstream-unstable'

[Julien Cristau]

 Xtrans.c |   91 +++
 Xtrans.h |6 -
 Xtransdnet.c |6 -
 Xtransint.h  |   16 +---
 Xtranslcl.c  |6 -
 Xtranssock.c |  198 +--
 Xtranstli.c  |6 -
 Xtransutil.c |8 --
 configure.ac |5 -
 transport.c  |6 -
 10 files changed, 248 insertions(+), 100 deletions(-)

New commits:
commit 662994b9096181117cec4cae88f24bf6da806159
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Wed Mar 5 21:02:28 2008 -0500

xtrans 1.1

diff --git a/configure.ac b/configure.ac
index c713be8..0846bf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,3 @@
-dnl 
-dnl  $Id$
-dnl 
 dnl  Copyright © 2003 Keith Packard, Noah Levitt
 dnl 
 dnl  Permission to use, copy, modify, distribute, and sell this software and 
its
@@ -24,7 +21,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xtrans, 1.0.4, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans)
+AC_INIT(xtrans, 1.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 2afe206ec9569e0d62caa6d91c3fb057b0efa23d
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Wed Mar 5 20:48:59 2008 -0500

Add support for the abstract socket namespace under Linux.

Unlike normal unix sockets, the abstract namespace is not bound to the
filesystem.  This has some notable advantages; /tmp need not exist, the
socket directory need not have magic permissions, etc.  xtrans servers
will listen on both the normal and abstract socket endpoints; clients
will attempt to connect to the abstract socket before connecting to the
corresponding filesystem socket.

Based on a patch by Bill Crawford.

diff --git a/Xtransint.h b/Xtransint.h
index 97e8a89..317dbf8 100644
--- a/Xtransint.h
+++ b/Xtransint.h
@@ -369,9 +369,10 @@ typedef struct _Xtransport_table {
 #define TRANS_DISABLED (1<<2)  /* Don't open this one */
 #define TRANS_NOLISTEN  (1<<3)  /* Don't listen on this one */
 #define TRANS_NOUNLINK (1<<4)  /* Dont unlink transport endpoints */
+#define TRANS_ABSTRACT (1<<5)  /* Use abstract sockets if available */
 
 /* Flags to preserve when setting others */
-#define TRANS_KEEPFLAGS(TRANS_NOUNLINK)
+#define TRANS_KEEPFLAGS(TRANS_NOUNLINK|TRANS_ABSTRACT)
 
 /*
  * readv() and writev() don't exist or don't work correctly on some
diff --git a/Xtranssock.c b/Xtranssock.c
index 646d634..94b73e2 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -158,6 +158,10 @@ static int IBMsockInit = 0;
 #define SocketInitOnce() /**/
 #endif
 
+#ifdef linux
+#define HAVE_ABSTRACT_SOCKETS
+#endif
+
 #define MIN_BACKLOG 128
 #ifdef SOMAXCONN
 #if SOMAXCONN > MIN_BACKLOG
@@ -880,23 +884,28 @@ TRANS(SocketSetOption) (XtransConnInfo ciptr, int option, 
int arg)
 
 #ifdef UNIXCONN
 static int
-set_sun_path(const char *port, const char *upath, char *path)
+set_sun_path(const char *port, const char *upath, char *path, int abstract)
 {
 struct sockaddr_un s;
 int maxlen = sizeof(s.sun_path) - 1;
+const char *at = "";
 
 if (!port || !*port || !path)
return -1;
 
-if (*port == '/') { /* a full pathname */
-   if (strlen(port) > maxlen)
-   return -1;
-   sprintf(path, "%s", port);
-} else {
-   if (strlen(port) + strlen(upath) > maxlen)
-   return -1;
-   sprintf(path, "%s%s", upath, port);
-}
+#ifdef HAVE_ABSTRACT_SOCKETS
+if (port[0] == '@')
+   upath = "";
+else if (abstract)
+   at = "@";
+#endif
+
+if (*port == '/') /* a full pathname */
+   upath = "";
+
+if (strlen(port) + strlen(upath) > maxlen)
+   return -1;
+sprintf(path, "%s%s%s", at, upath, port);
 return 0;
 }
 #endif
@@ -1119,6 +1128,12 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, 
char *port,
 intoldUmask;
 intstatus;
 unsigned int   mode;
+char   tmpport[108];
+
+intabstract = 0;
+#ifdef HAVE_ABSTRACT_SOCKETS
+abstract = ciptr->transptr->flags & TRANS_ABSTRACT;
+#endif
 
 PRMSG (2, "SocketUNIXCreateListener(%s)\n",
port ? port : "NULL", 0, 0);
@@ -1141,16 +1156,16 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, 
char *port,
 }
 #endif
 
+memset(&sockname, 0, sizeof(sockname));
 sockname.sun_family = AF_UNIX;
 
-if (port && *port) {
-   if (set_sun_path(port, UNIX_PATH, sockname.sun_path) != 0) {
-   PRMSG (1, "SocketUNIXCreateListener: path too long\n", 0, 0, 0);
-   return TRANS_CREATE_LISTENER_FAILED;
-   }
-} else {
-   snprintf (sockname.sun_path, sizeof(sockname.sun_path),
- "%s%ld", UNIX_PATH, (long)getpid());
+if (!(port && *port)) {
+   snprintf (tmpport, sizeof(tmpport), "%s%ld", UNIX_PATH, (long)getpid());
+   port = tmpport;
+}
+   

Bug#469826: xkb-data: Outdated French Dvorak keymap (bépo)

[Roland Mas]

Package: xkb-data
Version: 1.1~cvs.20080104.1-1
Severity: wishlist

/usr/share/X11/xkb/symbols/fr contains an old version of the Bépo
keymap: it lists version 6.2.1.1 (which I believe actually refers to
0.6.2.1.1) but the current upstream version is 0.6.4.  Since the
changes are not only cosmetic (the Y and H letters have been swapped,
for instance), I suggest updating the file in xkb-data.  Current data
can be found on http://www.clavier-dvorak.org/wiki/Version_0.6.4

  Thanks,

Roland.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.24-1-686 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-- no debconf information

xutils-dev: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |4 
 util-macros/ChangeLog |   21 +
 util-macros/Makefile.in   |   96 ---
 util-macros/aclocal.m4|  161 +++--
 util-macros/configure |  121 ++---
 util-macros/configure.ac  |2 
 util-macros/install-sh|  514 +-
 util-macros/missing   |   61 ++--
 util-macros/xorg-macros.m4|8 
 util-macros/xorg-macros.m4.in |6 
 util-macros/xorgversion.m4|4 
 11 files changed, 648 insertions(+), 350 deletions(-)

New commits:
commit 5e02f58f5670faad19c58e21ca5bcec0bd74
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 11:49:49 2008 +0100

util-macros 1.1.6.

diff --git a/debian/changelog b/debian/changelog
index cb4105b..33069bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 xutils-dev (1:7.2.ds2-2) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * debian/control:
 - C/R/P: imake, makedepend, xorg-build-macros, xmkmf
   Change from ubuntu to help upgrades from their earlier releases.
 
+  [ Julien Cristau ]
+  * util-macros 1.1.6.
+
  -- Timo Aaltonen <[EMAIL PROTECTED]>  Mon,  4 Jun 2007 12:12:41 +0300
 
 xutils-dev (1:7.2.ds2-1) unstable; urgency=low
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index d633f8b..a3bee74 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,24 @@
+commit e1c1ee013e72dafd7b00ca96a8d4a25273b88e15
+Author: Jeremy Huddleston <[EMAIL PROTECTED]>
+Date:   Sat Feb 16 02:18:50 2008 -0800
+
+Support version strings  like 1.2.3-blah4
+
+commit e20c503d24e5ccf03035aa0f6d833d235d2179df
+Author: Keith Packard <[EMAIL PROTECTED]>
+Date:   Mon Aug 13 19:21:58 2007 -0700
+
+Cannot use AC_CHECK_FILE when cross compiling; assume no LINUXDOC.
+
+As AC_CHECK_FILE cannot be used when cross compiling, just assume linuxdoc
+is not present.
+
+commit f2ddb356d86225a8ff6d1d1397fb2156cebd360f
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date:   Sun Dec 24 06:17:44 2006 +0200
+
+bump to 1.1.5
+
 commit e8b485d9252ffbb357a0b987ab1488d4033b555c
 Author: Matthieu Herrb <[EMAIL PROTECTED]>
 Date:   Mon Dec 18 18:25:25 2006 -0800
diff --git a/util-macros/Makefile.in b/util-macros/Makefile.in
index ed1d48e..d8fafea 100644
--- a/util-macros/Makefile.in
+++ b/util-macros/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -64,7 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = xorg-macros.m4
 SOURCES =
@@ -100,6 +96,7 @@ DEFS = @DEFS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -108,6 +105,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -119,11 +117,16 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -147,8 +150,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_