xinit: Changes to 'debian-unstable'
debian/changelog | 11 ++-
debian/patches/03_debian_startx_manpage.diff | 77 +++++++++++++++++++++++++++
debian/patches/04_startx_paths.diff | 50 +++++++++++++++++
debian/patches/05_use_bash.diff | 20 +++++++
debian/patches/09_debian_startx_manpage.diff | 77 ---------------------------
debian/patches/12_startx_paths.diff | 50 -----------------
debian/patches/series | 9 +--
debian/rules | 14 ++--
debian/xinit.install | 2
9 files changed, 168 insertions(+), 142 deletions(-)
New commits:
commit 1781832f7cb5d45830957a91a0fe47c2c2370215
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Sat May 19 11:03:15 2007 +0300
debian/patches: add 05_use_bash.diff (LP: #31241) (Freedesktop: #4449), comment out the rest.
debian/rules: install xserverrc here
debian/xinit.install: fix
diff --git a/debian/changelog b/debian/changelog
index 127c3d7..07f0cb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,14 @@ xinit (1.0.2-1) UNRELEASED; urgency=low
this package.
* debian/xinit.install, rules: Edit to reflect new packaging.
* debian/xinit.dirs: Remove.
- * debian/patches: Delete patches which do not relate to this package.
-
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Sat, 19 May 2007 01:55:32 +0300
+ * debian/patches:
+ - Delete patches which do not relate to this package.
+ - Comment out those that belong here, they seem to be applied
+ already.
+ - 05_use_bash.diff: fix a shell usage error (LP: #31241),
+ (Freedesktop: #4449)
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Sat, 19 May 2007 10:55:03 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/patches/05_use_bash.diff b/debian/patches/05_use_bash.diff
new file mode 100644
index 0000000..aa4a546
--- /dev/null
+++ b/debian/patches/05_use_bash.diff
@@ -0,0 +1,20 @@
+Index: xinit/startx.cpp
+===================================================================
+--- xinit.orig/startx.cpp 2007-05-19 10:14:49.000000000 +0300
++++ xinit/startx.cpp 2007-05-19 10:15:15.000000000 +0300
+@@ -1,4 +1,4 @@
+-XCOMM!SHELL_CMD
++XCOMM!/bin/bash
+
+ XCOMM $Xorg: startx.cpp,v 1.3 2000/08/17 19:54:29 cpqbld Exp $
+ XCOMM
+Index: xinit/xinitrc.cpp
+===================================================================
+--- xinit.orig/xinitrc.cpp 2007-05-19 10:15:24.000000000 +0300
++++ xinit/xinitrc.cpp 2007-05-19 10:15:35.000000000 +0300
+@@ -1,4 +1,4 @@
+-XCOMM!SHELL_CMD
++XCOMM!/bin/bash
+ XCOMM $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+ XCOMM /etc/X11/xinit/xinitrc
diff --git a/debian/patches/series b/debian/patches/series
index 0bef68e..391785f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
#02_startx_hostname.diff
#03_debian_startx_manpage.diff -p0
#04_startx_paths.diff
+05_use_bash.diff
diff --git a/debian/rules b/debian/rules
index db9f8cc..b1cd566 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,9 @@ install: build
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ install -d debian/tmp/etc/X11/xinit
+ install -m 755 debian/local/xserverrc debian/tmp/etc/X11/xinit
+
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
diff --git a/debian/xinit.install b/debian/xinit.install
index 84acd07..ac0f952 100644
--- a/debian/xinit.install
+++ b/debian/xinit.install
@@ -1,4 +1,4 @@
usr/bin/*
usr/share/man/man1/*
-debian/local/xserverrc etc/X11/xinit
usr/lib/X11/xinit/xinitrc etc/X11/xinit
+etc/X11/xinit/xserverrc
commit 284a8dbcf4f9b70736220960b8363d2ac73b0c49
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Sat May 19 10:26:16 2007 +0300
debian/rules: modify so it works.
debian/patches/*: renumber the patches, comment out from series as they are all applied
already.
diff --git a/debian/patches/03_debian_startx_manpage.diff b/debian/patches/03_debian_startx_manpage.diff
new file mode 100644
index 0000000..4039218
--- /dev/null
+++ b/debian/patches/03_debian_startx_manpage.diff
@@ -0,0 +1,77 @@
+$Id: 902_debian_startx_manpage.diff 867 2005-11-13 16:29:11Z dnusinow $
+
+Fix the startx manpage to be more correct for our setup; this patch by Branden
+Robinson.
+
+Index: xinit/startx.man
+===================================================================
+--- xinit/startx.man.orig 2005-11-12 16:31:16.000000000 -0500
++++ xinit/startx.man 2005-11-13 11:00:34.000000000 -0500
+@@ -74,6 +74,28 @@
+ .RE
+ #ifdef __SCOMAN__
+ .PP
++Note that in the Debian system, what many people traditionally put in the
++.I .xinitrc
++file should go in
++.I .xsession
++instead; this permits the same X environment to be presented whether
++.IR startx ,
++.IR xdm ,
++or
++.I xinit
++is used to start the X session. All discussion of the
++.I .xinitrc
++file in the
++.IR xinit (1)
++manual page applies equally well to
++.IR .xsession.
++Keep in mind that
++.I .xinitrc
++is used only by
++.IR xinit (1)
++and completely ignored by
++.IR xdm (1).
++.PP
+ To determine the client to run,
+ .I startx
+ looks for the following files, in order:
+@@ -132,38 +154,6 @@
+ files are found in the
+ .I __xinitdir__
+ directory.
+-.PP
+-The
+-.I .xinitrc
+-is typically a shell script which starts many clients according to the
+-user's preference. When this shell script exits,
+-.I startx
+-kills the server and performs any other session shutdown needed.
+-Most of the clients started by
+-.I .xinitrc
+-should be run in the background. The last client should run in the
+-foreground; when it exits, the session will exit. People often choose
+-a session manager, window manager, or \fIxterm\fP as the ''magic'' client.
+-.SH EXAMPLE
+-.PP
+-Below is a sample \fI\.xinitrc\fP that starts several applications and
+-leaves the window manager running as the ''last'' application. Assuming that
+-the window manager has been configured properly, the user
+-then chooses the ''Exit'' menu item to shut down X.
+-.sp
+-.in +4
+-.nf
+-xrdb \-load $HOME/.Xresources
+-xsetroot \-solid gray &
+-xbiff \-geometry \-430+5 &
+-oclock \-geometry 75x75\-0\-0 &
+-xload \-geometry \-80\-0 &
+-xterm \-geometry +0+60 \-ls &
+-xterm \-geometry +0\-100 &
+-xconsole \-geometry \-0+0 \-fn 5x7 &
+-exec twm
+-.fi
+-.in -4
+ .SH "ENVIRONMENT VARIABLES"
+ .TP 25
+ DISPLAY
diff --git a/debian/patches/04_startx_paths.diff b/debian/patches/04_startx_paths.diff
new file mode 100644
index 0000000..301c699
--- /dev/null
+++ b/debian/patches/04_startx_paths.diff
@@ -0,0 +1,50 @@
+Index: xbase-clients-7.0.0/xinit/startx.cmd
+===================================================================
+--- xbase-clients-7.0.0.orig/xinit/startx.cmd 2006-04-12 20:11:50.000000000 -0400
++++ xbase-clients-7.0.0/xinit/startx.cmd 2006-04-25 21:01:54.000000000 -0400
+@@ -31,8 +31,8 @@
+
+ userclientrc = home'\xinitrc.cmd'
+ userserverrc = home'\xservrc.cmd'
+-sysclientrc = x11root'\usr\X11R6\lib\X11\xinit\xinitrc.cmd'
+-sysserverrc = x11root'\usr\X11R6\lib\X11\xinit\xservrc.cmd'
++sysclientrc = x11root'\etc\X11\xinit\xinitrc.cmd'
++sysserverrc = x11root'\etc\X11\xinit\xservrc.cmd'
+ clientargs = ''
+ serverargs = ''
+
+Index: xbase-clients-7.0.0/xinit/xinitrc.cmd
+===================================================================
+--- xbase-clients-7.0.0.orig/xinit/xinitrc.cmd 2006-04-12 20:11:50.000000000 -0400
++++ xbase-clients-7.0.0/xinit/xinitrc.cmd 2006-04-25 21:01:54.000000000 -0400
+@@ -12,9 +12,9 @@
+
+ userresources = home'\.Xresources'
+ usermodmap = home'\.Xmodmap'
+-sysresources = x11root'\usr\X11R6\lib\X11\xinit\.Xresources'
+-sysmodmap = x11root'\usr\X11R6\lib\X11\xinit\.Xmodmap'
+-xbitmapdir = x11root'\usr\X11R6\include\X11\bitmaps'
++sysresources = x11root'\etc\X11\xinit\.Xresources'
++sysmodmap = x11root'\etc\X11\xinit\.Xmodmap'
++xbitmapdir = x11root'\etc\X11\bitmaps'
+ manpath = VALUE('MANPATH',,env)
+
+ /* merge in defaults */
+Index: xbase-clients-7.0.0/xinit/startx.cpp
+===================================================================
+--- xbase-clients-7.0.0.orig/xinit/startx.cpp 2006-04-25 21:02:12.000000000 -0400
++++ xbase-clients-7.0.0/xinit/startx.cpp 2006-04-25 21:17:19.000000000 -0400
+@@ -59,11 +59,11 @@
+ scosysclientrc=XINITDIR/xinitrc
+ #else
+ userclientrc=$HOME/.xinitrc
+-sysclientrc=XINITDIR/xinitrc
++sysclientrc=/etc/X11/xinit/xinitrc
+ #endif
+
+ userserverrc=$HOME/.xserverrc
+-sysserverrc=XINITDIR/xserverrc
++sysserverrc=/etc/X11/xinit/xserverrc
+ defaultclient=XTERM
+ defaultserver=XSERVER
+ defaultclientargs=""
diff --git a/debian/patches/09_debian_startx_manpage.diff b/debian/patches/09_debian_startx_manpage.diff
deleted file mode 100644
index 4039218..0000000
--- a/debian/patches/09_debian_startx_manpage.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-$Id: 902_debian_startx_manpage.diff 867 2005-11-13 16:29:11Z dnusinow $
-
-Fix the startx manpage to be more correct for our setup; this patch by Branden
-Robinson.
-
-Index: xinit/startx.man
-===================================================================
---- xinit/startx.man.orig 2005-11-12 16:31:16.000000000 -0500
-+++ xinit/startx.man 2005-11-13 11:00:34.000000000 -0500
-@@ -74,6 +74,28 @@
- .RE
- #ifdef __SCOMAN__
- .PP
-+Note that in the Debian system, what many people traditionally put in the
-+.I .xinitrc
-+file should go in
-+.I .xsession
-+instead; this permits the same X environment to be presented whether
-+.IR startx ,
-+.IR xdm ,
-+or
-+.I xinit
-+is used to start the X session. All discussion of the
-+.I .xinitrc
-+file in the
-+.IR xinit (1)
-+manual page applies equally well to
-+.IR .xsession.
-+Keep in mind that
-+.I .xinitrc
-+is used only by
-+.IR xinit (1)
-+and completely ignored by
-+.IR xdm (1).
-+.PP
- To determine the client to run,
- .I startx
- looks for the following files, in order:
-@@ -132,38 +154,6 @@
- files are found in the
- .I __xinitdir__
- directory.
--.PP
--The
--.I .xinitrc
--is typically a shell script which starts many clients according to the
--user's preference. When this shell script exits,
--.I startx
--kills the server and performs any other session shutdown needed.
--Most of the clients started by
--.I .xinitrc
--should be run in the background. The last client should run in the
--foreground; when it exits, the session will exit. People often choose
--a session manager, window manager, or \fIxterm\fP as the ''magic'' client.
--.SH EXAMPLE
--.PP
--Below is a sample \fI\.xinitrc\fP that starts several applications and
--leaves the window manager running as the ''last'' application. Assuming that
--the window manager has been configured properly, the user
--then chooses the ''Exit'' menu item to shut down X.
--.sp
--.in +4
--.nf
--xrdb \-load $HOME/.Xresources
--xsetroot \-solid gray &
--xbiff \-geometry \-430+5 &
--oclock \-geometry 75x75\-0\-0 &
--xload \-geometry \-80\-0 &
--xterm \-geometry +0+60 \-ls &
--xterm \-geometry +0\-100 &
--xconsole \-geometry \-0+0 \-fn 5x7 &
--exec twm
--.fi
--.in -4
- .SH "ENVIRONMENT VARIABLES"
- .TP 25
- DISPLAY
diff --git a/debian/patches/12_startx_paths.diff b/debian/patches/12_startx_paths.diff
deleted file mode 100644
index 301c699..0000000
--- a/debian/patches/12_startx_paths.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: xbase-clients-7.0.0/xinit/startx.cmd
-===================================================================
---- xbase-clients-7.0.0.orig/xinit/startx.cmd 2006-04-12 20:11:50.000000000 -0400
-+++ xbase-clients-7.0.0/xinit/startx.cmd 2006-04-25 21:01:54.000000000 -0400
-@@ -31,8 +31,8 @@
-
- userclientrc = home'\xinitrc.cmd'
- userserverrc = home'\xservrc.cmd'
--sysclientrc = x11root'\usr\X11R6\lib\X11\xinit\xinitrc.cmd'
--sysserverrc = x11root'\usr\X11R6\lib\X11\xinit\xservrc.cmd'
-+sysclientrc = x11root'\etc\X11\xinit\xinitrc.cmd'
-+sysserverrc = x11root'\etc\X11\xinit\xservrc.cmd'
- clientargs = ''
- serverargs = ''
-
-Index: xbase-clients-7.0.0/xinit/xinitrc.cmd
-===================================================================
---- xbase-clients-7.0.0.orig/xinit/xinitrc.cmd 2006-04-12 20:11:50.000000000 -0400
-+++ xbase-clients-7.0.0/xinit/xinitrc.cmd 2006-04-25 21:01:54.000000000 -0400
-@@ -12,9 +12,9 @@
-
- userresources = home'\.Xresources'
- usermodmap = home'\.Xmodmap'
--sysresources = x11root'\usr\X11R6\lib\X11\xinit\.Xresources'
--sysmodmap = x11root'\usr\X11R6\lib\X11\xinit\.Xmodmap'
--xbitmapdir = x11root'\usr\X11R6\include\X11\bitmaps'
-+sysresources = x11root'\etc\X11\xinit\.Xresources'
-+sysmodmap = x11root'\etc\X11\xinit\.Xmodmap'
-+xbitmapdir = x11root'\etc\X11\bitmaps'
- manpath = VALUE('MANPATH',,env)
-
- /* merge in defaults */
-Index: xbase-clients-7.0.0/xinit/startx.cpp
-===================================================================
---- xbase-clients-7.0.0.orig/xinit/startx.cpp 2006-04-25 21:02:12.000000000 -0400
-+++ xbase-clients-7.0.0/xinit/startx.cpp 2006-04-25 21:17:19.000000000 -0400
-@@ -59,11 +59,11 @@
- scosysclientrc=XINITDIR/xinitrc
- #else
- userclientrc=$HOME/.xinitrc
--sysclientrc=XINITDIR/xinitrc
-+sysclientrc=/etc/X11/xinit/xinitrc
- #endif
-
- userserverrc=$HOME/.xserverrc
--sysserverrc=XINITDIR/xserverrc
-+sysserverrc=/etc/X11/xinit/xserverrc
- defaultclient=XTERM
- defaultserver=XSERVER
- defaultclientargs=""
diff --git a/debian/patches/series b/debian/patches/series
index b5576a6..0bef68e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-001_debian_xinitrc.diff
-02_startx_hostname.diff
-09_debian_startx_manpage.diff -p0
-12_startx_paths.diff
+#001_debian_xinitrc.diff
+#02_startx_hostname.diff
+#03_debian_startx_manpage.diff -p0
+#04_startx_paths.diff
diff --git a/debian/rules b/debian/rules
index 2256f24..db9f8cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# set this to the name of the main shlib's binary package
-PACKAGE = xinit
-
include debian/xsfbs/xsfbs.mk
CFLAGS = -Wall -g
@@ -41,8 +38,8 @@ build-stamp:
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
- MANCONF="/etc/manpath.config" && \
- $(MAKE)) || exit 1
+ MANCONF="/etc/manpath.config"
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) || exit 1
touch build-stamp
@@ -55,7 +52,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf *-obj-*
+ rm -rf obj-*
dh_clean
@@ -65,7 +62,7 @@ install: build
dh_clean -k
dh_installdirs
- cd -obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
binary-arch: build install
Reply to: