xterm-257.tgz

2010-04-22 Thread Thomas Dickey
Patch #257 - 2010/4/22

 * correct  ctlseqs.ms  description  of  OSC  17 and OSC 19 (patch by
   Emanuele Giaquinta).
 * corrected  logic  for  menuLocale resource; the setlocale function
   returns the original locale only when querying.
 * improve filtering of translations resource, narrowing the scope of
   the  alwaysUseMods  to  address  only  the translations that would
   cause a key to be sent to the host (report by Andrew Gaylard).
 * change default value of menuLocale resource to "C", to work around
   longstanding [261]Xorg bug.
 * modify handling of scrollKey feature to ignore XON/XOFF keys.
 * implement scroll-lock feature.
 * revise memory allocation in UTF8toLatin1() to fix an out-of-bounds
   index (Mandriva #54531).
 * compute  value for first wide-character rather than assuming it is
   256,  fixes problem with -cjk_width introduced in patches [262]242
   and [263]249 (report by Thomas Wolff).
 * improve configure script:
  + corrected check for _XOPEN_SOURCE for OpenSolaris.
  + when  possible,  add  rpath  option  for libraries in unusual
places
  + add  configure option --disable-rpath-hack to control whether
the rpath option can be added.
 * modify AllocateTermColor() to separate initialization from control
   sequences,  fixing  problem  from  [264]patch  #254  changes where
   enabling allowSendEvents resource prevents setting cursor color on
   command-line (Debian #572928).
 * amend  logic  from [265]patch #185 to not reallocate cell-array if
   processing  ESC % G  to switch from UTF-8 if already in ISO-8859-1
   character set (report by Michael Koehne).
 * fix to avoid calling XmuInternStrings() with zero count (report by
   Johan Bockgård).
 * fix build when --disable-ansi-color configure option is used.
 * fix build when neither OPT_TCAP_QUERY or OPT_TCAP_FKEYS is defined
   (patch by Matthieu Herrb)

-- 
Thomas E. Dickey 
http://invisible-island.net
ftp://invisible-island.net


signature.asc
Description: Digital signature


Bug#578026: xserver-xorg-video-nouveau: should not migrate to testing before linux-2.6

2010-04-22 Thread Julien Cristau
On Wed, Apr 21, 2010 at 18:54:17 +0200, Sven Joachim wrote:

> So you are saying: "It does not really matter that the package is
> unusable, because it isn't used by default."  Interesting point of view,
> but not quite in the spirit of http://www.debian.org/devel/testing, I am
> afraid.
> 
No, what I'm saying is that delaying the move of -nouveau to testing
doesn't buy us much, if anything, in terms of actual breakage for users,
and avoids having to make 3 source packages migrate to testing at the
same time.  Sure, it means -nouveau is in testing although it's not
actually usable with the testing kernel for a few days, but I don't
think it's that big a deal.

Cheers,
Julien


signature.asc
Description: Digital signature


Re: RFS: xserver-xorg-video-qxl

2010-04-22 Thread Liang Guo
在 星期四 22 四月 2010 08:21:54,Cyril Brulebois 写道:
> Hi!
> 
> (Keeping you Cc'd for now, I'm not sure which lists you're subscribed
> to.)
> 
> Liang Guo  (21/04/2010):
> > - dget http://mentors.debian.net/debian/pool/main/x/xserver-xorg-video-
> > qxl/xserver-xorg-video-qxl_0.0.12-1.dsc
> 
> I had a *very* quick look, and it didn't sound too bad. I'd have to
> double-check it of course, but it'd be nice if there were some git
> branches available somewhere, that'd ease reviewing.
> 
> Maybe you could start by publishing your branches on alioth's
> collab-maint or as public user git repository there?
Thankyou for your review and advice.

I've created a git repository on collab-maint, 

git://git.debian.org/git/collab-maint/xserver-xorg-video-qxl.git

I'll add Vcs-* fields in the next update. 

Thanks,   

-- 
Liang Guo
http://bluestone.cublog.cn


signature.asc
Description: This is a digitally signed message part.


Bug#578746: xserver-xorg-core: X server crashes from time to time

2010-04-22 Thread Julien Cristau
reassign 578746 xserver-xorg-video-intel 2:2.3.2-2+lenny6
severity 578746 important
close 578746 2:2.9.1-3
kthxbye

On Thu, Apr 22, 2010 at 15:21:19 +0200, Raphael Frey wrote:

> My X server crashes from time to time. (The screen gets dark/black 
> first, then it flickers and finally there an error message appears that 
> askes me if I want to see the log file of X server.) Sometimes there are 
> a couple of crashes during a week, sometimes there is no crash during a 
> month and then there is again a series of crashes. At first I thougt 
> that the problem is related to Open Office and Compiz because when the 
> crashes appeared I was using Open Office or Compiz (or both together). 
> But when the last crash occured, I was using neither of them. (I was 
> just using Iceweasel in a Gnome environment with only one or two opened 
> Nautilus windows. Please see my attached Xorg.0.log for more 
> informations.
> 
It's a fairly common issue with the version of the intel driver in lenny
on that generation of chips, unfortunately.  Some of those lockups can
be worked around with the EXANoComposite option in xorg.conf (see
exa(4)), or by switching the AccelMethod option to "XAA".  Thankfully
most of these hangs are gone with later versions of the driver, so I'm
marking this bug as fixed in squeeze (upcoming Debian 6.0).

Cheers,
Julien


signature.asc
Description: Digital signature


Processed: Re: Bug#578746: xserver-xorg-core: X server crashes from time to time

2010-04-22 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> reassign 578746 xserver-xorg-video-intel 2:2.3.2-2+lenny6
Bug #578746 [xserver-xorg-core] xserver-xorg-core: X server crashes from time 
to time
Bug reassigned from package 'xserver-xorg-core' to 'xserver-xorg-video-intel'.
Bug No longer marked as found in versions xorg-server/2:1.4.2-10.lenny2.
Bug #578746 [xserver-xorg-video-intel] xserver-xorg-core: X server crashes from 
time to time
Bug Marked as found in versions xserver-xorg-video-intel/2:2.3.2-2+lenny6.
> severity 578746 important
Bug #578746 [xserver-xorg-video-intel] xserver-xorg-core: X server crashes from 
time to time
Severity set to 'important' from 'grave'

> close 578746 2:2.9.1-3
Bug#578746: xserver-xorg-core: X server crashes from time to time
'close' is deprecated; see http://www.debian.org/Bugs/Developer#closing.
Bug marked as fixed in version 2:2.9.1-3, send any further explanations to 
Raphael Frey 

> kthxbye
Stopping processing here.

Please contact me if you need assistance.

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


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.127194663719285.transcr...@bugs.debian.org



Bug#578746: xserver-xorg-core: X server crashes from time to time

2010-04-22 Thread Raphael Frey
Dear Julien,

thanks for your rapid reply!

On Thu, 22 Apr 2010 16:30:26 +0200
Julien Cristau  wrote:

> reassign 578746 xserver-xorg-video-intel 2:2.3.2-2+lenny6
> severity 578746 important
> close 578746 2:2.9.1-3
> kthxbye
> 
>
> It's a fairly common issue with the version of the intel driver in lenny
> on that generation of chips, unfortunately.  Some of those lockups can
> be worked around with the EXANoComposite option in xorg.conf (see
> exa(4)), or by switching the AccelMethod option to "XAA".  Thankfully
> most of these hangs are gone with later versions of the driver, so I'm
> marking this bug as fixed in squeeze (upcoming Debian 6.0).
> 
> Cheers,
> Julien
> 


I’m a bit surprised that this problem won’t be fixed in Lenny although
it is a common bug according to you … I thought that Debian is intended
to be a stable distribution and if there’s still a bug in stable it’ll
be fixed quickly. I hope that your advice(s) will help.

Best regards

Raphael


pgpCBRiXPUazN.pgp
Description: PGP signature


Bug#578746: xserver-xorg-core: X server crashes from time to time

2010-04-22 Thread Julien Cristau
On Thu, Apr 22, 2010 at 20:00:20 +0200, Raphael Frey wrote:

> I’m a bit surprised that this problem won’t be fixed in Lenny although
> it is a common bug according to you … I thought that Debian is intended
> to be a stable distribution and if there’s still a bug in stable it’ll
> be fixed quickly. I hope that your advice(s) will help.
> 
So far we weren't able to figure out a fix which didn't involve as much
regression potential as upgrading to a newer driver entirely :/

If you can identify a fix for your particular issue, adding that to the
driver in lenny is possible; otherwise one option would be to get a
newer driver in the backports.org repository, which could also improve
support for some newer hardware, but I don't have any lenny machines on
intel hw, so I wouldn't be able to do any testing for that.

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#572928: #572928 xterm ignores cursorColor resource when allowSendEvents is on

2010-04-22 Thread Thomas Dickey
fixed in patch #257

-- 
Thomas E. Dickey 
http://invisible-island.net
ftp://invisible-island.net


signature.asc
Description: Digital signature


Processed: re: #572928 xterm ignores cursorColor resource when allowSendEvents is on

2010-04-22 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> tags 572928 fixed-upstream
Bug #572928 [xterm] xterm ignores cursorColor resource when allowSendEvents is 
on
Added tag(s) fixed-upstream.
> --
Stopping processing here.

Please contact me if you need assistance.

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


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.127196898816509.transcr...@bugs.debian.org



[PATCH] mesa: do not strip the same packages twice

2010-04-22 Thread Tormod Volden
From: Tormod Volden 

---
 debian/rules |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8a22ea8..76bed7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -233,7 +233,7 @@ binary-arch: install
dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
-   dh_strip -s
+   dh_strip -s --remaining-packages
dh_compress -s
dh_fixperms -s
dh_makeshlibs -s
-- 
1.7.0.4


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/1271968181-8911-1-git-send-email-lists.tor...@gmail.com



Bug#578825: Do not support font substitution mechanism provided by fontconfig

2010-04-22 Thread Juhapekka Tolvanen

Package: xterm
Version: 256-1
Severity: normal


I am japanophile (shinnichi), who is trying to learn Japanese
language. Therefore I have configured font substitution and virtual
fonts (Sans, Serif and Monospace) of my fontconfig this way:

1. When trying to find glyph for certain character, try Bitstream Vera
and its clones and derivatives first, especially DejaVu fonts.

2. If that fails, try Japanese fonts next (IPA-fonts, VL-fonts etc.)

3. And so on.

In fact, I have released those configs in WWW:

http://iki.fi/juhtolv/configs/fontconfig/

I also have released my X-resources in WWW:

http://iki.fi/juhtolv/configs/X/dot.Xresources.bz2

I also have this line in my shell configs:

export PANGO_LANGUAGE="fi;en;ja"

Unfortunately xterm do not support font substitution at all. I gave this
command:

xterm -fa 'Monospace' -fs 12

Then in that xterm window I gave this command:

lynx 'http://ja.wikipedia.org/wiki/%E3%82%A4%E3%83%A9%E3%82%AF'

All Japanese characters look like like boxes.

It is easy to see, how it fails: When some virtual font is called, it
only finds the first real font accepted for that virtual font and
that's all.


-- System Information:
Debian Release: squeeze/sid
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'testing-proposed-updates'), (500, 
'proposed-updates'), (101, 'testing'), (99, 'unstable')
Architecture: i386 (i686)

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

Versions of packages xterm depends on:
ii  libc6 2.10.2-6   Embedded GNU C Library: Shared lib
ii  libfontconfig12.8.0-2generic font configuration library
ii  libice6   2:1.0.6-1  X11 Inter-Client Exchange library
ii  libncurses5   5.7+20100313-2 shared libraries for terminal hand
ii  libutempter0  1.1.5-2A privileged helper for utmp/wtmp 
ii  libx11-6  2:1.3.3-3  X11 client-side library
ii  libxaw7   2:1.0.7-1  X11 Athena Widget library
ii  libxft2   2.1.14-2   FreeType-based font drawing librar
ii  libxmu6   2:1.0.5-1  X11 miscellaneous utility library
ii  libxt61:1.0.7-1  X11 toolkit intrinsics library
ii  xbitmaps  1.1.0-1Base X bitmaps

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

Versions of packages xterm suggests:
pn  xfonts-cyrillic(no description available)

-- no debconf information

-- 
Juhapekka "naula" Tolvanen * http colon slash slash iki dot fi slash juhtolv
"Quidquid Latine dictum sit altum videtur."



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20100422215523.ga31...@juhtolv.dyndns.org



[bts-link] source package xserver-xorg-video-nouveau

2010-04-22 Thread bts-link-upstream
#
# bts-link upstream status pull for source package xserver-xorg-video-nouveau
# see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html
#

user bts-link-upstr...@lists.alioth.debian.org

# remote status report for #578056 (http://bugs.debian.org/578056)
#  * https://bugs.freedesktop.org/show_bug.cgi?id=26980
#  * remote status changed: (?) -> NEW
usertags 578056 + status-NEW

thanks


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/2010041536.5035.6074.btsl...@merkel.debian.org



[bts-link] source package pixman

2010-04-22 Thread bts-link-upstream
#
# bts-link upstream status pull for source package pixman
# see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html
#

user bts-link-upstr...@lists.alioth.debian.org

# remote status report for #578072 (http://bugs.debian.org/578072)
#  * https://bugs.freedesktop.org/show_bug.cgi?id=27703
#  * remote status changed: (?) -> NEW
usertags 578072 + status-NEW

thanks


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/2010041541.5035.53827.btsl...@merkel.debian.org



[bts-link] source package xorg-server

2010-04-22 Thread bts-link-upstream
#
# bts-link upstream status pull for source package xorg-server
# see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html
#

user bts-link-upstr...@lists.alioth.debian.org

# remote status report for #578164 (http://bugs.debian.org/578164)
#  * https://bugs.freedesktop.org/show_bug.cgi?id=865
#  * remote status changed: (?) -> ASSIGNED
usertags 578164 + status-ASSIGNED

thanks


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/2010041549.5035.68741.btsl...@merkel.debian.org



Processed: re: #577010 xterm: non-eight bit input is completely broken

2010-04-22 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> merge 577010 577010
Bug#577010: xterm: non-eight bit input is completely broken
Merged 577010.

> --
Stopping processing here.

Please contact me if you need assistance.

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


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.127197907623277.transcr...@bugs.debian.org



Processed: re: #578008 xterm: ignores X bell setting

2010-04-22 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> reassign 578008 xserver-xorg-core
Bug #578008 [xterm] xterm: ignores X bell setting
Bug reassigned from package 'xterm' to 'xserver-xorg-core'.
Bug No longer marked as found in versions xterm/256-1.
> --
Stopping processing here.

Please contact me if you need assistance.

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


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.127197961026095.transcr...@bugs.debian.org



Re: [PATCH] mesa: do not strip the same packages twice

2010-04-22 Thread Julien Cristau
Hi Tormod,

On Thu, Apr 22, 2010 at 22:29:41 +0200, Tormod Volden wrote:

> From: Tormod Volden 
> 
> ---
>  debian/rules |2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/debian/rules b/debian/rules
> index 8a22ea8..76bed7d 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -233,7 +233,7 @@ binary-arch: install
>   dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
>   dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
>   dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
> - dh_strip -s
> + dh_strip -s --remaining-packages
>   dh_compress -s
>   dh_fixperms -s
>   dh_makeshlibs -s

Can you explain a bit more in the commit message what this fixes?  Is
that related to the pkg-create-dbgsym issue you had on ubuntu?

Cheers,
Julien


signature.asc
Description: Digital signature


xorg-server: Changes to 'ubuntu'

2010-04-22 Thread Bryce Harrington
 debian/changelog  |   23 +
 debian/patches/03_fedora_glx_versioning.diff  |  233 --
 debian/patches/04_fedora_glx14-swrast.diff|   26 -
 debian/patches/114_dri2_make_sure_x_drawable_exists.patch |   47 --
 debian/patches/series |4 
 5 files changed, 18 insertions(+), 315 deletions(-)

New commits:
commit 70e3e5a6169f0ffe4ccdc06ea785cdad24ab6972
Author: Bryce Harrington 
Date:   Thu Apr 22 17:25:30 2010 -0700

Target to lucid since this will go out with the release

diff --git a/debian/changelog b/debian/changelog
index 2fec97a..e1bc276 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.7.6-2ubuntu7) UNRELEASED; urgency=low
+xorg-server (2:1.7.6-2ubuntu7) lucid; urgency=low
 
   * Drop 117_fix_crash_with_createglyphset.patch
 - Dupe of patch 110
@@ -15,7 +15,7 @@ xorg-server (2:1.7.6-2ubuntu7) UNRELEASED; urgency=low
   Clutter crash, but which introduced a memory leak.
   (Fixes #565981)
 
- -- Bryce Harrington   Thu, 22 Apr 2010 16:59:00 -0700
+ -- Bryce Harrington   Thu, 22 Apr 2010 17:24:38 -0700
 
 xorg-server (2:1.7.6-2ubuntu6) lucid; urgency=low
 

commit d39e7f8077869da396004d73586f26a5b4b4f3ef
Author: Bryce Harrington 
Date:   Thu Apr 22 17:24:18 2010 -0700

Changelog entry explaining dropping of several patches

diff --git a/debian/changelog b/debian/changelog
index 5d81c29..2fec97a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
 xorg-server (2:1.7.6-2ubuntu7) UNRELEASED; urgency=low
 
-  * Drop 117_fix_crash_with_createglyphset.patch - dupe of patch 110
-
- -- Bryce Harrington   Fri, 16 Apr 2010 09:34:39 -0700
+  * Drop 117_fix_crash_with_createglyphset.patch
+- Dupe of patch 110
+  * Drop 03_fedora_glx_versioning.diff, 04_fedora_glx14-swrast.diff
+- These patches were brought in by Debian to provide glx 1.4 support
+  which Fedora backported from xserver 1.8, however testing in 
+  Ubuntu showed they caused a crash when closing Clutter apps (#550218),
+  and graphics corruption when opening windows.  Dropping these patches
+  returns us to GLX 1.2, which has been found to be stable; Debian has
+  also dropped these two patches.
+  (Fixes #565903).
+  * Drop 114_dri2_make_sure_x_drawable_exists.patch
+- This was an early attempt by upstream which fixed the aforementioned
+  Clutter crash, but which introduced a memory leak.
+  (Fixes #565981)
+
+ -- Bryce Harrington   Thu, 22 Apr 2010 16:59:00 -0700
 
 xorg-server (2:1.7.6-2ubuntu6) lucid; urgency=low
 

commit 8f73893da75abbc6017918cc69367144820507a4
Author: Bryce Harrington 
Date:   Thu Apr 22 17:23:46 2010 -0700

Drop 114; with glx 1.4 gone this is no longer relevant

diff --git a/debian/patches/114_dri2_make_sure_x_drawable_exists.patch 
b/debian/patches/114_dri2_make_sure_x_drawable_exists.patch
deleted file mode 100644
index 4fb4b9e..000
--- a/debian/patches/114_dri2_make_sure_x_drawable_exists.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/glx/glxcmds.c b/glx/glxcmds.c
-index 77afbf4..95a667a 100644
 a/glx/glxcmds.c
-+++ b/glx/glxcmds.c
-@@ -1086,6 +1086,7 @@ __glXDrawableInit(__GLXdrawable *drawable,
- XID drawId, __GLXconfig *config)
- {
- drawable->pDraw = pDraw;
-+drawable->xDrawId = pDraw->id;
- drawable->type = type;
- drawable->drawId = drawId;
- drawable->config = config;
-diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h
-index 2a365c5..227bc95 100644
 a/glx/glxdrawable.h
-+++ b/glx/glxdrawable.h
-@@ -52,6 +52,7 @@ struct __GLXdrawable {
- void  (*waitGL)(__GLXdrawable *);
- 
- DrawablePtr pDraw;
-+XID xDrawId;
- XID drawId;
- 
- /*
-diff --git a/glx/glxdri2.c b/glx/glxdri2.c
-index e791bf6..adfb18e 100644
 a/glx/glxdri2.c
-+++ b/glx/glxdri2.c
-@@ -102,12 +102,16 @@ __glXDRIdrawableDestroy(__GLXdrawable *drawable)
- {
- __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
- const __DRIcoreExtension *core = private->screen->core;
--
-+DrawablePtr pDraw;
-+int err;
-+
- (*core->destroyDrawable)(private->driDrawable);
- 
- /* If the X window was destroyed, the dri DestroyWindow hook will
-  * aready have taken care of this, so only call if pDraw isn't NULL. */
--if (drawable->pDraw != NULL)
-+err = dixLookupDrawable(&pDraw, drawable->xDrawId, serverClient, 0,
-+  DixWriteAccess);
-+if (err == Success && pDraw)
-   DRI2DestroyDrawable(drawable->pDraw);
- 
- __glXDrawableRelease(drawable);
diff --git a/debian/patches/series b/debian/patches/series
index d5ceb48..2263d50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,9 +2,6 @@
 ## Ubuntu patches start with 100.
 001_fedora_extramodes.patch
 02_Add-libgcrypt-and-libnettle-as-options-for-sha1.diff
-# 03 and 04 are backports from git master
-03_fedora_glx_v