diff --git a/debian/changelog b/debian/changelog index d964c55..1f9b41e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xbase-clients (1:7.2.ds1-1) UNRELEASED; urgency=low * Update to xauth 1.0.2. * Update to xdbedizzy 1.0.2. + patch 16_xdbedizzy_fix_crash.diff dropped, included upstream. + + patch pkgconfig_naughtiness dropped, now unnecessary. * Update to xedit 1.0.2. * Update to xev 1.0.2. * Update to xf86dga 1.0.2. @@ -29,7 +30,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:31:51 +0100 + -- Julien Cristau Sun, 11 Feb 2007 08:34:58 +0100 xbase-clients (1:7.1.ds1-2) unstable; urgency=low diff --git a/debian/patches/pkgconfig_naughtiness b/debian/patches/pkgconfig_naughtiness deleted file mode 100644 index fd18abe..0000000 --- a/debian/patches/pkgconfig_naughtiness +++ /dev/null @@ -1,15 +0,0 @@ -Index: xdbedizzy/configure.ac -=================================================================== ---- xdbedizzy/configure.ac (revision 2182) -+++ xdbedizzy/configure.ac (working copy) -@@ -35,6 +35,10 @@ - - AC_ARG_ENABLE(xprint, AC_HELP_STRING([--enable-xprint], [Enable XPrint support]), - [use_xprint=$enableval],[use_xprint=auto]) -+ -+dnl Call this explicitly first, otherwise the following if may leave us -+dnl without $PKG_CONFIG defined! -+PKG_PROG_PKG_CONFIG - if test "x$use_xprint" = "xauto"; then - PKG_CHECK_MODULES(XPRINT, xp, use_xprint=yes, use_xprint=no) - fi diff --git a/debian/patches/series b/debian/patches/series index 186227f..3b8b2e4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,6 +10,5 @@ 11_xkb_documentation_updates.diff -p0 12_startx_paths.diff 13_xconsole_implicit_pointer_conversion.diff -pkgconfig_naughtiness -p0 14_SECURITY_setuid.diff 15_xmore_fix_segv_without_xprint.diff -p2