merge of '0f6914ddb71c4af09ef7eaffe37c3c74c50c60b7'

     and '824441f3a8e403dd32a1171069630d10f7b8d4d1'

7 files changed, 0 insertions, 100 deletions

diff --git a/packages/gpe-mixer/gpe-mixer-0.32/.mtn2git_empty b/packages/gpe-mixer/gpe-mixer-0.32/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-mixer/gpe-mixer-0.32/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-mixer/gpe-mixer-0.32/fix_makefile.patch b/packages/gpe-mixer/gpe-mixer-0.32/fix_makefile.patch
deleted file mode 100644
index 767bdec728..0000000000
--- a/packages/gpe-mixer/gpe-mixer-0.32/fix_makefile.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -urNd ../gpe-mixer-0.32-r0/gpe-mixer-0.32/Makefile gpe-mixer-0.32/Makefile
---- ../gpe-mixer-0.32-r0/gpe-mixer-0.32/Makefile	2004-08-03 03:31:33.000000000 +0100
-+++ gpe-mixer-0.32/Makefile	2004-08-03 13:00:42.000000000 +0100
-@@ -1,6 +1,6 @@
- PREFIX = /usr
- PACKAGE = gpe-mixer
--DEBUG = yes
-+DEBUG = no
- CVSBUILD = no
- GST = yes
- VERSION = 0.32
-@@ -8,26 +8,26 @@
- MEMBERS = gpe-mixer
- 
- GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -DGTK_DISABLE_DEPRECATED
--GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext -lXinerama
-+GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext
- 
--CFLAGS = $(GTKCFLAGS) -DUSE_GPE -D_GNU_SOURCE -Wall
-+PACKAGE_CFLAGS = $(GTKCFLAGS) -DUSE_GPE -D_GNU_SOURCE -Wall
- ifeq ($(DEBUG),yes)
--CFLAGS += -O2 -g
--LDFLAGS = -g #-lefence
-+PACKAGE_CFLAGS += -O2 -g
-+PACKAGE_LDFLAGS = -g #-lefence
- else
--CFLAGS += -Os -fomit-frame-pointer
-+PACKAGE_CFLAGS += -Os -fomit-frame-pointer
- endif
--CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
-+PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
- 
- ifeq ($(CVSBUILD),yes)
--CFLAGS += -I../libgpewidget
--LDFLAGS += -L../libgpewidget
-+PACKAGE_CFLAGS += -I../libgpewidget
-+PACKAGE_LDFLAGS += -L../libgpewidget
- BUILD = ../build
- else
--CFLAGS += -I/usr/include/gpe
-+PACKAGE_CFLAGS += -I/usr/include/gpe
- BUILD = build
- endif
--LDFLAGS += -lgpewidget $(GTKLDFLAGS)
-+PACKAGE_LDFLAGS += -lgpewidget $(GTKLDFLAGS)
- 
- OBJS = $(patsubst %,%.o,$(MEMBERS))
- SOURCES = $(patsubst %,%.c,$(MEMBERS))
-@@ -35,7 +35,7 @@
- all: $(PACKAGE)
- 
- $(PACKAGE): $(OBJS) $(LIB)
--	$(CC) -o $@ $^ $(LDFLAGS)
-+	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
- 
- install-program: all $(PACKAGE).desktop
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin
diff --git a/packages/gpe-mixer/gpe-mixer_0.32.bb b/packages/gpe-mixer/gpe-mixer_0.32.bb
deleted file mode 100644
index d064a3c55f..0000000000
--- a/packages/gpe-mixer/gpe-mixer_0.32.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = "GPL"
-inherit gpe pkgconfig
-
-DESCRIPTION = "GPE audio mixer"
-DEPENDS = "gtk+ libgpewidget"
-SECTION = "gpe"
-PRIORITY = "optional"
-
-SRC_URI += "file://fix_makefile.patch;patch=1"
diff --git a/packages/gpe-mixer/gpe-mixer_0.34.bb b/packages/gpe-mixer/gpe-mixer_0.34.bb
deleted file mode 100644
index d6cb6dc7d4..0000000000
--- a/packages/gpe-mixer/gpe-mixer_0.34.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-LICENSE = "GPL"
-inherit gpe pkgconfig
-
-DESCRIPTION = "GPE audio mixer"
-DEPENDS = "gtk+ libgpewidget"
-SECTION = "gpe"
-PRIORITY = "optional"
diff --git a/packages/gpe-mixer/gpe-mixer_0.38.bb b/packages/gpe-mixer/gpe-mixer_0.38.bb
deleted file mode 100644
index d6cb6dc7d4..0000000000
--- a/packages/gpe-mixer/gpe-mixer_0.38.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-LICENSE = "GPL"
-inherit gpe pkgconfig
-
-DESCRIPTION = "GPE audio mixer"
-DEPENDS = "gtk+ libgpewidget"
-SECTION = "gpe"
-PRIORITY = "optional"
diff --git a/packages/gpe-mixer/gpe-mixer_0.40.bb b/packages/gpe-mixer/gpe-mixer_0.40.bb
deleted file mode 100644
index 3d3ef98917..0000000000
--- a/packages/gpe-mixer/gpe-mixer_0.40.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "GPL"
-PR = "r0"
-
-inherit gpe pkgconfig
-
-DESCRIPTION = "GPE audio mixer"
-DEPENDS = "gtk+ libgpewidget"
-SECTION = "gpe"
-PRIORITY = "optional"
-
diff --git a/packages/gpe-mixer/gpe-mixer_0.41.bb b/packages/gpe-mixer/gpe-mixer_0.41.bb
deleted file mode 100644
index 3d3ef98917..0000000000
--- a/packages/gpe-mixer/gpe-mixer_0.41.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "GPL"
-PR = "r0"
-
-inherit gpe pkgconfig
-
-DESCRIPTION = "GPE audio mixer"
-DEPENDS = "gtk+ libgpewidget"
-SECTION = "gpe"
-PRIORITY = "optional"
-