libxext: Changes to 'debian-experimental'
ChangeLog | 66 ++++++++++
configure.ac | 15 --
debian/changelog | 12 +
debian/control | 2
debian/libxext6.symbols | 130 +++++++++++++++++++++
debian/patches/01_Don-t-export-xgeExtRegister.diff | 26 ++++
debian/patches/series | 1
debian/rules | 2
debian/xsfbs/xsfbs.mk | 17 --
debian/xsfbs/xsfbs.sh | 4
man/Makefile.am | 41 +++---
src/XShm.c | 3
12 files changed, 268 insertions(+), 51 deletions(-)
New commits:
commit 5f6b73f2f2d9a5a9838bea11081d95e9b15efa43
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 28 15:46:42 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 4347762..0569a14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxext (2:1.1.1-1) UNRELEASED; urgency=low
+libxext (2:1.1.1-1) experimental; urgency=low
[ Timo Aaltonen ]
* New upstream release (closes: #555999).
@@ -8,7 +8,7 @@ libxext (2:1.1.1-1) UNRELEASED; urgency=low
* Add a symbols file for libxext6.
* Don't export xgeExtRegister.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:16:55 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 28 Nov 2009 15:46:39 +0100
libxext (2:1.0.99.4-1) experimental; urgency=low
commit 71ece2d2e94cbe1ad7b81f0da41a57a299cc3f13
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 28 15:46:35 2009 +0100
Don't export xgeExtRegister.
diff --git a/debian/changelog b/debian/changelog
index 2b3baa9..4347762 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libxext (2:1.1.1-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add a symbols file for libxext6.
+ * Don't export xgeExtRegister.
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:16:55 +0200
diff --git a/debian/patches/01_Don-t-export-xgeExtRegister.diff b/debian/patches/01_Don-t-export-xgeExtRegister.diff
new file mode 100644
index 0000000..c70f7c6
--- /dev/null
+++ b/debian/patches/01_Don-t-export-xgeExtRegister.diff
@@ -0,0 +1,26 @@
+From 5b63f1c71ac6ae05490fbe242bc0ee675fa09253 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sat, 28 Nov 2009 15:30:43 +0100
+Subject: [PATCH] Don't export xgeExtRegister
+
+Its only caller is XextAddDisplay()
+---
+ src/Xge.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Xge.c b/src/Xge.c
+index 7a583e5..2ea5d27 100644
+--- a/src/Xge.c
++++ b/src/Xge.c
+@@ -294,7 +294,7 @@ _xgeEventToWire(Display* dpy, XEvent* re, xEvent* event)
+ /*
+ * Extensions need to register callbacks for their events.
+ */
+-Bool
++_X_HIDDEN Bool
+ xgeExtRegister(Display* dpy, int offset, XExtensionHooks* callbacks)
+ {
+ XGEExtNode* newExt;
+--
+1.6.5
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..817efd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_Don-t-export-xgeExtRegister.diff
commit c66d25cd601ee5fc1d5aa91b96293e29239198a3
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 28 15:29:41 2009 +0100
Add XGE symbols to libxext6.symbols
diff --git a/debian/libxext6.symbols b/debian/libxext6.symbols
index ef2e522..551bb96 100644
--- a/debian/libxext6.symbols
+++ b/debian/libxext6.symbols
@@ -8,6 +8,8 @@ libXext.so.6 libxext6 #MINVER#
DPMSInfo@Base 0
DPMSQueryExtension@Base 0
DPMSSetTimeouts@Base 0
+ XGEQueryExtension@Base 2:1.1
+ XGEQueryVersion@Base 2:1.1
XLbxGetEventBase@Base 0
XLbxQueryExtension@Base 0
XLbxQueryVersion@Base 0
commit b57f13e017748cc2a11b8401102550bc47ad41eb
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 28 15:16:22 2009 +0100
Add a symbols file for libxext6.
diff --git a/debian/changelog b/debian/changelog
index b39c338..2b3baa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
libxext (2:1.1.1-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* New upstream release (closes: #555999).
* Bump the build-dep on xutils-dev (>= 1:7.5~1).
+ [ Julien Cristau ]
+ * Add a symbols file for libxext6.
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:16:55 +0200
libxext (2:1.0.99.4-1) experimental; urgency=low
diff --git a/debian/libxext6.symbols b/debian/libxext6.symbols
new file mode 100644
index 0000000..ef2e522
--- /dev/null
+++ b/debian/libxext6.symbols
@@ -0,0 +1,128 @@
+libXext.so.6 libxext6 #MINVER#
+ DPMSCapable@Base 0
+ DPMSDisable@Base 0
+ DPMSEnable@Base 0
+ DPMSForceLevel@Base 0
+ DPMSGetTimeouts@Base 0
+ DPMSGetVersion@Base 0
+ DPMSInfo@Base 0
+ DPMSQueryExtension@Base 0
+ DPMSSetTimeouts@Base 0
+ XLbxGetEventBase@Base 0
+ XLbxQueryExtension@Base 0
+ XLbxQueryVersion@Base 0
+ XMITMiscGetBugMode@Base 0
+ XMITMiscQueryExtension@Base 0
+ XMITMiscSetBugMode@Base 0
+ XMissingExtension@Base 0
+ XSecurityAllocXauth@Base 0
+ XSecurityFreeXauth@Base 0
+ XSecurityGenerateAuthorization@Base 0
+ XSecurityQueryExtension@Base 0
+ XSecurityRevokeAuthorization@Base 0
+ XSetExtensionErrorHandler@Base 0
+ XShapeCombineMask@Base 0
+ XShapeCombineRectangles@Base 0
+ XShapeCombineRegion@Base 0
+ XShapeCombineShape@Base 0
+ XShapeGetRectangles@Base 0
+ XShapeInputSelected@Base 0
+ XShapeOffsetShape@Base 0
+ XShapeQueryExtension@Base 0
+ XShapeQueryExtents@Base 0
+ XShapeQueryVersion@Base 0
+ XShapeSelectInput@Base 0
+ XShmAttach@Base 0
+ XShmCreateImage@Base 0
+ XShmCreatePixmap@Base 0
+ XShmDetach@Base 0
+ XShmGetEventBase@Base 0
+ XShmGetImage@Base 0
+ XShmPixmapFormat@Base 0
+ XShmPutImage@Base 0
+ XShmQueryExtension@Base 0
+ XShmQueryVersion@Base 0
+ XSyncAwait@Base 0
+ XSyncChangeAlarm@Base 0
+ XSyncChangeCounter@Base 0
+ XSyncCreateAlarm@Base 0
+ XSyncCreateCounter@Base 0
+ XSyncDestroyAlarm@Base 0
+ XSyncDestroyCounter@Base 0
+ XSyncFreeSystemCounterList@Base 0
+ XSyncGetPriority@Base 0
+ XSyncInitialize@Base 0
+ XSyncIntToValue@Base 0
+ XSyncIntsToValue@Base 0
+ XSyncListSystemCounters@Base 0
+ XSyncMaxValue@Base 0
+ XSyncMinValue@Base 0
+ XSyncQueryAlarm@Base 0
+ XSyncQueryCounter@Base 0
+ XSyncQueryExtension@Base 0
+ XSyncSetCounter@Base 0
+ XSyncSetPriority@Base 0
+ XSyncValueAdd@Base 0
+ XSyncValueEqual@Base 0
+ XSyncValueGreaterOrEqual@Base 0
+ XSyncValueGreaterThan@Base 0
+ XSyncValueHigh32@Base 0
+ XSyncValueIsNegative@Base 0
+ XSyncValueIsPositive@Base 0
+ XSyncValueIsZero@Base 0
+ XSyncValueLessOrEqual@Base 0
+ XSyncValueLessThan@Base 0
+ XSyncValueLow32@Base 0
+ XSyncValueSubtract@Base 0
+ XTestFakeAckType@Base 0
+ XTestFakeInput@Base 0
+ XTestFlush@Base 0
+ XTestGetInput@Base 0
+ XTestInputActionType@Base 0
+ XTestMovePointer@Base 0
+ XTestPressButton@Base 0
+ XTestPressKey@Base 0
+ XTestQueryInputSize@Base 0
+ XTestReset@Base 0
+ XTestStopInput@Base 0
+ XagCreateAssociation@Base 0
+ XagCreateEmbeddedApplicationGroup@Base 0
+ XagCreateNonembeddedApplicationGroup@Base 0
+ XagDestroyApplicationGroup@Base 0
+ XagDestroyAssociation@Base 0
+ XagGetApplicationGroupAttributes@Base 0
+ XagQueryApplicationGroup@Base 0
+ XagQueryVersion@Base 0
+ XcupGetReservedColormapEntries@Base 0
+ XcupQueryVersion@Base 0
+ XcupStoreColors@Base 0
+ XdbeAllocateBackBufferName@Base 0
+ XdbeBeginIdiom@Base 0
+ XdbeDeallocateBackBufferName@Base 0
+ XdbeEndIdiom@Base 0
+ XdbeFreeVisualInfo@Base 0
+ XdbeGetBackBufferAttributes@Base 0
+ XdbeGetVisualInfo@Base 0
+ XdbeQueryExtension@Base 0
+ XdbeSwapBuffers@Base 0
+ XeviGetVisualInfo@Base 0
+ XeviQueryExtension@Base 0
+ XeviQueryVersion@Base 0
+ XextAddDisplay@Base 0
+ XextCreateExtension@Base 0
+ XextDestroyExtension@Base 0
+ XextFindDisplay@Base 0
+ XextRemoveDisplay@Base 0
+ XmbufChangeBufferAttributes@Base 0
+ XmbufChangeWindowAttributes@Base 0
+ XmbufClearBufferArea@Base 0
+ XmbufCreateBuffers@Base 0
+ XmbufCreateStereoWindow@Base 0
+ XmbufDestroyBuffers@Base 0
+ XmbufDisplayBuffers@Base 0
+ XmbufGetBufferAttributes@Base 0
+ XmbufGetScreenInfo@Base 0
+ XmbufGetVersion@Base 0
+ XmbufGetWindowAttributes@Base 0
+ XmbufQueryExtension@Base 0
+ _XExtensionErrorFunction@Base 0
diff --git a/debian/rules b/debian/rules
index b5a480e..0cc5d8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,7 @@ binary-arch: build install
dh_strip --dbg-package=$(PACKAGE)-dbg
dh_compress
dh_fixperms
- dh_makeshlibs
+ dh_makeshlibs -- -c4
dh_shlibdeps
dh_installdeb
dh_gencontrol
commit 62d62b5c81e05d8792cbb5ec0163b2eb58ffe801
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 25 18:26:31 2009 +0100
Add bug closer
diff --git a/debian/changelog b/debian/changelog
index 378c5e6..b39c338 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
libxext (2:1.1.1-1) UNRELEASED; urgency=low
- * New upstream release.
+ * New upstream release (closes: #555999).
* Bump the build-dep on xutils-dev (>= 1:7.5~1).
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:16:55 +0200
commit b2ca878241aeadea50ba8ba9832f91b84cd022f7
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 23 14:18:02 2009 +0200
Bump the build-dep on xutils-dev (>= 1:7.5~1).
diff --git a/debian/changelog b/debian/changelog
index 3e30229..378c5e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxext (2:1.1.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump the build-dep on xutils-dev (>= 1:7.5~1).
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:16:55 +0200
diff --git a/debian/control b/debian/control
index 8de5e3a..4af7274 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
pkg-config,
automake,
libtool,
- xutils-dev (>= 1:7.4+4),
+ xutils-dev (>= 1:7.5~1),
quilt
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxext
commit 6a530e89febd8d453c4e71516c694dc7575a9158
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 23 14:17:34 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 18d6404..bc5b412 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,69 @@
+commit ed7bbe65222286828fa42f3c264ed5c4190fe58c
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Oct 21 20:13:24 2009 -0700
+
+ libXext 1.1.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 341bddfc6eddef77e57dd64a084b69fd24bba152
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Oct 21 20:12:49 2009 -0700
+
+ Use $(AM_V_GEN) to silence makefile generation rules
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 38c351f2f49d44944958e9b4d003a74bd6d8d683
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Wed Oct 21 12:47:25 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
+commit 956fd30e1046e5779ac0b6c07ec4f0e87250869a
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Wed Oct 7 19:31:21 2009 -0700
+
+ XAllocID must only be called with the Display lock held.
+
+ This patch makes XShmAttach follow the same XID allocation pattern used in
+ other stubs, such as XShmCreatePixmap.
+
+ Reported-by: <fdsteve@ihug.co.nz>
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+
+commit 927e3260bcf1ad020228e8f2dce0176269982b4f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Oct 2 10:52:13 2009 +1000
+
+ libXext 1.1
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 003e2eb714c39984b3c054e0fc637cdb051dcdf3
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Oct 2 10:43:14 2009 +1000
+
+ Require macros 1.3 for XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit e29cd70df7d5abdccb6b7ed973611044d02241d0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 21 13:38:01 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index b1e91f1..3e30229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxext (2:1.1.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 14:16:55 +0200
+
libxext (2:1.0.99.4-1) experimental; urgency=low
[ Julien Cristau ]
commit ed7bbe65222286828fa42f3c264ed5c4190fe58c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 21 20:13:24 2009 -0700
libXext 1.1.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index d0a3d2f..8c674a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libXext],
- 1.1,
+ 1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXext)
commit 341bddfc6eddef77e57dd64a084b69fd24bba152
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 21 20:12:49 2009 -0700
Use $(AM_V_GEN) to silence makefile generation rules
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 20f333c..f3447bd 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -48,25 +48,26 @@ EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA)
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-BUILT_SOURCES = shadows.DONE
-
-shadows.DONE:
- -rm -f $(all_aliases:=.@LIB_MAN_SUFFIX@)
- (for i in $(XShape_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/XShape.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XShm_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/XShm.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(Xmbuf_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xmbuf.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(Xevi_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xevi.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- touch shadows.DONE
-
-CLEANFILES += shadows.DONE
+
+XShape_shadowmen = $(XShape_man_aliases:=.@LIB_MAN_SUFFIX@)
+
+$(XShape_shadowmen):
+ $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XShape.$(LIB_MAN_SUFFIX) > $@
+
+XShm_shadowmen = $(XShm_man_aliases:=.@LIB_MAN_SUFFIX@)
+
+$(XShm_shadowmen):
+ $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XShm.$(LIB_MAN_SUFFIX) > $@
+
+Xmbuf_shadowmen = $(Xmbuf_man_aliases:=.@LIB_MAN_SUFFIX@)
+
+$(Xmbuf_shadowmen):
+ $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xmbuf.$(LIB_MAN_SUFFIX) > $@
+
+Xevi_shadowmen = $(Xevi_man_aliases:=.@LIB_MAN_SUFFIX@)
+
+$(Xevi_shadowmen):
+ $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xevi.$(LIB_MAN_SUFFIX) > $@
# Rules for generating files using the C pre-processor
# (Replaces CppFileTarget from Imake)
@@ -106,5 +107,5 @@ MANDEFS = \
-D__projectroot__=$(prefix)
.man.$(LIB_MAN_SUFFIX):
- $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
commit 38c351f2f49d44944958e9b4d003a74bd6d8d683
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 21 12:47:25 2009 -0700
This is not a GNU project, so declare it foreign.
On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
> On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
> > I noticed an INSTALL file in xlsclients and libXvMC today, and it
> > was quite annoying to work around since 'autoreconf -fvi' replaces
> > it and git wants to commit it. Should these files even be in git?
> > Can I nuke them for the betterment of humanity and since they get
> > created by autoreconf anyways?
>
> See https://bugs.freedesktop.org/show_bug.cgi?id=24206
As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
of the INSTALL file. It is also part of the 24206 solution.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
diff --git a/configure.ac b/configure.ac
index ebbf113..d0a3d2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_INIT([libXext],
libXext)
AC_CONFIG_SRCDIR([Makefile.am])
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 956fd30e1046e5779ac0b6c07ec4f0e87250869a
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 7 19:31:21 2009 -0700
XAllocID must only be called with the Display lock held.
This patch makes XShmAttach follow the same XID allocation pattern used in
other stubs, such as XShmCreatePixmap.
Reported-by: <fdsteve@ihug.co.nz>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
diff --git a/src/XShm.c b/src/XShm.c
index 922b4cb..38efa9f 100644
--- a/src/XShm.c
+++ b/src/XShm.c
@@ -235,12 +235,11 @@ Status XShmAttach(Display *dpy, XShmSegmentInfo *shminfo)
ShmCheckExtension (dpy, info, 0);
- shminfo->shmseg = XAllocID(dpy);
LockDisplay(dpy);
GetReq(ShmAttach, req);
req->reqType = info->codes->major_opcode;
req->shmReqType = X_ShmAttach;
- req->shmseg = shminfo->shmseg;
+ req->shmseg = shminfo->shmseg = XAllocID(dpy);
req->shmid = shminfo->shmid;
req->readOnly = shminfo->readOnly ? xTrue : xFalse;
UnlockDisplay(dpy);
commit 927e3260bcf1ad020228e8f2dce0176269982b4f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 2 10:52:13 2009 +1000
libXext 1.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index d19b087..ebbf113 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libXext],
- 1.0.99.4,
+ 1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXext)
commit 003e2eb714c39984b3c054e0fc637cdb051dcdf3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 2 10:43:14 2009 +1000
Require macros 1.3 for XORG_DEFAULT_OPTIONS
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 38bdc93..d19b087 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,9 +12,9 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER([config.h])
# Determine .so library version per platform
@@ -32,7 +32,7 @@ AC_SUBST(XEXT_SOREV)
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.99.2])
@@ -46,12 +46,9 @@ AC_SUBST(XEXT_LIBS)
AC_HEADER_STDC
XORG_CHECK_MALLOC_ZERO
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
# Man page processing requirements
XORG_PROG_RAWCPP
-XORG_MANPAGE_SECTIONS
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
- debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
Reply to: