xinit: Changes to 'debian-unstable'
debian/changelog | 5 +++
debian/patches/04_startx_paths.diff | 56 ------------------------------------
debian/patches/05_use_bash.diff | 25 ----------------
debian/patches/series | 2 -
debian/rules | 4 +-
5 files changed, 7 insertions(+), 85 deletions(-)
New commits:
commit 155582ba651f2cbd9f0f16377d7e7b1392a0460e
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 5 19:45:04 2010 +0200
Drop 05_use_bash.diff.
This was working around a bashism fixed 4 years ago.
diff --git a/debian/changelog b/debian/changelog
index c4c9462..6ac1924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xinit (1.2.0-2) UNRELEASED; urgency=low
* Drop 04_startx_paths.diff, pass --with-xinitdir=/etc/X11/xinit to
configure instead. As a side effect, this fixes the paths in the manpage
(closes: #526843).
+ * Drop 05_use_bash.diff. This was working around a bashism fixed 4 years
+ ago.
[ Sven Joachim ]
* Depend on coreutils (>= 7.4-1) for mktemp's --tmpdir option
diff --git a/debian/patches/05_use_bash.diff b/debian/patches/05_use_bash.diff
deleted file mode 100644
index a3e3c30..0000000
--- a/debian/patches/05_use_bash.diff
+++ /dev/null
@@ -1,25 +0,0 @@
----
- startx.cpp | 2 +-
- xinitrc.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: xinit/startx.cpp
-===================================================================
---- xinit.orig/startx.cpp 2009-12-06 23:25:52.000000000 +0100
-+++ xinit/startx.cpp 2009-12-06 23:26:32.000000000 +0100
-@@ -1,4 +1,4 @@
--XCOMM!SHELL_CMD
-+XCOMM!/bin/bash
-
- XCOMM
- XCOMM This is just a sample implementation of a slightly less primitive
-Index: xinit/xinitrc.cpp
-===================================================================
---- xinit.orig/xinitrc.cpp 2009-12-06 23:23:40.000000000 +0100
-+++ xinit/xinitrc.cpp 2009-12-06 23:26:32.000000000 +0100
-@@ -1,4 +1,4 @@
--XCOMM!SHELL_CMD
-+XCOMM!/bin/bash
-
- XCOMM /etc/X11/xinit/xinitrc
- XCOMM
diff --git a/debian/patches/series b/debian/patches/series
index eca1c3d..81e4c14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
001_debian_xinitrc.diff
02_startx_hostname.diff
03_debian_startx_manpage.diff
-05_use_bash.diff
06_move_serverauthfile_into_tmp.diff
commit cd2ade3eca7068fd2867a50b36b5675cca1ceb9f
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 5 19:41:29 2010 +0200
Set the xinitdir properly
Drop 04_startx_paths.diff, pass --with-xinitdir=/etc/X11/xinit to
configure instead. As a side effect, this fixes the paths in the
manpage (closes: #526843).
diff --git a/debian/changelog b/debian/changelog
index 7e5afd5..c4c9462 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ xinit (1.2.0-2) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ * Drop 04_startx_paths.diff, pass --with-xinitdir=/etc/X11/xinit to
+ configure instead. As a side effect, this fixes the paths in the manpage
+ (closes: #526843).
[ Sven Joachim ]
* Depend on coreutils (>= 7.4-1) for mktemp's --tmpdir option
diff --git a/debian/patches/04_startx_paths.diff b/debian/patches/04_startx_paths.diff
deleted file mode 100644
index ab67b4f..0000000
--- a/debian/patches/04_startx_paths.diff
+++ /dev/null
@@ -1,56 +0,0 @@
----
- startx.cmd | 4 ++--
- startx.cpp | 4 ++--
- xinitrc.cmd | 6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-Index: xinit/startx.cmd
-===================================================================
---- xinit.orig/startx.cmd 2009-12-06 23:12:44.000000000 +0100
-+++ xinit/startx.cmd 2009-12-06 23:25:52.000000000 +0100
-@@ -30,8 +30,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: xinit/xinitrc.cmd
-===================================================================
---- xinit.orig/xinitrc.cmd 2009-12-06 23:12:44.000000000 +0100
-+++ xinit/xinitrc.cmd 2009-12-06 23:25:52.000000000 +0100
-@@ -11,9 +11,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: xinit/startx.cpp
-===================================================================
---- xinit.orig/startx.cpp 2009-12-06 23:23:41.000000000 +0100
-+++ xinit/startx.cpp 2009-12-06 23:25:52.000000000 +0100
-@@ -67,11 +67,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 7a5032f..eca1c3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
001_debian_xinitrc.diff
02_startx_hostname.diff
03_debian_startx_manpage.diff
-04_startx_paths.diff
05_use_bash.diff
06_move_serverauthfile_into_tmp.diff
diff --git a/debian/rules b/debian/rules
index 7b55331..fa60525 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,8 +40,8 @@ build-stamp: configure $(STAMP_DIR)/genscripts
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
- CFLAGS="$(CFLAGS)"
- MANCONF="/etc/manpath.config"
+ --with-xinitdir=/etc/X11/xinit \
+ CFLAGS="$(CFLAGS)"
cd build && $(MAKE) || exit 1
>$@
Reply to: