aboutsummaryrefslogtreecommitdiffstats
path: root/mbmerlin
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
committerChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
commit2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch)
treebf879bea7ef8517ba8c3d1286ef300401d3d484c /mbmerlin
parent101e2f1623def0a355d20aacb8bd93810703e834 (diff)
downloadopenembedded-2c5b8ec6d95cf68650265941530e5ce38c8dd6d9.tar.gz
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'mbmerlin')
-rw-r--r--mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch11
-rw-r--r--mbmerlin/mbmerlin_0.8.1-2.bb0
2 files changed, 0 insertions, 11 deletions
diff --git a/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch b/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch
deleted file mode 100644
index 0f2dabd8a3..0000000000
--- a/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urNd ../mbmerlin-0.8.1-2-r3/mbmerlin/Makefile mbmerlin/Makefile
---- ../mbmerlin-0.8.1-2-r3/mbmerlin/Makefile 2004-07-29 21:17:13.000000000 +0100
-+++ mbmerlin/Makefile 2004-08-01 11:32:09.000000000 +0100
-@@ -106,6 +106,7 @@
- install mbmerlin.desktop $(DESTDIR)/usr/share/applications/inputmethods
- install -d $(DESTDIR)/usr/share/pixmaps
- install mbmerlin.png $(DESTDIR)/usr/share/pixmaps
-+ install -d $(DESTDIR)/$(INSTALL_DIR)
- install mbmerlin $(DESTDIR)/$(INSTALL_DIR)
-
- ipkg:
diff --git a/mbmerlin/mbmerlin_0.8.1-2.bb b/mbmerlin/mbmerlin_0.8.1-2.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/mbmerlin/mbmerlin_0.8.1-2.bb
+++ /dev/null