Maj ede#2.0-beta-2-1

6 files changed, 243 insertions, 132 deletions

diff --git a/extra/ede/.footprint b/extra/ede/.footprint
index 24738bf55..58ad0877c 100644
--- a/extra/ede/.footprint
+++ b/extra/ede/.footprint
@@ -21,6 +21,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ede-dialog
 -rwxr-xr-x	root/root	usr/bin/ede-help
 -rwxr-xr-x	root/root	usr/bin/ede-image-view
+-rwxr-xr-x	root/root	usr/bin/ede-keyboard-conf
 -rwxr-xr-x	root/root	usr/bin/ede-launch
 -rwxr-xr-x	root/root	usr/bin/ede-launch-sn
 -rwxr-xr-x	root/root	usr/bin/ede-menu-spec-test
@@ -46,6 +47,10 @@ drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/ede-launch.desktop
 -rw-r--r--	root/root	usr/share/applications/ede-tip.desktop
 -rw-r--r--	root/root	usr/share/applications/ede-xterm.desktop
+drwxr-xr-x	root/root	usr/share/dbus-1/
+drwxr-xr-x	root/root	usr/share/dbus-1/services/
+-rw-r--r--	root/root	usr/share/dbus-1/services/org.equinoxproject.Launch.service
+-rw-r--r--	root/root	usr/share/dbus-1/services/org.equinoxproject.StartupNotify.service
 drwxr-xr-x	root/root	usr/share/desktop-directories/
 -rw-r--r--	root/root	usr/share/desktop-directories/ede-accessories.directory
 -rw-r--r--	root/root	usr/share/desktop-directories/ede-development.directory
@@ -102,11 +107,11 @@ drwxr-xr-x	root/root	usr/share/doc/ede-2.0.0/manual/images/callouts/
 -rw-r--r--	root/root	usr/share/doc/ede-2.0.0/manual/images/warning.png
 -rw-r--r--	root/root	usr/share/doc/ede-2.0.0/manual/index.html
 -rw-r--r--	root/root	usr/share/doc/ede-2.0.0/manual/introduction.html
--rw-r--r--	root/root	usr/share/doc/ede-2.0.0/manual/jambuild.html
 drwxr-xr-x	root/root	usr/share/ede/
 drwxr-xr-x	root/root	usr/share/ede/panel-applets/
 -rwxr-xr-x	root/root	usr/share/ede/panel-applets/clock.so
--rwxr-xr-x	root/root	usr/share/ede/panel-applets/demo.so
+-rwxr-xr-x	root/root	usr/share/ede/panel-applets/cpu_monitor.so
+-rwxr-xr-x	root/root	usr/share/ede/panel-applets/keyboard_layout.so
 -rwxr-xr-x	root/root	usr/share/ede/panel-applets/pager.so
 -rwxr-xr-x	root/root	usr/share/ede/panel-applets/quick_launch.so
 -rwxr-xr-x	root/root	usr/share/ede/panel-applets/start_menu.so
@@ -1251,14 +1256,235 @@ drwxr-xr-x	root/root	usr/share/icons/edeneu/64x64/status/
 -rw-r--r--	root/root	usr/share/icons/edeneu/64x64/status/printer-error.png
 -rw-r--r--	root/root	usr/share/icons/edeneu/64x64/status/user-trash-full.png
 -rw-r--r--	root/root	usr/share/icons/edeneu/index.theme
