X Strike Force X.Org X11 SVN commit: r1081 - in trunk/debian: . patches patches/general
Author: dnusinow
Date: 2006-01-14 16:22:54 -0500 (Sat, 14 Jan 2006)
New Revision: 1081
Added:
trunk/debian/patches/general/024_xterm_bindir.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/series
Log:
* Add general/024_xterm_bindir.diff to deal with xterm's move to /usr/bin.
Thanks Oliver Chief O'Cordes. (closes: #348091)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-14 02:15:39 UTC (rev 1080)
+++ trunk/debian/changelog 2006-01-14 21:22:54 UTC (rev 1081)
@@ -22,6 +22,8 @@
targets. There's some bug in dh_installinit that was causing it to ignore
all the .init scripts when -s or -i was used in it alongside --noscripts
(closes: #347705)
+ * Add general/024_xterm_bindir.diff to deal with xterm's move to /usr/bin.
+ Thanks Oliver Chief O'Cordes. (closes: #348091)
[ Denis Barbier ]
* Add general/086_enable_ca_variants.diff so that variants of the ca
@@ -35,7 +37,7 @@
* Set Caps type in general/091_xkb_implement_compose:caps.diff
(closes: #345796)
- -- David Martínez Moreno <ender@debian.org> Sat, 14 Jan 2006 03:14:30 +0100
+ -- David Nusinow <dnusinow@debian.org> Sat, 14 Jan 2006 16:19:17 -0500
xorg-x11 (6.9.0.dfsg.1-3) unstable; urgency=low
Added: trunk/debian/patches/general/024_xterm_bindir.diff
===================================================================
--- trunk/debian/patches/general/024_xterm_bindir.diff 2006-01-14 02:15:39 UTC (rev 1080)
+++ trunk/debian/patches/general/024_xterm_bindir.diff 2006-01-14 21:22:54 UTC (rev 1081)
@@ -0,0 +1,16 @@
+xterm has been moved to /usr/bin. This will point startx to the right
+location.
+
+Index: trunk/xc/programs/xinit/Imakefile
+===================================================================
+--- trunk.orig/xc/programs/xinit/Imakefile 2005-12-27 02:33:12.000000000 -0500
++++ trunk/xc/programs/xinit/Imakefile 2006-01-14 16:02:59.000000000 -0500
+@@ -50,7 +50,7 @@
+ XMODMAP = $(BINDIR)/xmodmap
+ TWM = $(BINDIR)/twm
+ XCLOCK = $(BINDIR)/xclock
+- XTERM = $(BINDIR)/xterm
++ XTERM = /usr/bin/xterm
+ XSERVER = $(BINDIR)/X
+ XAUTH = $(BINDIR)/xauth
+ XINIT = $(BINDIR)/xinit
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-01-14 02:15:39 UTC (rev 1080)
+++ trunk/debian/patches/series 2006-01-14 21:22:54 UTC (rev 1081)
@@ -24,6 +24,7 @@
general/021_evdev_manpage.diff
general/022_disable_xmh.diff
general/023_specs_doc_fixes.diff -p0
+general/024_xterm_bindir.diff
general/025b_xkb_README_typos.diff -p0
general/025c_bitmap_manpage_typo.diff -p0
general/025d_xedit_manpage_typos.diff -p0
Reply to: