libx11: Changes to 'debian-unstable'
debian/README.source | 2 +-
debian/changelog | 11 +++++++++--
debian/xsfbs/xsfbs.mk | 13 +++++++------
src/XlibInt.c | 2 ++
4 files changed, 19 insertions(+), 9 deletions(-)
New commits:
commit 92fc50bcca97973014a54e8ee46437b8f8ba3da9
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 13 14:46:20 2010 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 4f71f92..789b2b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.3.3-3) UNRELEASED; urgency=low
+libx11 (2:1.3.3-3) unstable; urgency=low
[ Julien Cristau ]
* Drop manpage from libx11-6-udeb.
@@ -11,7 +11,7 @@ libx11 (2:1.3.3-3) UNRELEASED; urgency=low
RECORD extension is enabled (Closes: #536491; LP: #378648).
* Merge xsfbs/debian-unstable to fix double autoreconf runs.
- -- Cyril Brulebois <kibi@debian.org> Tue, 13 Apr 2010 13:41:13 +0200
+ -- Cyril Brulebois <kibi@debian.org> Tue, 13 Apr 2010 14:46:16 +0200
libx11 (2:1.3.3-2) unstable; urgency=low
commit 07d3b96d9e35eafea7a6d39870c2886aa3e01a0d
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 13 14:46:10 2010 +0200
Add LP bug closure (LP: #378648).
diff --git a/debian/changelog b/debian/changelog
index 3c542fa..4f71f92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ libx11 (2:1.3.3-3) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Cherry-pick patch from upstream to run user's synchandlers as well as
any internal synchandlers: 75ea8c3793. This fixes xnee issues when
- RECORD extension is enabled (Closes: #536491).
+ RECORD extension is enabled (Closes: #536491; LP: #378648).
* Merge xsfbs/debian-unstable to fix double autoreconf runs.
-- Cyril Brulebois <kibi@debian.org> Tue, 13 Apr 2010 13:41:13 +0200
commit d9db5495a47590c73578edeeb505407a1b12036e
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 13 14:43:18 2010 +0200
Add changelog entry for xsfbs/debian-unstable merge.
diff --git a/debian/changelog b/debian/changelog
index 367745a..3c542fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libx11 (2:1.3.3-3) UNRELEASED; urgency=low
* Cherry-pick patch from upstream to run user's synchandlers as well as
any internal synchandlers: 75ea8c3793. This fixes xnee issues when
RECORD extension is enabled (Closes: #536491).
+ * Merge xsfbs/debian-unstable to fix double autoreconf runs.
-- Cyril Brulebois <kibi@debian.org> Tue, 13 Apr 2010 13:41:13 +0200
commit d8b9400fa884675ba7120ade3d8f35981b7a6c14
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 13 14:37:38 2010 +0200
Add xnee bug closure (Closes: #536491).
diff --git a/debian/changelog b/debian/changelog
index 138939c..367745a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ libx11 (2:1.3.3-3) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Cherry-pick patch from upstream to run user's synchandlers as well as
- any internal synchandlers: 75ea8c3793.
+ any internal synchandlers: 75ea8c3793. This fixes xnee issues when
+ RECORD extension is enabled (Closes: #536491).
-- Cyril Brulebois <kibi@debian.org> Tue, 13 Apr 2010 13:41:13 +0200
commit d5a388aea77ada968a31e5eae7bdf7b608e23761
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 13 13:44:45 2010 +0200
Add changelog entry.
diff --git a/debian/changelog b/debian/changelog
index a82c0f3..138939c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
libx11 (2:1.3.3-3) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Drop manpage from libx11-6-udeb.
* Don't install X11 locale data in the udeb. The installer uses only gtk
apps so this is useless (and big).
- -- Julien Cristau <jcristau@debian.org> Fri, 19 Mar 2010 22:43:23 +0100
+ [ Cyril Brulebois ]
+ * Cherry-pick patch from upstream to run user's synchandlers as well as
+ any internal synchandlers: 75ea8c3793.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 13 Apr 2010 13:41:13 +0200
libx11 (2:1.3.3-2) unstable; urgency=low
commit 63ff4d296c82e4742d9a5326a871f8e03702323d
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon Apr 12 11:30:20 2010 -0700
Run the user's synchandler as well as any internal synchandlers.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27595
Signed-off-by: Jamey Sharp <jamey@minilop.net>
(cherry picked from commit 75ea8c37935ccc911557d16a303ba595b8ab106b)
diff --git a/src/XlibInt.c b/src/XlibInt.c
index fb6e715..3555dd1 100644
--- a/src/XlibInt.c
+++ b/src/XlibInt.c
@@ -595,6 +595,8 @@ _XPrivSyncFunction (Display *dpy)
dpy->synchandler = dpy->savedsynchandler;
dpy->savedsynchandler = NULL;
dpy->flags &= ~XlibDisplayPrivSync;
+ if(dpy->synchandler)
+ dpy->synchandler(dpy);
_XIDHandler(dpy);
_XSeqSyncFunction(dpy);
return 0;
commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 13 14:06:33 2010 +0200
xsfbs.mk: don't use a directory as a make target
The timestamp on the directory gets updated each time a file is added in
it, which causes useless rebuilds.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e16b10..351fea5 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts
>$@
-.PHONY: log
-stampdir_targets+=log
-log: $(STAMP_DIR)/log
-$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+.PHONY: logdir
+stampdir_targets+=logdir
+logdir: $(STAMP_DIR)/logdir
+$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
mkdir -p $(STAMP_DIR)/log
+ >$@
# Apply all patches to the upstream source.
.PHONY: patch
@@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/log
+unpatch: $(STAMP_DIR)/logdir
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Apr 1 20:49:15 2010 +0200
Fix typo.
diff --git a/debian/README.source b/debian/README.source
index 34ab4bf..b09a1ab 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch.
Otherwise, the upstream sources are manually installed in the Debian
git repository.
-The .orig.tar.gz upstream source file could be generated this
+The .orig.tar.gz upstream source file could be generated using this
"upstream-*" branch in the Debian git repository but it is actually
copied from upstream tarballs directly.
Reply to: