debian/changelog | 7 +++++
debian/control | 4 +--
debian/patches/01_sessreg_implement_hostname_hashing.diff | 6 ++--
debian/patches/02_xmodmap_manpage.diff | 17 --------------
debian/patches/series | 3 --
5 files changed, 13 insertions(+), 24 deletions(-)
New commits:
commit 6e01e40661179f6a6b023f542b99446d5f27918f
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Dec 6 13:51:33 2009 +0100
Add bug closer
diff --git a/debian/changelog b/debian/changelog
index d17ae0f..d8d2adc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ x11-xserver-utils (7.5+1) UNRELEASED; urgency=low
* xrefresh 1.0.3.
* xset 1.1.0.
+ Fix some typos in the manpage, closes: #525255.
+ + Avoid warning from "xset r rate" when XF86Misc extension is not present,
+ closes: #526028.
* xsetroot 1.0.3.
* Suggests: xorg-docs-core since some manpages reference it in their
SEE ALSO section. Thanks Vincent Lefevre. Closes: #541220.
commit 9c340cde280dfae919ad60a9688defb6d657f2f2
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Dec 6 13:47:59 2009 +0100
Make 01_sessreg_implement_hostname_hashing.diff apply with -p1 instead of
-p0.
diff --git a/debian/changelog b/debian/changelog
index 28b35e4..d17ae0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ x11-xserver-utils (7.5+1) UNRELEASED; urgency=low
* Remove xtrap (closes: #547547).
* Drop libxxf86misc-dev from Build-Depends. It's optional for xset, and
recent X servers don't support this extension anymore.
+ * Make 01_sessreg_implement_hostname_hashing.diff apply with -p1 instead of
+ -p0.
[ Brice Goglin ]
* iceauth 1.0.3.
diff --git a/debian/patches/01_sessreg_implement_hostname_hashing.diff
b/debian/patches/01_sessreg_implement_hostname_hashing.diff
index 370c3fe..887a54c 100644
--- a/debian/patches/01_sessreg_implement_hostname_hashing.diff
+++ b/debian/patches/01_sessreg_implement_hostname_hashing.diff
@@ -17,10 +17,10 @@ Not submitted to XFree86.
sessreg/sessreg.c | 164
++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 152 insertions(+), 12 deletions(-)
-Index: sessreg/sessreg.c
+Index: a/sessreg/sessreg.c
===================================================================
---- sessreg/sessreg.c.orig 2009-12-06 13:02:16.000000000 +0100
-+++ sessreg/sessreg.c 2009-12-06 13:30:49.000000000 +0100
+--- a/sessreg/sessreg.c.orig 2009-12-06 13:02:16.000000000 +0100
++++ b/sessreg/sessreg.c 2009-12-06 13:30:49.000000000 +0100
@@ -97,6 +97,18 @@
const char *host, Time_t date, int addp);
#endif
diff --git a/debian/patches/series b/debian/patches/series
index a068c05..2044539 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_sessreg_implement_hostname_hashing.diff -p0
+01_sessreg_implement_hostname_hashing.diff
commit 7b2d25d5d0aeb31c98c9fbf4ec50a3eed4f5106b
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Dec 6 13:44:18 2009 +0100
02_xmodmap_manpage.diff is obsolete
diff --git a/debian/changelog b/debian/changelog
index 1fe1fdb..28b35e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ x11-xserver-utils (7.5+1) UNRELEASED; urgency=low
* xgamma 1.0.3.
* xhost 1.0.3.
* xmodmap 1.0.4.
+ + fix XKeysymDB path in manpage, obsoleting 02_xmodmap_manpage.diff
* xrandr 1.3.2.
* xrdb 1.0.6.
* xrefresh 1.0.3.
diff --git a/debian/patches/02_xmodmap_manpage.diff
b/debian/patches/02_xmodmap_manpage.diff
deleted file mode 100644
index 1341ead..0000000
--- a/debian/patches/02_xmodmap_manpage.diff
+++ /dev/null
@@ -1,17 +0,0 @@
----
- xmodmap/xmodmap.man | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: x11-xserver-utils/xmodmap/xmodmap.man
-===================================================================
---- x11-xserver-utils.orig/xmodmap/xmodmap.man 2009-05-11 19:11:44.000000000
+0200
-+++ x11-xserver-utils/xmodmap/xmodmap.man 2009-12-06 13:32:33.000000000
+0100
-@@ -141,7 +141,7 @@
- used to perform the corresponding set of \fBkeycode\fP expressions.
- The list of keysym names may be
- found in the header file \fI<X11/keysymdef.h>\fP (without the \fIXK_\fP
prefix)
--or the keysym database \fI __X11datadir__/XKeysymDB\fP. Note that
-+or the keysym database \fI __projectroot__/share/X11/XKeysymDB\fP. Note that
- if the same keysym is bound to multiple keys, the expression is executed
- for each matching keycode.
- .TP 8
diff --git a/debian/patches/series b/debian/patches/series
index 3dcbcaf..a068c05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_sessreg_implement_hostname_hashing.diff -p0
-02_xmodmap_manpage.diff
commit 93b9c8373f9fdc6ea15bba6c6b8616438a973039
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Dec 6 13:37:08 2009 +0100
Drop libxxf86misc-dev from Build-Depends
Recent X servers don't support this extension.
diff --git a/debian/changelog b/debian/changelog
index 63cd9a4..1fe1fdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ x11-xserver-utils (7.5+1) UNRELEASED; urgency=low
* Update xsetroot config.{guess,sub} for avr32 support (closes: #535715).
* Add README.source from xsfbs, and bump Standards-Version to 3.8.2.
* Remove xtrap (closes: #547547).
+ * Drop libxxf86misc-dev from Build-Depends. It's optional for xset, and
+ recent X servers don't support this extension anymore.
[ Brice Goglin ]
* iceauth 1.0.3.
diff --git a/debian/control b/debian/control
index 103855f..ef7d3ac 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>=
2:1.0.0),
libxi-dev (>= 1:1.0.0-3), libxmuu-dev (>= 1:1.0.1),
libxrandr-dev (>= 2:1.2.99.3), libxt-dev (>= 1:1.0.0),
libxxf86vm-dev (>= 1:1.0.0), xbitmaps, quilt,
- x11proto-input-dev (>= 1.4), libxxf86misc-dev
+ x11proto-input-dev (>= 1.4)
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps:
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev
(>= 2:1.0.0),
# xrdb: libxmuu-dev, libx11-dev
# xrefresh: libx11-dev
# xset: libxmuu-dev, libx11-dev, libxext-dev,
-# libxxf86misc-dev, (libxfontcache-dev)
+# (libxxf86misc-dev), (libxfontcache-dev)
# xsetmode: libxi-dev, libx11-dev
# xsetpointer: libxi-dev, libx11-dev, x11proto-input-dev (>= 1.4)
# xsetroot: libxmuu-dev, libx11-dev, xbitmaps
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
