olsr: consolidate olsr and olsrd into a common directory

diff --git a/packages/olsrd/olsrd.inc b/packages/olsr/olsrd.inc
similarity index 100%
rename from packages/olsrd/olsrd.inc
rename to packages/olsr/olsrd.inc

diff --git a/packages/olsrd/.mtn2git_empty b/packages/olsr/olsrd/.mtn2git_empty
similarity index 100%
rename from packages/olsrd/.mtn2git_empty
rename to packages/olsr/olsrd/.mtn2git_empty

diff --git a/packages/olsrd/files/0.4.9-httpinfo-makefile.diff b/packages/olsr/olsrd/0.4.9-httpinfo-makefile.diff
similarity index 100%
rename from packages/olsrd/files/0.4.9-httpinfo-makefile.diff
rename to packages/olsr/olsrd/0.4.9-httpinfo-makefile.diff

diff --git a/packages/olsrd/files/init b/packages/olsr/olsrd/init
similarity index 100%
rename from packages/olsrd/files/init
rename to packages/olsr/olsrd/init

diff --git a/packages/olsrd/files/lib.diff b/packages/olsr/olsrd/lib.diff
similarity index 100%
rename from packages/olsrd/files/lib.diff
rename to packages/olsr/olsrd/lib.diff

diff --git a/packages/olsrd/files/olsrd.conf b/packages/olsr/olsrd/olsrd.conf
similarity index 100%
rename from packages/olsrd/files/olsrd.conf
rename to packages/olsr/olsrd/olsrd.conf

diff --git a/packages/olsrd/files/unbreak-makefile.patch b/packages/olsr/olsrd/unbreak-makefile.patch
similarity index 100%
rename from packages/olsrd/files/unbreak-makefile.patch
rename to packages/olsr/olsrd/unbreak-makefile.patch

diff --git a/packages/olsrd/olsrd_0.4.10.bb b/packages/olsr/olsrd_0.4.10.bb
similarity index 100%
rename from packages/olsrd/olsrd_0.4.10.bb
rename to packages/olsr/olsrd_0.4.10.bb

diff --git a/packages/olsrd/olsrd_0.4.8.bb b/packages/olsr/olsrd_0.4.8.bb
similarity index 100%
rename from packages/olsrd/olsrd_0.4.8.bb
rename to packages/olsr/olsrd_0.4.8.bb

diff --git a/packages/olsrd/olsrd_0.4.9.bb b/packages/olsr/olsrd_0.4.9.bb
similarity index 100%
rename from packages/olsrd/olsrd_0.4.9.bb
rename to packages/olsr/olsrd_0.4.9.bb

diff --git a/packages/olsrd/olsrd_0.5.3.bb b/packages/olsr/olsrd_0.5.3.bb
similarity index 100%
rename from packages/olsrd/olsrd_0.5.3.bb
rename to packages/olsr/olsrd_0.5.3.bb

diff --git a/packages/olsrd/olsrd_cvs.bb b/packages/olsr/olsrd_cvs.bb
similarity index 100%
rename from packages/olsrd/olsrd_cvs.bb
rename to packages/olsr/olsrd_cvs.bb

diff --git a/packages/olsrd/files/.mtn2git_empty b/packages/olsrd/files/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000