diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-11-22 13:57:13 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 13:57:13 +0000 |
commit | cfe12efb5ec9586dab6961f141d52b103bd8b1d1 (patch) | |
tree | 7108e22aa7ddf6cfc2f1b6c6b73a811187706ecb /meta/recipes-connectivity/telepathy/empathy | |
parent | 762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e (diff) | |
download | poky-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.gz |
Meta: Recipe Reogranization
This is the next stage of recipe reorganization, in this stage
many recipes where moved to a new meta-demoapps layer since this
is more appropriate for demo usage then the core. Additional some
recipes were moved to meta-extras to indicate they may be depercated
at a future time.
A number of recipes were modified since dependencies need to be
corrected.
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/telepathy/empathy')
-rw-r--r-- | meta/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch b/meta/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch deleted file mode 100644 index 13e7943da5..0000000000 --- a/meta/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | --- | ||
2 | Makefile.am | 2 +- | ||
3 | configure.ac | 1 - | ||
4 | help/Makefile.am | 1 - | ||
5 | 3 files changed, 1 insertion(+), 3 deletions(-) | ||
6 | |||
7 | --- empathy-0.23.4.orig/Makefile.am | ||
8 | +++ empathy-0.23.4/Makefile.am | ||
9 | @@ -1,6 +1,6 @@ | ||
10 | -SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help | ||
11 | +SUBDIRS = tools extensions po data libempathy libempathy-gtk src | ||
12 | |||
13 | if HAVE_MEGAPHONE | ||
14 | SUBDIRS += megaphone | ||
15 | endif | ||
16 | |||
17 | --- empathy-0.23.4.orig/configure.ac | ||
18 | +++ empathy-0.23.4/configure.ac | ||
19 | @@ -55,11 +55,10 @@ AM_PROG_LIBTOOL | ||
20 | AM_PROG_MKDIR_P | ||
21 | AM_PATH_GLIB_2_0 | ||
22 | AC_PATH_XTRA | ||
23 | IT_PROG_INTLTOOL([0.35.0]) | ||
24 | GTK_DOC_CHECK([1.3]) | ||
25 | -GNOME_DOC_INIT | ||
26 | IDT_COMPILE_WARNINGS | ||
27 | AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) | ||
28 | AC_PATH_PROG(GCONFTOOL, gconftool-2) | ||
29 | AM_GCONF_SOURCE_2 | ||
30 | GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` | ||
31 | --- empathy-0.23.4.orig/help/Makefile.am | ||
32 | +++ empathy-0.23.4/help/Makefile.am | ||
33 | @@ -1,6 +1,5 @@ | ||
34 | -include $(top_srcdir)/gnome-doc-utils.make | ||
35 | |||
36 | DOC_MODULE = empathy | ||
37 | DOC_ENTITIES = legal.xml | ||
38 | DOC_FIGURES = \ | ||
39 | figures/empathy-main-window.png \ | ||