diff options
author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-08-23 13:36:27 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-23 13:36:27 +0000 |
commit | fcb42fc75c2f7ec104735fcfbef993ec62e946c8 (patch) | |
tree | 2270afc2033f1c503e62b1935f64b2cf1540048f /packages/gpe-dm | |
parent | 7203552a097c7429519f89ed179f241496cf6394 (diff) | |
parent | 639df729bedfa9e2ed58c8a7e7240d05a23752d2 (diff) |
merge of ddc841bc5413de481ba5f7392575bba7a9ef04a7
and f19ce428c20ed51be635a051213519acfded5d4b
Diffstat (limited to 'packages/gpe-dm')
-rw-r--r-- | packages/gpe-dm/files/remove-X-scripts.patch | 14 | ||||
-rw-r--r-- | packages/gpe-dm/gpe-dm_0.47.bb | 8 |
2 files changed, 18 insertions, 4 deletions
diff --git a/packages/gpe-dm/files/remove-X-scripts.patch b/packages/gpe-dm/files/remove-X-scripts.patch new file mode 100644 index 0000000000..b3c85be788 --- /dev/null +++ b/packages/gpe-dm/files/remove-X-scripts.patch @@ -0,0 +1,14 @@ +diff -Nur gpe-dm-0.47~/Makefile gpe-dm-0.47/Makefile +--- gpe-dm-0.47~/Makefile 2005-08-19 18:27:54.000000000 -0700 ++++ gpe-dm-0.47/Makefile 2005-08-19 18:28:37.000000000 -0700 +@@ -31,10 +31,6 @@ + install -d $(DESTDIR)/etc/init.d + install -d $(DESTDIR)/etc/rc2.d + install gpe-dm.init $(DESTDIR)/etc/init.d/gpe-dm +- install -d $(DESTDIR)/etc/X11 +- install Xsession $(DESTDIR)/etc/X11/Xsession +- install Xinit $(DESTDIR)/etc/X11/Xinit +- install Xserver $(DESTDIR)/etc/X11/Xserver + + clean: clean-po + rm -f gpe-dm gpe-dm.o diff --git a/packages/gpe-dm/gpe-dm_0.47.bb b/packages/gpe-dm/gpe-dm_0.47.bb index b98a235ac5..bc290ebf89 100644 --- a/packages/gpe-dm/gpe-dm_0.47.bb +++ b/packages/gpe-dm/gpe-dm_0.47.bb @@ -5,11 +5,11 @@ DESCRIPTION = "GPE Desktop Manager" SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "glib-2.0" -PR = "r4" +DEPENDS = "glib-2.0 x11-common" +RDEPENDS_${PN} += "x11-common" +PR = "r5" INITSCRIPT_NAME = "gpe-dm" INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." -SRC_URI += "file://collie-suspend-hack.patch;patch=1 \ - file://Xserver-cxk.patch;patch=1" +SRC_URI += "file://remove-X-scripts.patch;patch=1" |