diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-08-31 13:04:33 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-08-31 13:04:33 +0200 |
| commit | aa19cf6294de673303e813a0baf69791220a668a (patch) | |
| tree | ec8c701699121e626ec39e7ba217794a8689c152 /recipes/xserver-common/xserver-common-1.30/0025-Makefile-move-modmaps-install-xserver-common.patch | |
| parent | b1aad586d816f0610d3b47b60018b06d12b660d8 (diff) | |
xserver-common 1.30: another set of updates
0024 moves functionality of /etc/X11/Xserver to separate file (except
running X11 server) - this allows to use xserver-common package in
systems where xinit is used to run X11 session as root (look at
xserver-nodm-init package)
0025 moves xmodmap files to /etc/X11/xmodmap/ and installs
xserver-common file created in previous patch.
0026 fixes path to default.xmodmap file
Diffstat (limited to 'recipes/xserver-common/xserver-common-1.30/0025-Makefile-move-modmaps-install-xserver-common.patch')
| -rw-r--r-- | recipes/xserver-common/xserver-common-1.30/0025-Makefile-move-modmaps-install-xserver-common.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/recipes/xserver-common/xserver-common-1.30/0025-Makefile-move-modmaps-install-xserver-common.patch b/recipes/xserver-common/xserver-common-1.30/0025-Makefile-move-modmaps-install-xserver-common.patch new file mode 100644 index 0000000000..1389867f8c --- /dev/null +++ b/recipes/xserver-common/xserver-common-1.30/0025-Makefile-move-modmaps-install-xserver-common.patch @@ -0,0 +1,32 @@ +From 309ba3de37f0374c72c4569186e381a3272c24bc Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> +Date: Mon, 31 Aug 2009 12:47:05 +0200 +Subject: [PATCH 1/1] Makefile: move modmaps, install xserver-common + +--- + Makefile | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- xserver-common-1.30.orig/Makefile ++++ xserver-common-1.30/Makefile +@@ -15,16 +15,18 @@ endif + all: + + install-program: + for i in X11/Xsession.d X11/Xinit.d; do install -d $(DESTDIR)/etc/$$i; FILES=`echo $$i/* | sed "s:$$i/CVS::"`; install -m 755 $$FILES $(DESTDIR)/etc/$$i/; done + install -d $(DESTDIR)$(PREFIX)/bin ++ install -d $(DESTDIR)/etc/X11/xmodmap + install -m 755 run-calibrate.sh $(DESTDIR)$(PREFIX)/bin/run-calibrate.sh + install -m 644 X11/Xdefaults $(DESTDIR)/etc/X11/Xdefaults + install -m 755 X11/Xinit $(DESTDIR)/etc/X11/Xinit + install -m 755 X11/Xserver $(DESTDIR)/etc/X11/Xserver ++ install -m 644 X11/xserver-common $(DESTDIR)/etc/X11/xserver-common + install -m 755 X11/Xsession $(DESTDIR)/etc/X11/Xsession +- install -m 644 X11/xmodmap/*.xmodmap $(DESTDIR)/etc/X11/ +- install -m 644 X11/xmodmap-* $(DESTDIR)/etc/X11/ ++ install -m 644 X11/xmodmap/* $(DESTDIR)/etc/X11/xmodmap/ ++ install -m 644 X11/xmodmap-* $(DESTDIR)/etc/X11/xmodmap/ + + clean: + + include $(BUILD)/Makefile.dpkg_ipkg |