summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2005-08-23 22:17:00 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-23 22:17:00 +0000
commit3a2ed1fbdfa83cb69c6a1bf1311050070d7a97d7 (patch)
tree4bfb087978eeb1178545bd712b433f5eb25bfd6d /packages
parent8275e909cfe61880609a60921a9b9b816b79e08e (diff)
parentccee4d478f62721a480b89bc8a04352f7d0def5a (diff)
merge of 269ecf74ab47710eabc0ef60b75f09342ff542c8
and bb52b63c802dd04d7feac4964f561b985cdb7247
Diffstat (limited to 'packages')
-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