diff options
| author |   Rod Whitby <rod@whitby.id.au> | 2006-06-29 19:47:18 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-29 19:47:18 +0000 |
| commit | 4e26f686b6c18fe1f57bb20d5edfa81699377ee1 (patch) | |
| tree | 524fd1084d769db260077de427ed799f2060eb0d /packages | |
| parent | b4bb893ec2ad5251d461916703576a8295b1d513 (diff) | |
| parent | 079a67fc75edf4d2671ed9cbef0d77870450920e (diff) | |
| download | openembedded-4e26f686b6c18fe1f57bb20d5edfa81699377ee1.tar.gz | |
merge of 439207523733c6dc2f0ffd852ac72717fc3f50a6
and 7847e7c8b41faf980a8a08156c7c8a5bc616f814
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/fluxbox/fluxbox-gpe/apps.gpe | 50 | ||||
| -rw-r--r-- | packages/fluxbox/fluxbox-gpe_1.0rc.bb | 2 | ||||
| -rw-r--r-- | packages/watchdog/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/watchdog/files/mkinstalldirs.patch | 17 | ||||
| -rw-r--r-- | packages/watchdog/watchdog_5.2.bb | 5 |
5 files changed, 69 insertions, 5 deletions
diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe b/packages/fluxbox/fluxbox-gpe/apps.gpe index 24d095f0fc..7aca442752 100644 --- a/packages/fluxbox/fluxbox-gpe/apps.gpe +++ b/packages/fluxbox/fluxbox-gpe/apps.gpe @@ -1,5 +1,6 @@ [app] (title=Panel 0) [Deco] {NONE} + [Sticky] {yes} [end] [app] (title=Panel 1) [Deco] {NONE} @@ -8,6 +9,49 @@ [Dimensions] {635 440} [end] [app] (title=x-terminal-emulator) - [Dimensions] {635 440} -[end] - + [Dimensions] {635 440} +[end] +[app] (abiword) + [Dimensions] {635 440} + [Sticky] {no} +[end] +[app] (gpe-filemanager) + [Dimensions] {635 440} + [Sticky] {yes} +[end] +[app] (gpe-info) + [Dimensions] {424 336} +[end] +[app] (gpe-edit) + [Dimensions] {635 440} +[end] +[app] (gpe-calculator) + [Dimensions] {266 321} +[end] +[app] (main) + [Dimensions] {635 440} +[end] +[app] (Gnumeric) + [Dimensions] {635 440} +[end] +[app] (gpdf) + [Dimensions] {635 440} +[end] +[app] (main_window) + [Dimensions] {635 440} +[end] +[app] (gaim) + [Dimensions] {635 440} +[end] +[app] (gpe-calendar) + [Dimensions] {380 343} +[end] +[app] (gpe-mini-browser) + [Dimensions] {635 440} +[end] +[app] (figment) + [Dimensions] {635 440} +[end] +[app] (gpe-sketchbook) + [Dimensions] {471 314} +[end] diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox-gpe_1.0rc.bb index 6becbe365d..50c5d6ce1d 100644 --- a/packages/fluxbox/fluxbox-gpe_1.0rc.bb +++ b/packages/fluxbox/fluxbox-gpe_1.0rc.bb @@ -13,7 +13,7 @@ RCONFLICTS = "fluxbox" ###################################################################################### -PR = "r0" +PR = "r1" S = "${WORKDIR}/fluxbox-${PV}" ###################################################################################### diff --git a/packages/watchdog/files/.mtn2git_empty b/packages/watchdog/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/watchdog/files/.mtn2git_empty diff --git a/packages/watchdog/files/mkinstalldirs.patch b/packages/watchdog/files/mkinstalldirs.patch new file mode 100644 index 0000000000..468f269965 --- /dev/null +++ b/packages/watchdog/files/mkinstalldirs.patch @@ -0,0 +1,17 @@ +--- + watchdog-5.2/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: watchdog-5.2/Makefile.am +=================================================================== +--- watchdog-5.2.orig/Makefile.am ++++ watchdog-5.2/Makefile.am +@@ -15,7 +15,7 @@ + echo "NOT installing $(CONFIG_FILENAME) - exists already"; \ + else \ + echo "installing $(CONFIG_FILENAME)"; \ +- mkinstalldirs `dirname $(DESTDIR)$(CONFIG_FILENAME)`; \ ++ $(mkinstalldirs) `dirname $(DESTDIR)$(CONFIG_FILENAME)`; \ + $(INSTALL_DATA) watchdog.conf $(DESTDIR)$(CONFIG_FILENAME); \ + fi + diff --git a/packages/watchdog/watchdog_5.2.bb b/packages/watchdog/watchdog_5.2.bb index fc3509466a..12f41b6ee7 100644 --- a/packages/watchdog/watchdog_5.2.bb +++ b/packages/watchdog/watchdog_5.2.bb @@ -1,9 +1,12 @@ DESCRIPTION = "Software watchdog" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" -PR = "r2" +PR = "r3" LICENSE = "GPL" SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${PN}-${PV}.tar.gz" + +SRC_URI += "file://mkinstalldirs.patch;patch=1" + FILES = "${sysconfdir}/watchdog.conf ${sbindir}/watchdog" #CONFFILES = "${sysconfdir}/watchdog.conf" |