merge

diff --git a/packages/gnash/gnash_0.8.2.bb b/packages/gnash/gnash_0.8.2.bb
deleted file mode 100644 (file)
index da4b281..0000000
--- a/packages/gnash/gnash_0.8.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-require gnash.inc

diff --git a/packages/gtk-webcore/midori_0.0.17.bb b/packages/gtk-webcore/midori_0.0.17.bb
deleted file mode 100644 (file)
index 19cc686..0000000
--- a/packages/gtk-webcore/midori_0.0.17.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Midori is a lightweight web browser."
-LICENSE = "GPLv2"
-
-DEPENDS = "webkit-gtk libsexy" 
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \
-           file://webkit-update.patch;patch=1"
-
-

diff --git a/packages/intltool/files/intltool-0.35.5-polkit.patch b/packages/intltool/files/intltool-0.35.5-polkit.patch
deleted file mode 100644 (file)
index 2d89fbe..0000000
--- a/packages/intltool/files/intltool-0.35.5-polkit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -up intltool-0.35.5/intltool.m4.polkit intltool-0.35.5/intltool.m4
---- intltool-0.35.5/intltool.m4.polkit 2007-07-31 17:23:52.000000000 -0400
-+++ intltool-0.35.5/intltool.m4        2007-07-31 17:24:20.000000000 -0400
-@@ -65,6 +65,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
-   INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- 
- AC_SUBST(INTLTOOL_DESKTOP_RULE)
- AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-@@ -84,6 +85,7 @@ AC_SUBST(INTLTOOL_CAVES_RULE)
- AC_SUBST(INTLTOOL_SCHEMAS_RULE)
- AC_SUBST(INTLTOOL_THEME_RULE)
- AC_SUBST(INTLTOOL_SERVICE_RULE)
-+AC_SUBST(INTLTOOL_POLICY_RULE)
- 
- # Use the tools built into the package, not the ones that are installed.
- AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-diff -up intltool-0.35.5/intltool-update.in.in.polkit intltool-0.35.5/intltool-update.in.in
---- intltool-0.35.5/intltool-update.in.in.polkit       2007-07-31 17:10:52.000000000 -0400
-+++ intltool-0.35.5/intltool-update.in.in      2007-07-31 17:21:45.000000000 -0400
-@@ -71,7 +71,8 @@ my $xml_support =
- "sheet(?:\\.in)+|".   # ?
- "schemas(?:\\.in)+|". # GConf specific
- "pong(?:\\.in)+|".    # DEPRECATED: PONG is not used [by GNOME] any longer.
--"kbd(?:\\.in)+";      # GOK specific. 
-+"kbd(?:\\.in)+|".     # GOK specific. 
-+"policy(?:\\.in)+";   # PolicyKit files
- 
- my $ini_support =
- "icon(?:\\.in)+|".    # http://www.freedesktop.org/Standards/icon-theme-spec

diff --git a/packages/mono/mono-1.2.5.1/disable-monoburg.patch b/packages/mono/mono-1.2.5.1/disable-monoburg.patch
deleted file mode 100644 (file)
index 21c1e30..0000000
--- a/packages/mono/mono-1.2.5.1/disable-monoburg.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: mono-1.2.5.1/mono/Makefile.am
-===================================================================
---- mono-1.2.5.1.orig/mono/Makefile.am 2008-03-05 15:52:06.000000000 +0800
-+++ mono-1.2.5.1/mono/Makefile.am      2008-03-05 15:52:23.000000000 +0800
-@@ -1,3 +1,3 @@
- 
--SUBDIRS = utils io-layer monoburg os cil metadata \
-+SUBDIRS = utils io-layer os cil metadata \
-       arch interpreter mini dis monograph tests benchmark profiler
-Index: mono-1.2.5.1/mono/mini/Makefile.am
-===================================================================
---- mono-1.2.5.1.orig/mono/mini/Makefile.am    2008-03-05 16:02:51.000000000 +0800
-+++ mono-1.2.5.1/mono/mini/Makefile.am 2008-03-05 16:02:57.000000000 +0800
-@@ -436,7 +436,7 @@
-       $(GENMDESC_PRG) $(srcdir)/cpu-mips.md cpu-mips.h mips_desc
- 
- inssel.c inssel.h: $(BURGSRC)
--      $(monodir)/mono/monoburg/monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
-+      monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
- 
- testi: mono test.exe
-       $(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe

diff --git a/packages/python/python-pygtk/nodocs.patch b/packages/python/python-pygtk/nodocs.patch
deleted file mode 100644 (file)
index 9b2387e..0000000
--- a/packages/python/python-pygtk/nodocs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pygtk-2.10.4/Makefile.am
-===================================================================
---- pygtk-2.10.4.orig/Makefile.am
-+++ pygtk-2.10.4/Makefile.am
-@@ -4,7 +4,7 @@ if BUILD_GTK
-   GTK_SUBDIR = gtk
- endif
- 
--SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs
-+SUBDIRS = codegen . $(GTK_SUBDIR) examples tests
- 
- PLATFORM_VERSION = 2.0
-