+drwxr-xr-x	root/root	usr/share/icons/kbflags/
+drwxr-xr-x	root/root	usr/share/icons/kbflags/21x14/
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/C.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ad.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ae.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/af.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ag.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ai.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/al.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/am.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/an.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ao.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ar.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/as.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/at.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/au.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/aw.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/az.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ba.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bb.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bd.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/be.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bf.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bg.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bh.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bi.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bj.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bm.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bn.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bo.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/br.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bs.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bt.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bw.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/by.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/bz.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ca.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/cc.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/cd.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/cf.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/cg.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ch.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ci.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ck.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/cl.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/cm.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/cn.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/co.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/cr.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/cu.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/cv.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/cy.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/cz.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/de.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/dj.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/dk.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/dm.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/do.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/dz.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ec.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ee.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/eg.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/eh.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/er.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/es.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/et.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/fi.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/fj.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/fk.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/fm.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/fo.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/fr.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ga.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/gb.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/gd.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ge.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/gh.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/gi.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/gm.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/gn.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/gp.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/gq.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/gr.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/gt.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/gu.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/gw.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/gy.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/hk.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/hn.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/hr.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ht.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/hu.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/id.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ie.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/il.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/in.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/iq.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ir.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/is.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/it.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/jm.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/jo.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/jp.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ke.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/kg.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/kh.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ki.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/km.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/kn.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/kp.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/kr.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/kw.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ky.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/kz.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/la.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/lb.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/lc.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/li.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/lk.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/lr.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ls.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/lt.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/lu.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/lv.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ly.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ma.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mc.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/md.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mg.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mh.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mk.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ml.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mm.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mn.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mo.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mq.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mr.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ms.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mt.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mu.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mv.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mw.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mx.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/my.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/mz.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/na.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/nc.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ne.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/nf.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ng.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ni.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/nl.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/no.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/np.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/nr.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/nu.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/nz.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/om.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/pa.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/pe.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/pf.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/pg.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ph.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/pk.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/pl.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/pm.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/pn.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/pr.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ps.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/pt.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/pw.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/py.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/qa.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ro.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ru.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/rw.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/sa.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/sb.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/sc.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/sd.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/se.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/sg.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/sh.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/si.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/sk.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/sm.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/sn.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/so.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/sr.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/st.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/sv.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/sy.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/sz.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/tc.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/td.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/tg.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/th.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/tj.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/tk.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/tm.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/tn.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/to.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/tp.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/tr.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/tt.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/tv.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/tw.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/tz.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ua.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ug.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/us.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/uy.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/uz.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/va.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/vc.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ve.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/vg.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/vi.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/vn.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/vu.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/wf.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ws.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/ye.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/yu.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/za.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/zm.png
+-rw-r--r--	root/root	usr/share/icons/kbflags/21x14/zw.png
 drwxr-xr-x	root/root	usr/share/mime/
 drwxr-xr-x	root/root	usr/share/mime/packages/
 -rw-r--r--	root/root	usr/share/mime/packages/x-fluid.xml
-drwxr-xr-x	root/root	usr/usr/
-drwxr-xr-x	root/root	usr/usr/share/
-drwxr-xr-x	root/root	usr/usr/share/dbus-1/
-drwxr-xr-x	root/root	usr/usr/share/dbus-1/services/
--rw-r--r--	root/root	usr/usr/share/dbus-1/services/org.equinoxproject.Launch.service
--rw-r--r--	root/root	usr/usr/share/dbus-1/services/org.equinoxproject.StartupNotify.service
-drwxr-xr-x	root/root	usr/usr/share/xsessions/
--rw-r--r--	root/root	usr/usr/share/xsessions/ede.desktop
+drwxr-xr-x	root/root	usr/share/xsessions/
+-rw-r--r--	root/root	usr/share/xsessions/ede.desktop
diff --git a/extra/ede/.md5sum b/extra/ede/.md5sum
index 52b0e2107..d8d6aac59 100644
--- a/extra/ede/.md5sum
+++ b/extra/ede/.md5sum
@@ -1,4 +1,2 @@
-60aec5c97feea9e72c0edb5a1928b67c  ede-2.0-beta.c++.patch
-46d056e6e2122f8d3e204535c28a0f6c  ede-2.0-beta.edelibinclude.patch
-8ea3294fed5d2d9090b509cd8861a4e8  ede-2.0-beta.jamconfig.patch
-087584345140104a935ca2da3a2ea651  ede-2.0-beta.tar.gz
+fb13f3ba25d9142e69a559a708e606cb  ede-2.0-beta-2.tar.gz
+5f059ca047a7a9354be3c0c0246b0f3e  edeneu.tar.gz
diff --git a/extra/ede/Pkgfile b/extra/ede/Pkgfile
index fba05b26c..b2b95f037 100644
--- a/extra/ede/Pkgfile
+++ b/extra/ede/Pkgfile
@@ -5,19 +5,15 @@
 # Depends on: edelib, dbus
 
 name=ede
