+ patch 16_xdbedizzy_fix_crash.diff dropped, included upstream.

This commit is contained in:
Julien Cristau 2007-02-11 08:33:36 +01:00
parent bc87b470c2
commit 39f5de7bc6
3 changed files with 2 additions and 19 deletions

3
debian/changelog vendored
View File

@ -9,6 +9,7 @@ xbase-clients (1:7.2.ds1-1) UNRELEASED; urgency=low
* Update to setxkbmap 1.0.3.
* Update to xauth 1.0.2.
* Update to xdbedizzy 1.0.2.
+ patch 16_xdbedizzy_fix_crash.diff dropped, included upstream.
* Update to xedit 1.0.2.
* Update to xev 1.0.2.
* Update to xf86dga 1.0.2.
@ -28,7 +29,7 @@ xbase-clients (1:7.2.ds1-1) UNRELEASED; urgency=low
apply to xprop, xwd and xwininfo as well, since they all use a copy of
dsimple.c.
-- Julien Cristau <jcristau@debian.org> Sun, 11 Feb 2007 08:27:31 +0100
-- Julien Cristau <jcristau@debian.org> Sun, 11 Feb 2007 08:31:51 +0100
xbase-clients (1:7.1.ds1-2) unstable; urgency=low

View File

@ -1,17 +0,0 @@
This patch by Eugene Konev.
See Debian Bug #365291
diff a/xdbedizzy/xdbedizzy.c b/xdbedizzy/xdbedizzy.c
--- a/xdbedizzy/xdbedizzy.c Sun Apr 30 13:38:36 2006 +0800
+++ b/xdbedizzy/xdbedizzy.c Sun Apr 30 13:40:29 2006 +0800
@@ -701,8 +701,8 @@ int main(int argc, char *argv[])
/* Obtain some info about page geometry */
XpGetPageDimensions(dpy, pcontext, &dummy, &dummy, &winrect);
}
-#endif
else
+#endif
{
dpy = XOpenDisplay(display_name);
if (dpy == NULL) {

View File

@ -13,4 +13,3 @@
pkgconfig_naughtiness -p0
14_SECURITY_setuid.diff
15_xmore_fix_segv_without_xprint.diff -p2
16_xdbedizzy_fix_crash.diff