[Pkg-telepathy-commits] [SCM] Empathy packaging branch, ubuntu, updated. debian/2.27.3-1-31-g5b7f666
Laurent Bigonville
bigon at bigon.be
Wed Jun 24 13:17:48 UTC 2009
The following commit has been merged in the ubuntu branch:
commit afdfb0ceeb4441c20e03d83921238ff9213dfc2a
Author: Laurent Bigonville <bigon at bigon.be>
Date: Sun Jun 21 23:52:15 2009 +0200
debian/patches/099_autoreconf.patch: Run autoreconf
diff --git a/debian/changelog b/debian/changelog
index 4d01c9d..515ac21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ empathy (2.27.3-1ubuntu1) UNRELEASED; urgency=low
- Bump telepathy-butterfly and telepathy-haze to recommends
* debian/patches/001_add_indicator.patch:
- Add libindicate support (LP: #340180)
+ * debian/patches/099_autoreconf.patch: Run autoreconf
- -- Laurent Bigonville <bigon at ubuntu.com> Sun, 21 Jun 2009 23:45:26 +0200
+ -- Laurent Bigonville <bigon at ubuntu.com> Sun, 21 Jun 2009 23:51:41 +0200
empathy (2.27.3-1) experimental; urgency=low
diff --git a/debian/patches/099_autoreconf.patch b/debian/patches/099_autoreconf.patch
new file mode 100644
index 0000000..ee6f7a0
--- /dev/null
+++ b/debian/patches/099_autoreconf.patch
@@ -0,0 +1,776 @@
+diff --git a/Makefile.in b/Makefile.in
+index 0e542ef..f224e37 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -148,6 +148,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/config.h.in b/config.h.in
+index 9d2d48b..ab5071d 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -36,6 +36,9 @@
+ /* Define if you have libchamplain */
+ #undef HAVE_LIBCHAMPLAIN
+
++/* Define if you have libindicate */
++#undef HAVE_LIBINDICATE
++
+ /* Define to 1 if you have the <locale.h> header file. */
+ #undef HAVE_LOCALE_H
+
+diff --git a/configure b/configure
+index e4fadf0..d3c4774 100755
+--- a/configure
++++ b/configure
+@@ -813,6 +813,10 @@ HAVE_TESTS_FALSE
+ HAVE_TESTS_TRUE
+ CHECK_LIBS
+ CHECK_CFLAGS
++HAVE_LIBINDICATE_FALSE
++HAVE_LIBINDICATE_TRUE
++INDICATE_LIBS
++INDICATE_CFLAGS
+ HAVE_NOTHERE_FALSE
+ HAVE_NOTHERE_TRUE
+ NOTHERE_LIBS
+@@ -1081,6 +1085,7 @@ enable_map
+ enable_location
+ enable_megaphone
+ enable_nothere
++enable_libindicate
+ enable_tests
+ enable_python
+ enable_coding_style_checks
+@@ -1119,6 +1124,8 @@ MEGAPHONE_CFLAGS
+ MEGAPHONE_LIBS
+ NOTHERE_CFLAGS
+ NOTHERE_LIBS
++INDICATE_CFLAGS
++INDICATE_LIBS
+ CHECK_CFLAGS
+ CHECK_LIBS
+ PYTHON_BINDING_CFLAGS
+@@ -1785,6 +1792,8 @@ Optional Features:
+ build megaphone applet
+ --enable-nothere=[no/yes/auto]
+ build nothere applet
++ --enable-libindicate=[no/yes/auto]
++ build libindicate support
+ --enable-tests=[no/yes/auto]
+ build tests
+ --enable-python=[no/yes/auto]
+@@ -1867,6 +1876,10 @@ Some influential environment variables:
+ C compiler flags for NOTHERE, overriding pkg-config
+ NOTHERE_LIBS
+ linker flags for NOTHERE, overriding pkg-config
++ INDICATE_CFLAGS
++ C compiler flags for INDICATE, overriding pkg-config
++ INDICATE_LIBS
++ linker flags for INDICATE, overriding pkg-config
+ CHECK_CFLAGS
+ C compiler flags for CHECK, overriding pkg-config
+ CHECK_LIBS linker flags for CHECK, overriding pkg-config
+@@ -6002,13 +6015,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
+ else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:6005: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6018: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6008: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6021: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6011: output\"" >&5)
++ (eval echo "\"\$as_me:6024: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -7213,7 +7226,7 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7216 "configure"' > conftest.$ac_ext
++ echo '#line 7229 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -8655,11 +8668,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8658: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8671: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8662: \$? = $ac_status" >&5
++ echo "$as_me:8675: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -8994,11 +9007,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8997: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9010: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9001: \$? = $ac_status" >&5
++ echo "$as_me:9014: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9099,11 +9112,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9102: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9115: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9106: \$? = $ac_status" >&5
++ echo "$as_me:9119: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -9154,11 +9167,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9157: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9170: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9161: \$? = $ac_status" >&5
++ echo "$as_me:9174: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -11967,7 +11980,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11970 "configure"
++#line 11983 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12063,7 +12076,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 12066 "configure"
++#line 12079 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -18922,6 +18935,132 @@ fi
+
+
+ # -----------------------------------------------------------
++# libindicate
++# -----------------------------------------------------------
++# Check whether --enable-libindicate was given.
++if test "${enable_libindicate+set}" = set; then
++ enableval=$enable_libindicate;
++else
++ enable_libindicate=auto
++fi
++
++
++if test "x$enable_libindicate" != "xno"; then
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for INDICATE" >&5
++$as_echo_n "checking for INDICATE... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$INDICATE_CFLAGS"; then
++ pkg_cv_INDICATE_CFLAGS="$INDICATE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
++ indicate
++ \"") >&5
++ ($PKG_CONFIG --exists --print-errors "
++ indicate
++ ") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_INDICATE_CFLAGS=`$PKG_CONFIG --cflags "
++ indicate
++ " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$INDICATE_LIBS"; then
++ pkg_cv_INDICATE_LIBS="$INDICATE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
++ indicate
++ \"") >&5
++ ($PKG_CONFIG --exists --print-errors "
++ indicate
++ ") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_INDICATE_LIBS=`$PKG_CONFIG --libs "
++ indicate
++ " 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ INDICATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
++ indicate
++ "`
++ else
++ INDICATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
++ indicate
++ "`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$INDICATE_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++ have_libindicate="no"
++elif test $pkg_failed = untried; then
++ have_libindicate="no"
++else
++ INDICATE_CFLAGS=$pkg_cv_INDICATE_CFLAGS
++ INDICATE_LIBS=$pkg_cv_INDICATE_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ have_libindicate="yes"
++fi
++else
++ have_libindicate=no
++fi
++
++if test "x$enable_libindicate" = "xyes" -a "x$have_libindicate" != "xyes"; then
++ { { $as_echo "$as_me:$LINENO: error: Couldn't find libindicate." >&5
++$as_echo "$as_me: error: Couldn't find libindicate." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++if test "x$enable_libindicate" = "xyes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LIBINDICATE 1
++_ACEOF
++
++fi
++
++ if test "x$have_libindicate" = "xyes"; then
++ HAVE_LIBINDICATE_TRUE=
++ HAVE_LIBINDICATE_FALSE='#'
++else
++ HAVE_LIBINDICATE_TRUE='#'
++ HAVE_LIBINDICATE_FALSE=
++fi
++
++
++# -----------------------------------------------------------
+ # Tests
+ # -----------------------------------------------------------
+ # Check whether --enable-tests was given.
+@@ -19647,6 +19786,13 @@ $as_echo "$as_me: error: conditional \"HAVE_NOTHERE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
++if test -z "${HAVE_LIBINDICATE_TRUE}" && test -z "${HAVE_LIBINDICATE_FALSE}"; then
++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBINDICATE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"HAVE_LIBINDICATE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
+ if test -z "${HAVE_TESTS_TRUE}" && test -z "${HAVE_TESTS_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TESTS\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -21955,22 +22101,23 @@ fi
+ echo "
+ Configure summary:
+
+- Compiler....................: ${CC}
+- Compiler Flags..............: ${CFLAGS}
+- Prefix......................: ${prefix}
+- Shaved build................: ${enable_shave}
+- Tests.......................: ${have_check}
+- Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS}
++ Compiler...............................: ${CC}
++ Compiler Flags.........................: ${CFLAGS}
++ Prefix.................................: ${prefix}
++ Shaved build...........................: ${enable_shave}
++ Tests..................................: ${have_check}
++ Coding style checks....................: ${ENABLE_CODING_STYLE_CHECKS}
+
+ Features:
+- Spell checking (enchant)....: ${have_enchant}
+- Display maps (libchamplain).: ${have_libchamplain}
+- Location awareness (Geoclue): ${have_geoclue}
+- Adium themes (Webkit).......: ${have_webkit}
++ Spell checking (enchant)...............: ${have_enchant}
++ Display maps (libchamplain)............: ${have_libchamplain}
++ Location awareness (Geoclue)...........: ${have_geoclue}
++ Adium themes (Webkit)..................: ${have_webkit}
++ Message indicator support (libindicate): ${have_libindicate}
+
+ Extras:
+- Documentation...............: ${enable_gtk_doc}
+- Python bindings.............: ${have_python}
+- Megaphone applet............: ${have_megaphone}
+- Nothere applet..............: ${have_nothere}
++ Documentation..........................: ${enable_gtk_doc}
++ Python bindings........................: ${have_python}
++ Megaphone applet.......................: ${have_megaphone}
++ Nothere applet.........................: ${have_nothere}
+ "
+diff --git a/data/Makefile.in b/data/Makefile.in
+index c2135f4..749f9bf 100644
+--- a/data/Makefile.in
++++ b/data/Makefile.in
+@@ -138,6 +138,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
+index c18c021..8ab59b7 100644
+--- a/data/icons/Makefile.in
++++ b/data/icons/Makefile.in
+@@ -111,6 +111,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/docs/Makefile.in b/docs/Makefile.in
+index cc696b4..68a3549 100644
+--- a/docs/Makefile.in
++++ b/docs/Makefile.in
+@@ -123,6 +123,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/docs/libempathy-gtk/Makefile.in b/docs/libempathy-gtk/Makefile.in
+index 84a9a5f..da9d64c 100644
+--- a/docs/libempathy-gtk/Makefile.in
++++ b/docs/libempathy-gtk/Makefile.in
+@@ -118,6 +118,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/docs/libempathy/Makefile.in b/docs/libempathy/Makefile.in
+index 1e448c0..b6fe703 100644
+--- a/docs/libempathy/Makefile.in
++++ b/docs/libempathy/Makefile.in
+@@ -118,6 +118,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/extensions/Makefile.in b/extensions/Makefile.in
+index 9328c37..6351b27 100644
+--- a/extensions/Makefile.in
++++ b/extensions/Makefile.in
+@@ -134,6 +134,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/help/Makefile.in b/help/Makefile.in
+index 3f79e68..1c37e3d 100644
+--- a/help/Makefile.in
++++ b/help/Makefile.in
+@@ -136,6 +136,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/libempathy-gtk/Makefile.in b/libempathy-gtk/Makefile.in
+index 7479da8..4dcaaed 100644
+--- a/libempathy-gtk/Makefile.in
++++ b/libempathy-gtk/Makefile.in
+@@ -242,6 +242,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/libempathy/Makefile.in b/libempathy/Makefile.in
+index a22c9e4..01fe8f4 100644
+--- a/libempathy/Makefile.in
++++ b/libempathy/Makefile.in
+@@ -178,6 +178,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/megaphone/Makefile.in b/megaphone/Makefile.in
+index 3027237..332a5a3 100644
+--- a/megaphone/Makefile.in
++++ b/megaphone/Makefile.in
+@@ -123,6 +123,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/megaphone/data/Makefile.in b/megaphone/data/Makefile.in
+index 890b5f2..e97908e 100644
+--- a/megaphone/data/Makefile.in
++++ b/megaphone/data/Makefile.in
+@@ -125,6 +125,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/megaphone/src/Makefile.in b/megaphone/src/Makefile.in
+index a29c8c8..0b8aec0 100644
+--- a/megaphone/src/Makefile.in
++++ b/megaphone/src/Makefile.in
+@@ -138,6 +138,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/nothere/Makefile.in b/nothere/Makefile.in
+index 15bae7a..9233970 100644
+--- a/nothere/Makefile.in
++++ b/nothere/Makefile.in
+@@ -123,6 +123,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/nothere/data/Makefile.in b/nothere/data/Makefile.in
+index ed2f0ad..0523502 100644
+--- a/nothere/data/Makefile.in
++++ b/nothere/data/Makefile.in
+@@ -123,6 +123,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/nothere/src/Makefile.in b/nothere/src/Makefile.in
+index 00383bb..5dc574a 100644
+--- a/nothere/src/Makefile.in
++++ b/nothere/src/Makefile.in
+@@ -138,6 +138,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/python/Makefile.in b/python/Makefile.in
+index 006ead8..06f109e 100644
+--- a/python/Makefile.in
++++ b/python/Makefile.in
+@@ -123,6 +123,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/python/pyempathy/Makefile.in b/python/pyempathy/Makefile.in
+index 7c9b111..f3a4708 100644
+--- a/python/pyempathy/Makefile.in
++++ b/python/pyempathy/Makefile.in
+@@ -146,6 +146,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/python/pyempathygtk/Makefile.in b/python/pyempathygtk/Makefile.in
+index 6f204af..4c492dc 100644
+--- a/python/pyempathygtk/Makefile.in
++++ b/python/pyempathygtk/Makefile.in
+@@ -147,6 +147,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index d52f594..c9dd9ab 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -38,14 +38,24 @@ DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
+ $(top_srcdir)/tools/check-coding-style.mk \
+ $(top_srcdir)/tools/flymake.mk $(top_srcdir)/tools/shave.mk
+ bin_PROGRAMS = empathy$(EXEEXT) empathy-logs$(EXEEXT)
+- at HAVE_LIBCHAMPLAIN_TRUE@am__append_1 = \
++ at HAVE_LIBINDICATE_TRUE@am__append_1 = \
++ at HAVE_LIBINDICATE_TRUE@ empathy-indicator-manager.c \
++ at HAVE_LIBINDICATE_TRUE@ empathy-indicator-manager.h \
++ at HAVE_LIBINDICATE_TRUE@ empathy-indicator.c empathy-indicator.h
++
++ at HAVE_LIBINDICATE_FALSE@am__append_2 = \
++ at HAVE_LIBINDICATE_FALSE@ empathy-indicator-manager.c \
++ at HAVE_LIBINDICATE_FALSE@ empathy-indicator-manager.h \
++ at HAVE_LIBINDICATE_FALSE@ empathy-indicator.c empathy-indicator.h
++
++ at HAVE_LIBCHAMPLAIN_TRUE@am__append_3 = \
+ @HAVE_LIBCHAMPLAIN_TRUE@ empathy-map-view.c \
+ @HAVE_LIBCHAMPLAIN_TRUE@ empathy-map-view.h
+
+- at HAVE_LIBCHAMPLAIN_TRUE@am__append_2 = \
++ at HAVE_LIBCHAMPLAIN_TRUE@am__append_4 = \
+ @HAVE_LIBCHAMPLAIN_TRUE@ empathy-map-view.ui
+
+- at HAVE_LIBCHAMPLAIN_FALSE@am__append_3 = \
++ at HAVE_LIBCHAMPLAIN_FALSE@am__append_5 = \
+ @HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.c \
+ @HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.h \
+ @HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.ui
+@@ -88,8 +98,9 @@ am__empathy_SOURCES_DIST = empathy.c empathy-about-dialog.c \
+ empathy-sidebar.h empathy-status-icon.c empathy-status-icon.h \
+ empathy-tube-dispatch.c empathy-tube-dispatch.h \
+ bacon-message-connection.c bacon-message-connection.h \
+- ephy-spinner.c ephy-spinner.h empathy-map-view.c \
+- empathy-map-view.h
++ ephy-spinner.c ephy-spinner.h empathy-indicator-manager.c \
++ empathy-indicator-manager.h empathy-indicator.c \
++ empathy-indicator.h empathy-map-view.c empathy-map-view.h
+ am__objects_1 = empathy.$(OBJEXT) empathy-about-dialog.$(OBJEXT) \
+ empathy-accounts-dialog.$(OBJEXT) \
+ empathy-call-window.$(OBJEXT) \
+@@ -102,12 +113,15 @@ am__objects_1 = empathy.$(OBJEXT) empathy-about-dialog.$(OBJEXT) \
+ empathy-misc.$(OBJEXT) empathy-new-chatroom-dialog.$(OBJEXT) \
+ empathy-preferences.$(OBJEXT) empathy-sidebar.$(OBJEXT) \
+ empathy-status-icon.$(OBJEXT) empathy-tube-dispatch.$(OBJEXT)
+- at HAVE_LIBCHAMPLAIN_TRUE@am__objects_2 = empathy-map-view.$(OBJEXT)
++ at HAVE_LIBINDICATE_TRUE@am__objects_2 = \
++ at HAVE_LIBINDICATE_TRUE@ empathy-indicator-manager.$(OBJEXT) \
++ at HAVE_LIBINDICATE_TRUE@ empathy-indicator.$(OBJEXT)
++ at HAVE_LIBCHAMPLAIN_TRUE@am__objects_3 = empathy-map-view.$(OBJEXT)
+ am_empathy_OBJECTS = $(am__objects_1) \
+ bacon-message-connection.$(OBJEXT) ephy-spinner.$(OBJEXT) \
+- $(am__objects_2)
+-am__objects_3 = empathy-tube-dispatch-enumtypes.$(OBJEXT)
+-nodist_empathy_OBJECTS = $(am__objects_3)
++ $(am__objects_2) $(am__objects_3)
++am__objects_4 = empathy-tube-dispatch-enumtypes.$(OBJEXT)
++nodist_empathy_OBJECTS = $(am__objects_4)
+ empathy_OBJECTS = $(am_empathy_OBJECTS) $(nodist_empathy_OBJECTS)
+ empathy_LDADD = $(LDADD)
+ am__DEPENDENCIES_1 =
+@@ -116,7 +130,8 @@ empathy_DEPENDENCIES = \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/extensions/libemp-extensions.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1)
+ am_empathy_logs_OBJECTS = empathy-logs.$(OBJEXT)
+ empathy_logs_OBJECTS = $(am_empathy_logs_OBJECTS)
+ empathy_logs_LDADD = $(LDADD)
+@@ -125,7 +140,8 @@ empathy_logs_DEPENDENCIES = \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/extensions/libemp-extensions.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -215,6 +231,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -373,6 +391,7 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ $(EMPATHY_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
++ $(INDICATE_CFLAGS) \
+ $(LIBCHAMPLAIN_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
+ $(WEBKIT_CFLAGS) \
+@@ -383,6 +402,7 @@ LDADD = \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/extensions/libemp-extensions.la \
+ $(LIBNOTIFY_LIBS) \
++ $(INDICATE_LIBS) \
+ $(EMPATHY_LIBS) \
+ $(LIBCHAMPLAIN_LIBS) \
+ $(WEBKIT_LIBS)
+@@ -414,7 +434,7 @@ empathy_handwritten_source = \
+
+ empathy_SOURCES = $(empathy_handwritten_source) \
+ bacon-message-connection.c bacon-message-connection.h \
+- ephy-spinner.c ephy-spinner.h $(am__append_1)
++ ephy-spinner.c ephy-spinner.h $(am__append_1) $(am__append_3)
+ nodist_empathy_SOURCES = $(BUILT_SOURCES)
+ empathy_logs_SOURCES = empathy-logs.c
+ check_c_sources = \
+@@ -427,8 +447,9 @@ ui_DATA = empathy-accounts-dialog.ui empathy-call-window.ui \
+ empathy-chat-window.ui empathy-ft-manager.ui \
+ empathy-import-dialog.ui empathy-main-window.ui \
+ empathy-new-chatroom-dialog.ui empathy-preferences.ui \
+- empathy-status-icon.ui $(am__append_2)
+-EXTRA_DIST = $(autostart_DATA) $(ui_DATA) $(am__append_3)
++ empathy-status-icon.ui $(am__append_4)
++EXTRA_DIST = $(autostart_DATA) $(ui_DATA) $(am__append_2) \
++ $(am__append_5)
+ dist_man_MANS = \
+ empathy.1
+
+@@ -520,6 +541,8 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/empathy-ft-manager.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/empathy-import-dialog.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/empathy-import-pidgin.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/empathy-indicator-manager.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/empathy-indicator.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/empathy-logs.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/empathy-main-window.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/empathy-map-view.Po at am__quote@
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index c9f930d..00f4a8b 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -205,6 +205,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/tests/xml/Makefile.in b/tests/xml/Makefile.in
+index 9b84427..b05b689 100644
+--- a/tests/xml/Makefile.in
++++ b/tests/xml/Makefile.in
+@@ -111,6 +111,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/tools/Makefile.in b/tools/Makefile.in
+index 7951862..dd9b4fc 100644
+--- a/tools/Makefile.in
++++ b/tools/Makefile.in
+@@ -114,6 +114,8 @@ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
--
Empathy packaging
More information about the Pkg-telepathy-commits
mailing list