summaryrefslogtreecommitdiff
path: root/packages/gpe-session-scripts
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2005-08-23 22:16:35 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-23 22:16:35 +0000
commitccee4d478f62721a480b89bc8a04352f7d0def5a (patch)
tree86b2573025b51b6f35bdc43f07dfb907d9613056 /packages/gpe-session-scripts
parent50cf01121158f13f0c33b34203f0717e0f2bfae5 (diff)
Remove XDefaults as well to fix collision errors
Diffstat (limited to 'packages/gpe-session-scripts')
-rw-r--r--packages/gpe-session-scripts/files/remove-x11-common-files.patch12
-rw-r--r--packages/gpe-session-scripts/gpe-session-scripts_0.63.bb2
2 files changed, 10 insertions, 4 deletions
diff --git a/packages/gpe-session-scripts/files/remove-x11-common-files.patch b/packages/gpe-session-scripts/files/remove-x11-common-files.patch
index 1bf896923d..4ae13cba80 100644
--- a/packages/gpe-session-scripts/files/remove-x11-common-files.patch
+++ b/packages/gpe-session-scripts/files/remove-x11-common-files.patch
@@ -1,7 +1,7 @@
diff -Nur gpe-session-scripts-0.63~/Makefile gpe-session-scripts-0.63/Makefile
---- gpe-session-scripts-0.63~/Makefile 2005-08-19 18:32:17.000000000 -0700
-+++ gpe-session-scripts-0.63/Makefile 2005-08-19 18:35:46.000000000 -0700
-@@ -23,7 +23,9 @@
+--- gpe-session-scripts-0.63~/Makefile 2005-08-23 15:10:25.000000000 -0700
++++ gpe-session-scripts-0.63/Makefile 2005-08-23 15:08:40.000000000 -0700
+@@ -23,13 +23,14 @@
all:
install-program: gpe-logout.desktop
@@ -12,3 +12,9 @@ diff -Nur gpe-session-scripts-0.63~/Makefile gpe-session-scripts-0.63/Makefile
install -d $(DESTDIR)$(PREFIX)/bin
install -m 755 gpe-xcalibrate.sh $(DESTDIR)$(PREFIX)/bin/gpe-xcalibrate.sh
install -d $(DESTDIR)/etc/gpe
+ install -m 644 X11/xsettings.default $(DESTDIR)/etc/gpe/
+ install -m 644 standard.mbdock $(DESTDIR)/etc/gpe/gpe.mbdock
+- install -m 644 X11/Xdefaults $(DESTDIR)/etc/X11/
+ mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
+ install -m 644 gpe-logout.png $(DESTDIR)$(PREFIX)/share/pixmaps
+ mkdir -p $(DESTDIR)$(PREFIX)/share/applications
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
index 19b6608e2f..a54039d09b 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
@@ -1,5 +1,5 @@
LICENSE = "GPL"
-PR = "r15"
+PR = "r16"
inherit gpe