From 39f5de7bc690d3e2d8b8b1898f0c449dab36e92d Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sun, 11 Feb 2007 08:33:36 +0100 Subject: [PATCH] + patch 16_xdbedizzy_fix_crash.diff dropped, included upstream. --- debian/changelog | 3 ++- debian/patches/16_xdbedizzy_fix_crash.diff | 17 ----------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 debian/patches/16_xdbedizzy_fix_crash.diff diff --git a/debian/changelog b/debian/changelog index a7c0a44..d964c55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sun, 11 Feb 2007 08:27:31 +0100 + -- Julien Cristau Sun, 11 Feb 2007 08:31:51 +0100 xbase-clients (1:7.1.ds1-2) unstable; urgency=low diff --git a/debian/patches/16_xdbedizzy_fix_crash.diff b/debian/patches/16_xdbedizzy_fix_crash.diff deleted file mode 100644 index a908b15..0000000 --- a/debian/patches/16_xdbedizzy_fix_crash.diff +++ /dev/null @@ -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) { diff --git a/debian/patches/series b/debian/patches/series index 19d7671..186227f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,4 +13,3 @@ pkgconfig_naughtiness -p0 14_SECURITY_setuid.diff 15_xmore_fix_segv_without_xprint.diff -p2 -16_xdbedizzy_fix_crash.diff