debian/changelog | 6 ++
debian/control | 72 +++++++++++++++++++++++++++++++++
debian/patches/17_xmodmap_manpage.diff | 13 +++++
debian/patches/series | 1
4 files changed, 91 insertions(+), 1 deletion(-)
New commits:
commit 0cf66c046cb53d95a2b994034e008906ff16f0c6
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Mar 30 15:53:48 2007 +0200
Document each app's build-dependencies in debian/control
diff --git a/debian/changelog b/debian/changelog
index 2831858..b8b8dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,13 +7,14 @@ xbase-clients (1:7.2.ds2-2) UNRELEASED; urgency=low
* Add patch 17_xmodmap_manpage.diff to make xmodmap(1) refer to
/usr/share/X11/XKeysymDB instead of /usr/lib/X11/XKeysymDB
(closes: #394077). Thanks, Joachim Breitner!
+ * Document each app's build-dependencies in debian/control for reference.
[ Brice Goglin ]
* Restore Depends: on cpp (got lost during modularization)
since xrdb needs it to process .Xdefaults.
Thanks Marcus C. Gottwald (closes: #413298).
- -- Julien Cristau <[EMAIL PROTECTED]> Fri, 30 Mar 2007 14:46:48 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Fri, 30 Mar 2007 15:52:19 +0200
xbase-clients (1:7.2.ds2-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 60bc42e..653b2c9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,78 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1),
libpng12-dev, libx11-dev (>= 2:1.0.0-1), libxaw7-dev (>= 1:1.0.1-1),
libxcursor-dev (>= 1.1.5.2-1), libxext-dev (>= 1:1.0.0-1), libxft-dev (>=
2.1.8.2-6), libxi-dev (>= 1:1.0.0-3), libxkbfile-dev (>= 1:1.0.1-1),
libxmuu-dev (>= 1:1.0.1-1), libxrandr-dev (>= 2:1.2.0-1), libxrender-dev (>=
1:0.9.0.2-2), libxss-dev (>= 1:1.0.1-1), libxt-dev (>= 1:1.0.0-1), libxtrap-dev
(>= 1:1.0.0-1), libxtst-dev (>= 1:1.0.1-1), libxxf86dga-dev (>= 1:1.0.1-1),
libxv-dev (>= 1:1.0.1-1), libxxf86vm-dev (>= 1:1.0.0-1), x11proto-gl-dev,
libgl1-mesa-dev, xbitmaps, quilt, openssh-client | ssh, x11proto-input-dev (>=
1.4), libxinerama-dev (>= 1:1.0.1-1)
+# Reasons for build-depends:
+#Â debhelper for the packaging, pkg-config needed by configure scripts
+# Individual apps:
+# appres: libx11-dev, libxt-dev
+# beforelight: libx11-dev, libxss-dev, libxt-dev, libxaw7-dev
+# bitmap: libx11-dev, libxmu-dev, xbitmaps, libxt-dev
+# editres: libx11-dev, libxt-dev, libxmu-dev
+# fstobdf: libx11-dev, libfs-dev
+# iceauth: x11proto-core-dev, libice-dev
+# ico: libx11-dev
+# listres: libx11-dev, libxt-dev, libxmu-dev
+# oclock: libx11-dev, libxmu-dev, libxext-dev
+# setxkbmap: libxkbfile-dev, libx11-dev
+# smproxy: libxt-dev, libxmu-dev
+# viewres: libxt-dev
+# x11perf: libx11-dev, libxmuu-dev, libxrender-dev, libxft-dev, libxext-dev
+# xauth: libx11-dev, libxau-dev, libxext-dev, libxmuu-dev
+# xbiff: xbitmaps, libxext-dev
+# xcalc: libxt-dev, libxaw7-dev
+# xclipboard: libxt-dev
+# xclock: libx11-dev, libxaw7-dev, libxft-dev, libxkbfile-dev, libxt-dev
+# xcmsdb: libx11-dev
+# xconsole: libxt-dev, libxaw7-dev
+# xcursorgen: libx11-dev, libxcursor-dev, libpng12-dev
+# xdbedizzy: libxext-dev, libx11-dev
+# xditview: libxaw7-dev, libxt-dev
+# xdpyinfo: libxext-dev, libx11-dev, libxtst-dev, libxxf86vm-dev,
+# libxxf86dga-dev, (libxxf86misc-dev,) libxi-dev, libxrender-dev,
+# libxinerama-dev, libdmx-dev
+# xdriinfo: libx11-dev, x11proto-gl-dev, libgl1-mesa-dev
+# xedit: libxaw7-dev, libxt-dev
+# xev: libx11-dev
+# xeyes: libx11-dev, libxt-dev, libxext-dev, libxmu-dev
+# xf86dga: libx11-dev, libxxf86dga-dev, libxt-dev, libxaw7-dev, libxmu-dev
+# xfd: libxaw7-dev, libfreetype2-dev, libfontconfig-dev, libxft-dev, libxt-dev
+# xfontsel: libxaw7-dev, libxt-dev
+# xgamma: libx11-dev, libxxf86vm-dev
+# xgc: libxaw7-dev, libxt-dev
+# xhost: libx11-dev, libxmuu-dev, libxau-dev
+# xinit: libx11-dev
+# xkbcomp: libx11-dev, libxkbfile-dev
+# xkbevd: libxkbfile-dev, libx11-dev, (bison)
+# xkbprint: libxkbfile-dev, libx11-dev
+# xkbutils: libxaw7-dev, libxkbfile-dev, libx11-dev
+# xkill: libx11-dev, libxmuu-dev
+# xload: libxaw7-dev, libxt-dev
+# xlogo: libxaw7-dev, libxrender-dev, libxft-dev, libxext-dev, libxt-dev
+# xlsatoms: libx11-dev, libxmuu-dev
+# xlsclients: libx11-dev, libxmuu-dev
+# xlsfonts: libx11-dev
+# xmag: libxaw7-dev, libxt-dev
+# xman: libxaw7-dev, libxt-dev
+# xmessage: libxaw7-dev, libxt-dev
+# xmodmap: libx11-dev
+# xmore: libxaw7-dev, libxt-dev
+# xprop: libxmuu-dev, libx11-dev
+# xrandr: libxrandr-dev (>= 2:1.2.0), libxrender, libx11
+# xrdb: libxmuu-dev, libx11-dev
+# xrefresh: libx11-dev
+# xset: libxmuu-dev, libx11-dev, libxext-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
+# xsm: openssh-client | ssh, libxaw7-dev, libxt-dev
+# xstdcmap: libxmu-dev, libx11-dev
+# xtrap: libx11-dev, libxtrap-dev
+# xvidtune: libxaw7-dev, libxxf86vm-dev, libxt-dev
+# xvinfo: libxv-dev, libx11-dev
+# xwd: libxmuu-dev, libx11-dev
+# xwininfo: libxmuu-dev, libxext-dev, libx11-dev
+# xwud: libx11-dev
Standards-Version: 3.7.2.0
Package: xbase-clients
commit 6e403cb28bc215733a0bdc16625249d3e437ce0f
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Mar 30 14:52:19 2007 +0200
Add patch for xmodmap(1) to refer to the correct location for XKeysymDB.
diff --git a/debian/changelog b/debian/changelog
index 8b3dd4f..2831858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,13 +4,16 @@ xbase-clients (1:7.2.ds2-2) UNRELEASED; urgency=low
* Autoreconf with patches applied.
* Add build-dep on libxinerama-dev, so xdpyinfo is built with support for
the xinerama extension.
+ * Add patch 17_xmodmap_manpage.diff to make xmodmap(1) refer to
+ /usr/share/X11/XKeysymDB instead of /usr/lib/X11/XKeysymDB
+ (closes: #394077). Thanks, Joachim Breitner!
[ Brice Goglin ]
* Restore Depends: on cpp (got lost during modularization)
since xrdb needs it to process .Xdefaults.
Thanks Marcus C. Gottwald (closes: #413298).
- -- Brice Goglin <[EMAIL PROTECTED]> Mon, 12 Mar 2007 00:43:06 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]> Fri, 30 Mar 2007 14:46:48 +0200
xbase-clients (1:7.2.ds2-1) experimental; urgency=low
diff --git a/debian/patches/17_xmodmap_manpage.diff
b/debian/patches/17_xmodmap_manpage.diff
new file mode 100644
index 0000000..7111278
--- /dev/null
+++ b/debian/patches/17_xmodmap_manpage.diff
@@ -0,0 +1,13 @@
+Index: xbase-clients/xmodmap/xmodmap.man
+===================================================================
+--- xbase-clients.orig/xmodmap/xmodmap.man 2007-03-30 14:43:27.000000000
+0200
++++ xbase-clients/xmodmap/xmodmap.man 2007-03-30 14:45:03.000000000 +0200
+@@ -140,7 +140,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 __projectroot__/lib/X11/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 67bdf2b..9ef7dd6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
14_SECURITY_setuid.diff
15_xmore_fix_segv_without_xprint.diff -p2
16_beforelight_install_app-defaults.diff
+17_xmodmap_manpage.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