-version=2.0-beta
-release=2
-source=(http://downloads.sourceforge.net/project/ede/$name/2.0-beta/$name-$version.tar.gz\
-	ede-2.0-beta.c++.patch \
-	ede-2.0-beta.edelibinclude.patch \
-	ede-2.0-beta.jamconfig.patch )
+version=2.0-beta-2
+release=1
+source=(http://kiao.no-ip.info/NuTyX/files/$name-$version.tar.gz\
+	http://kiao.no-ip.info/NuTyX/files/edeneu.tar.gz)
 build() {
+mv $SRC/usr $PKG/
 cd $name-*
-patch -Np1 -i ../ede-2.0-beta.c++.patch
-patch -Np1 -i ../ede-2.0-beta.edelibinclude.patch
 ./autogen.sh
 ./configure --prefix=/usr
-patch -Np1 -i ../ede-2.0-beta.jamconfig.patch
 jam
 prefix=$PKG/usr sysconfdir=$PKG/etc InstallData=$PKG jam install
 mv $PKG/usr/share/mime/packages .
diff --git a/extra/ede/ede-2.0-beta.c++.patch b/extra/ede/ede-2.0-beta.c++.patch
deleted file mode 100755
index a4762cd1e..000000000
--- a/extra/ede/ede-2.0-beta.c++.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ede-2.0-beta.orig/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/util/include/stdargx.h	2009-10-08 10:44:45.000000000 -0300
-+++ ede-2.0-beta/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/util/include/stdargx.h	2009-10-10 12:23:27.000000000 -0300
-@@ -60,7 +60,7 @@
-     */
-     memcpy(&argsxP->v, args, sizeof(argsxP->v));
- #else
--    argsxP->v = args;
-+    va_copy(argsxP->v, args);
- #endif
- }
- 
---- ede-2.0-beta.orig/ede-autostart/ede-autostart.cpp	2009-10-08 10:44:55.000000000 -0300
-+++ ede-2.0-beta/ede-autostart/ede-autostart.cpp	2009-10-11 09:37:21.000000000 -0300
-@@ -87,8 +87,8 @@
- static Fl_Check_Browser* cbrowser;
- static Fl_Pixmap         warnpix((const char**)warning_xpm);
- 
--static char* get_basename(const char* path) {
--	char* p = strrchr(path, '/');
-+static const char* get_basename(const char* path) {
-+	const char* p = strrchr(path, '/');
- 	if(p) 
- 		return (p + 1);
- 
---- ede-2.0-beta.orig/ede-desktop/Utils.cpp	2009-10-08 10:44:06.000000000 -0300
-+++ ede-2.0-beta/ede-desktop/Utils.cpp	2009-10-11 09:48:07.000000000 -0300
-@@ -305,11 +305,11 @@
- }
- 
- char* get_basename(const char* path) {
--	char* p = strrchr(path, '/');
-+	const char* p = strrchr(path, '/');
- 	if(p)
--		return (p + 1);
-+		return const_cast<char*>(p + 1);
- 
--	return (char*)path;
-+	return const_cast<char*>(path);
- }
- 
- bool is_temp_filename(const char* path) {
---- ede-2.0-beta.orig/ede-launch/ede-launch.cpp	2009-10-08 10:44:09.000000000 -0300
-+++ ede-2.0-beta/ede-launch/ede-launch.cpp	2009-10-11 09:53:11.000000000 -0300
-@@ -67,7 +67,7 @@
- }
- 
- static char* get_basename(const char* path) {
--	char *p = strrchr(path, '/');
-+	char *p = const_cast<char*>(strrchr(path, '/'));
- 	if(p)
- 		return (p + 1);
- 
diff --git a/extra/ede/ede-2.0-beta.edelibinclude.patch b/extra/ede/ede-2.0-beta.edelibinclude.patch
deleted file mode 100644
index 894f81f01..000000000
--- a/extra/ede/ede-2.0-beta.edelibinclude.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ede-2.0-beta.orig/build/Program.jam	2009-10-08 10:44:35.000000000 -0300
-+++ ede-2.0-beta/build/Program.jam	2009-10-11 09:31:50.000000000 -0300
-@@ -76,8 +76,8 @@
- # and FLTKLIB. If [noinstall] is given, [target] will not be installed wit 'jam install'.
- rule EdeProgram
- {
--	if ! $(EDELIBINCLUDE) || ! $(EDELIBLIB) {
--		Echo "EDELIBINCLUDE or EDELIBLIB not defined; $(1) will not be built" ;
-+	if ! $(EDELIBLIB) {
-+		Echo "EDELIBLIB not defined; $(1) will not be built" ;
- 		return ;
- 	}
- 
-@@ -95,8 +95,8 @@
- # and FLTKLIB. If [noinstall] is given, [target] will not be installed wit 'jam install'.
- rule EdeProgramAsFltkBare
- {
--	if ! $(EDELIBINCLUDE) || ! $(EDELIBLIB) {
--		Echo "EDELIBINCLUDE or EDELIBLIB not defined; $(1) will not be built" ;
-+	if ! $(EDELIBLIB) {
-+		Echo "EDELIBLIB not defined; $(1) will not be built" ;
- 		return ;
- 	}
- 
diff --git a/extra/ede/ede-2.0-beta.jamconfig.patch b/extra/ede/ede-2.0-beta.jamconfig.patch
deleted file mode 100644
index 4aef16fa6..000000000
--- a/extra/ede/ede-2.0-beta.jamconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- ede-2.0-beta/Jamconfig	2010-01-16 20:57:34.000000000 +0100
-+++ ede-2.0-beta/Jamconfig.new	2010-01-16 20:58:46.000000000 +0100
-@@ -48,8 +48,8 @@
- PREFIX                ?= "$(prefix)" ;
- EDE_BIN_DIR           ?= "$(bindir)" ;
- EDE_DATA_DIR          ?= "$(datadir)" ;
--EDE_CONFIG_DIR        ?= "/etc/xdg/$(EDE_PREFIX_SUBDIR)" ;
--EDE_MENU_DIR          ?= "/etc/xdg/menus" ; # use XDG default for menu dir
-+EDE_CONFIG_DIR        ?= "$(sysconfdir)/xdg/$(EDE_PREFIX_SUBDIR)" ;
-+EDE_MENU_DIR          ?= "$(sysconfdir)/xdg/menus" ; # use XDG default for menu dir
- EDE_ICON_DIR          ?= "$(EDE_DATA_DIR)/icons" ;
- EDE_MIME_DIR          ?= "$(EDE_DATA_DIR)/mime" ; # use XDG mime path
- EDE_DOC_DIR           ?= "$(docdir)/ede-$(EDE_VERSION)" ;
-@@ -134,7 +134,7 @@
- 	PTHREAD_LIBS   ?=  ;
- }
- 
--DBUS_SERVICE_DIR ?= /usr/share/dbus-1/services ;
-+DBUS_SERVICE_DIR ?= $(prefix)/usr/share/dbus-1/services ;
- 
- # do not touch this
- JAMCONFIG_READ = "yes" ;
---- ede-2.0-beta/data/Jamfile	2009-10-08 15:44:25.000000000 +0200
-+++ ede-2.0-beta/data/Jamfile.new	2010-01-16 20:58:55.000000000 +0100
-@@ -16,7 +16,7 @@
- InstallEdeConfigFiles  $(CONFS) ;
- 
- # install entry for login/desktop managers
--InstallData /usr/share/xsessions : ede.desktop ;
-+InstallData $(prefix)/usr/share/xsessions : ede.desktop ;
- Clean distclean : ede.desktop ;
- 
- SubInclude TOP data mime-types ;