diff -u libxi-1.3/debian/rules libxi-1.3/debian/rules --- libxi-1.3/debian/rules +++ libxi-1.3/debian/rules @@ -35,18 +35,18 @@ configure: $(STAMP_DIR)/patch autoreconf -vfi -obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure - mkdir -p obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ +build/config.status: configure + mkdir -p build + cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" build: build-stamp -build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status +build-stamp: build/config.status dh_testdir - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + cd build && $(MAKE) touch build-stamp @@ -59,7 +59,7 @@ rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* rm -rf autom4te.cache */autom4te.cache - rm -rf obj-* + rm -rf build rm -f $$(find -name Makefile.in) rm -f INSTALL compile config.guess config.sub configure config.h.in rm -f depcomp install-sh ltmain.sh missing aclocal.m4 mkinstalldirs @@ -72,7 +72,7 @@ dh_clean -k dh_installdirs - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. binary-arch: build install diff -u libxi-1.3/debian/control libxi-1.3/debian/control --- libxi-1.3/debian/control +++ libxi-1.3/debian/control @@ -2,7 +2,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force -Uploaders: David Nusinow , Drew Parsons , Jamey Sharp , Josh Triplett , Julien Cristau +Uploaders: David Nusinow , Drew Parsons Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev (>= 7.0.13), @@ -17,7 +17,7 @@ xutils-dev (>= 1:7.4+4), automake, libtool -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxi Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxi.git diff -u libxi-1.3/debian/changelog libxi-1.3/debian/changelog --- libxi-1.3/debian/changelog +++ libxi-1.3/debian/changelog @@ -1,3 +1,22 @@ +libxi (2:1.3-3) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + * Update patch from 2:1.3-2 to not crash if an app (like, say, anything + using Qt3) calls libXi functions but the extension isn't available + (closes: #568323). Thanks, Roman Mamedov! + + [ Brice Goglin ] + * Remove Jamey Sharp and Josh Triplett from Uploaders, closes: #568276. + + [ Cyril Brulebois ] + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). + * Upload to unstable. + + -- Cyril Brulebois Wed, 03 Mar 2010 22:14:43 +0100 + libxi (2:1.3-2) unstable; urgency=low * Initialize extension with the right number of events. This should fix diff -u libxi-1.3/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch libxi-1.3/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch --- libxi-1.3/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch +++ libxi-1.3/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch @@ -18,11 +18,11 @@ src/XIint.h | 1 + 3 files changed, 77 insertions(+), 9 deletions(-) -diff --git a/src/XExtInt.c b/src/XExtInt.c -index e87ead8..125a72e 100644 ---- a/src/XExtInt.c -+++ b/src/XExtInt.c -@@ -173,6 +173,64 @@ static char *XInputErrorList[] = { +Index: libxi/src/XExtInt.c +=================================================================== +--- libxi.orig/src/XExtInt.c ++++ libxi/src/XExtInt.c +@@ -173,6 +173,64 @@ "BadClass, invalid event class", /* BadClass */ }; @@ -87,7 +87,7 @@ _X_HIDDEN XExtDisplayInfo *XInput_find_display (Display *dpy) { -@@ -180,10 +237,12 @@ XExtDisplayInfo *XInput_find_display (Display *dpy) +@@ -180,12 +238,16 @@ if (!xinput_info) { if (!(xinput_info = XextCreateExtension())) return NULL; } if (!(dpyinfo = XextFindDisplay (xinput_info, dpy))) { @@ -97,15 +97,21 @@ xinput_extension_name, &xinput_extension_hooks, - IEVENTS, NULL); +- XESetWireToEventCookie(dpy, dpyinfo->codes->major_opcode, XInputWireToCookie); +- XESetCopyEventCookie(dpy, dpyinfo->codes->major_opcode, XInputCopyCookie); + nevents, NULL); - XESetWireToEventCookie(dpy, dpyinfo->codes->major_opcode, XInputWireToCookie); - XESetCopyEventCookie(dpy, dpyinfo->codes->major_opcode, XInputCopyCookie); ++ if (dpyinfo->codes) { ++ XESetWireToEventCookie(dpy, dpyinfo->codes->major_opcode, XInputWireToCookie); ++ XESetCopyEventCookie(dpy, dpyinfo->codes->major_opcode, XInputCopyCookie); ++ } } -diff --git a/src/XGetVers.c b/src/XGetVers.c -index 3b500ae..4718617 100644 ---- a/src/XGetVers.c -+++ b/src/XGetVers.c -@@ -72,19 +72,15 @@ XGetExtensionVersion(register Display * dpy, _Xconst char *name) + return dpyinfo; + } +Index: libxi/src/XGetVers.c +=================================================================== +--- libxi.orig/src/XGetVers.c ++++ libxi/src/XGetVers.c +@@ -72,19 +72,15 @@ return (ext); } @@ -128,7 +134,7 @@ req->ReqType = X_GetExtensionVersion; req->nbytes = strlen(name); req->length += (unsigned)(req->nbytes + 3) >> 2; -@@ -93,6 +89,7 @@ _XiGetExtensionVersion(register Display * dpy, _Xconst char *name, +@@ -93,6 +89,7 @@ if (!_XReply(dpy, (xReply *) & rep, 0, xTrue)) { return (XExtensionVersion *) NULL; } @@ -136,7 +142,7 @@ ext = (XExtensionVersion *) Xmalloc(sizeof(XExtensionVersion)); if (ext) { ext->present = rep.present; -@@ -101,5 +98,16 @@ _XiGetExtensionVersion(register Display * dpy, _Xconst char *name, +@@ -101,5 +98,16 @@ ext->minor_version = rep.minor_version; } } @@ -154,11 +160,11 @@ + + return _XiGetExtensionVersionRequest(dpy, name, info->codes->major_opcode); } -diff --git a/src/XIint.h b/src/XIint.h -index 400c920..00e84d3 100644 ---- a/src/XIint.h -+++ b/src/XIint.h -@@ -14,6 +14,7 @@ extern XExtDisplayInfo *XInput_find_display(Display *); +Index: libxi/src/XIint.h +=================================================================== +--- libxi.orig/src/XIint.h ++++ libxi/src/XIint.h +@@ -14,6 +14,7 @@ extern int _XiCheckExtInit(Display *, int, XExtDisplayInfo *); extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *); @@ -169,3 +174,0 @@ --- -1.6.6 -