Imported Upstream version 1.7.4

diff --git a/ChangeLog b/ChangeLog
index c18af64..2aa9ec7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,3 +92,12 @@
 
        * 1.7.3 release
 
+2012-12-17 Vincent Torri
+
+       * Add XML output to doc
+       * Add installation rule for doc
+
+2012-12-21  Luis Felipe Strano Moraes
+
+       * 1.7.4 release
+

diff --git a/Makefile.am b/Makefile.am
index 1d9b0ec..726c9e4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,10 +71,14 @@ m4/efl_binary.m4 \
 m4/efl_compiler_flag.m4 \
 m4/efl_doxygen.m4
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 # Documentation
 
 doc:
        @echo "entering doc/"
        make -C doc doc
+
+install-doc:
+       @echo "entering doc/"
+       make -C doc install-doc

diff --git a/Makefile.in b/Makefile.in
index c15c254..b79843a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -933,7 +933,7 @@ uninstall-am: uninstall-pkgconfigDATA
        uninstall uninstall-am uninstall-pkgconfigDATA
 
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 # Documentation
 
@@ -941,6 +941,10 @@ doc:
        @echo "entering doc/"
        make -C doc doc
 
+install-doc:
+       @echo "entering doc/"
+       make -C doc install-doc
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/NEWS b/NEWS
index 5b75f7e..bdfce1a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,10 @@
-E_dbus 1.7.3
+E_dbus 1.7.4
+
+Changes since E_dbus 1.7.3:
+---------------------------
+
+   * Add XML output to doc
+   * Add installation rule for doc
 
 Changes since E_dbus 1.7.2:
 ---------------------------

diff --git a/README b/README
index e6f8005..9d6d0cd 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-E_dbus 1.7.0
+E_dbus 1.7.4
 
 ******************************************************************************
 

diff --git a/configure b/configure
index 2f95af3..1eb9f38 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for e_dbus 1.7.3.
+# Generated by GNU Autoconf 2.68 for e_dbus 1.7.4.
 #
 # Report bugs to <enlightenment-devel@lists.sourceforge.net>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='e_dbus'
 PACKAGE_TARNAME='e_dbus'
-PACKAGE_VERSION='1.7.3'
-PACKAGE_STRING='e_dbus 1.7.3'
+PACKAGE_VERSION='1.7.4'
+PACKAGE_STRING='e_dbus 1.7.4'
 PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1441,7 +1441,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures e_dbus 1.7.3 to adapt to many kinds of systems.
+\`configure' configures e_dbus 1.7.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1511,7 +1511,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of e_dbus 1.7.3:";;
+     short | recursive ) echo "Configuration of e_dbus 1.7.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1703,7 +1703,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-e_dbus configure 1.7.3
+e_dbus configure 1.7.4
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2035,7 +2035,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by e_dbus $as_me 1.7.3, which was
+It was created by e_dbus $as_me 1.7.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2859,7 +2859,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='e_dbus'
- VERSION='1.7.3'
+ VERSION='1.7.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11830,7 +11830,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define VMIC 3
+#define VMIC 4
 _ACEOF
 
 
@@ -11838,7 +11838,7 @@ cat >>confdefs.h <<_ACEOF
 #define VREV 0
 _ACEOF
 
-version_info="8:3:7"
+version_info="8:4:7"
 release_info=""
 
 
@@ -15819,7 +15819,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by e_dbus $as_me 1.7.3, which was
+This file was extended by e_dbus $as_me 1.7.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15885,7 +15885,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-e_dbus config.status 1.7.3
+e_dbus config.status 1.7.4
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -17716,6 +17716,9 @@ echo "    EOfono test........: $have_edbus_ofono_test"
 echo "    EUkit test.........: $have_edbus_ukit_test"
 echo
 echo "Documentation..........: ${build_doc}"
+if test "x${build_doc}" = "xyes" ; then
+echo "    Installation.......: make install-doc"
+fi
 echo
 echo "Compilation............: make (or gmake)"
 echo "  CPPFLAGS.............: $CPPFLAGS"

diff --git a/configure.ac b/configure.ac
index dd74d4b..4489595 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
 m4_define([v_min], [7])
-m4_define([v_mic], [3])
+m4_define([v_mic], [4])
 m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
 m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
 ##--   When released, remove the dnl on the below line
@@ -400,6 +400,9 @@ echo "    EOfono test........: $have_edbus_ofono_test"
 echo "    EUkit test.........: $have_edbus_ukit_test"
 echo
 echo "Documentation..........: ${build_doc}"
+if test "x${build_doc}" = "xyes" ; then
+echo "    Installation.......: make install-doc"
+fi
 echo
 echo "Compilation............: make (or gmake)"
 echo "  CPPFLAGS.............: $CPPFLAGS"

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 0572ae9..6feea6e 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1288,7 +1288,7 @@ MAN_LINKS              = NO
 # generate an XML file that captures the structure of
 # the code including all documentation.
 
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 881eb10..0d17e91 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,20 +1,21 @@
 MAINTAINERCLEANFILES = Makefile.in e_dbus_doxy_warnings.txt
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
 
 if EFL_BUILD_DOC
 
 doc-clean:
-       rm -rf html/ latex/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
+       rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
 
-doc: all
+doc-build: all
        $(efl_doxygen)
-       cp $(srcdir)/images/* html/
+
+doc: doc-build
        rm -rf $(PACKAGE_DOCNAME).tar*
        mkdir -p $(PACKAGE_DOCNAME)/doc
-       cp -R html/ latex/ $(PACKAGE_DOCNAME)/doc
+       cp -R html/ latex/ xml/ $(PACKAGE_DOCNAME)/doc
        tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
        bzip2 -9 $(PACKAGE_DOCNAME).tar
        rm -rf $(PACKAGE_DOCNAME)/
@@ -22,11 +23,20 @@ doc: all
 
 clean-local: doc-clean
 
+install-doc: doc-build
+       install -d $(docdir)
+       cp -R html latex man xml $(docdir)
+
+uninstall-local:
+       rm -rf $(docdir)/html $(docdir)/latex $(docdir)/man $(docdir)/xml
+
 else
 
 doc:
        @echo "Documentation not built. Run ./configure --help"
 
+install-doc: doc
+
 endif
 
 EXTRA_DIST = Doxyfile.in $(wildcard images/*.*) e.css head.html foot.html

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 936fa34..e156953 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -352,6 +352,7 @@ maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+@EFL_BUILD_DOC_FALSE@uninstall-local:
 @EFL_BUILD_DOC_FALSE@clean-local:
 clean: clean-am
 
@@ -417,7 +418,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-local
 
 .MAKE: install-am install-strip
 
@@ -431,20 +432,21 @@ uninstall-am:
        install-strip installcheck installcheck-am installdirs \
        maintainer-clean maintainer-clean-generic mostlyclean \
        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       uninstall uninstall-am
+       uninstall uninstall-am uninstall-local
 
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 @EFL_BUILD_DOC_TRUE@doc-clean:
-@EFL_BUILD_DOC_TRUE@   rm -rf html/ latex/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
+@EFL_BUILD_DOC_TRUE@   rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
 
-@EFL_BUILD_DOC_TRUE@doc: all
+@EFL_BUILD_DOC_TRUE@doc-build: all
 @EFL_BUILD_DOC_TRUE@   $(efl_doxygen)
-@EFL_BUILD_DOC_TRUE@   cp $(srcdir)/images/* html/
+
+@EFL_BUILD_DOC_TRUE@doc: doc-build
 @EFL_BUILD_DOC_TRUE@   rm -rf $(PACKAGE_DOCNAME).tar*
 @EFL_BUILD_DOC_TRUE@   mkdir -p $(PACKAGE_DOCNAME)/doc
-@EFL_BUILD_DOC_TRUE@   cp -R html/ latex/ $(PACKAGE_DOCNAME)/doc
+@EFL_BUILD_DOC_TRUE@   cp -R html/ latex/ xml/ $(PACKAGE_DOCNAME)/doc
 @EFL_BUILD_DOC_TRUE@   tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
 @EFL_BUILD_DOC_TRUE@   bzip2 -9 $(PACKAGE_DOCNAME).tar
 @EFL_BUILD_DOC_TRUE@   rm -rf $(PACKAGE_DOCNAME)/
@@ -452,9 +454,18 @@ uninstall-am:
 
 @EFL_BUILD_DOC_TRUE@clean-local: doc-clean
 
+@EFL_BUILD_DOC_TRUE@install-doc: doc-build
+@EFL_BUILD_DOC_TRUE@   install -d $(docdir)
+@EFL_BUILD_DOC_TRUE@   cp -R html latex man xml $(docdir)
+
+@EFL_BUILD_DOC_TRUE@uninstall-local:
+@EFL_BUILD_DOC_TRUE@   rm -rf $(docdir)/html $(docdir)/latex $(docdir)/man $(docdir)/xml
+
 @EFL_BUILD_DOC_FALSE@doc:
 @EFL_BUILD_DOC_FALSE@  @echo "Documentation not built. Run ./configure --help"
 
+@EFL_BUILD_DOC_FALSE@install-doc: doc
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/e_dbus.spec b/e_dbus.spec
index cb2e316..612824f 100644 (file)
--- a/e_dbus.spec
+++ b/e_dbus.spec
@@ -4,7 +4,7 @@
 
 Summary: EFL Wrapper for DBus
 Name: e_dbus
-Version: 1.7.3
+Version: 1.7.4
 Release: %{_rel}
 License: BSD
 Group: System Environment/Libraries

diff --git a/ebluez.pc b/ebluez.pc
index 58dd03c..1951772 100644 (file)
--- a/ebluez.pc
+++ b/ebluez.pc
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: ebluez
 Description: bluetooth device manager (bluez)
 Requires.private: edbus >= 1.6.99
-Version: 1.7.3
+Version: 1.7.4
 Libs: -L${libdir} -lebluez
 Cflags: -I${includedir}/e_dbus-1

diff --git a/econnman-0.7x.pc b/econnman-0.7x.pc
index d164d38..02642ab 100644 (file)
--- a/econnman-0.7x.pc
+++ b/econnman-0.7x.pc
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: econnman-0.7x
 Description: network connection manager (connman v0.7x)
 Requires.private: edbus >= 1.6.99
-Version: 1.7.3
+Version: 1.7.4
 Libs: -L${libdir} -leconnman0_7x
 Cflags: -I${includedir}/e_dbus-1

diff --git a/edbus.pc b/edbus.pc
index d2f2b17..480d689 100644 (file)
--- a/edbus.pc
+++ b/edbus.pc
@@ -1,11 +1,13 @@
+PACKAGE_TARNAME=e_dbus
 prefix=/home/lfelipe/e-release/release/local
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
+docdir=${prefix}/share/doc/${PACKAGE_TARNAME}
 
 Name: edbus
 Description: DBus convenience library
 Requires.private: ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62
-Version: 1.7.3
+Version: 1.7.4
 Libs: -L${libdir} -ledbus -ldbus-1 -lpthread -lrt  
 Cflags: -I${includedir}/e_dbus-1

diff --git a/edbus.pc.in b/edbus.pc.in
index e3e368c..c08e693 100644 (file)
--- a/edbus.pc.in
+++ b/edbus.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: edbus
 Description: DBus convenience library

diff --git a/ehal.pc b/ehal.pc
index 0a62a10..5871021 100644 (file)
--- a/ehal.pc
+++ b/ehal.pc
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: ehal
 Description: Hal convenience library
 Requires.private: edbus >= 1.6.99
-Version: 1.7.3
+Version: 1.7.4
 Libs: -L${libdir} -lehal
 Cflags: -I${includedir}/e_dbus-1

diff --git a/enotify.pc b/enotify.pc
index 7f02ed9..6413f41 100644 (file)
--- a/enotify.pc
+++ b/enotify.pc
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: enotify
 Description: Notification convenience library
 Requires.private: evas >= 1.6.99 edbus >= 1.6.99
-Version: 1.7.3
+Version: 1.7.4
 Libs: -L${libdir} -lenotify
 Cflags: -I${includedir}/e_dbus-1

diff --git a/eofono.pc b/eofono.pc
index 57ccb39..503c49e 100644 (file)
--- a/eofono.pc
+++ b/eofono.pc
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: eofono
 Description: oFono D-Bus wrappers
 Requires.private: edbus >= 1.6.99
-Version: 1.7.3
+Version: 1.7.4
 Libs: -L${libdir} -leofono
 Cflags: -I${includedir}/e_dbus-1

diff --git a/eukit.pc b/eukit.pc
index b81d915..ee2a468 100644 (file)
--- a/eukit.pc
+++ b/eukit.pc
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: eukit
 Description: udisks/upower convenience library
 Requires.private: edbus >= 1.6.99
-Version: 1.7.3
+Version: 1.7.4
 Libs: -L${libdir} -leukit
 Cflags: -I${includedir}/e_dbus-1