Rename edbus->eldbus

git grep -l edbus2 | while read f; do sed -i 's/edbus2/eldbus/g' "$f"; done
find . -name '*edbus2*' -exec rename edbus2 eldbus {} \;

git grep -l "EDBUS" | while read f; do sed -i 's/EDBUS/ELDBUS/g' "$f"; done
git grep -l "EDBus" | while read f; do sed -i 's/EDBus/Eldbus/g' "$f"; done
git grep -l "edbus (v2)" | while read f; do sed -i 's/edbus (v2)/eldbus/g' "$f"; done
git grep -l "Edbus" | while read f; do sed -i 's/Edbus/Eldbus/g' "$f"; done
git grep -l "edbus" | while read f; do sed -i 's/edbus/eldbus/g' "$f"; done

find . -name '*edbus*' -exec rename edbus eldbus {} \;
find . -name '*EDBus*' -exec rename EDBus Eldbus {} \;

.gitignore

@@ -72,7 +72,7 @@ tags
 /src/bin/evas/evas_cserve2_usage
 /src/lib/eina/eina_config.h
 /src/lib/ecore_x/ecore_x_version.h
-/src/bin/edbus/edbus-codegen
+/src/bin/eldbus/eldbus-codegen
 /src/bin/efreet/efreet_desktop_cache_create
 /src/bin/efreet/efreet_icon_cache_create
 /src/bin/efreet/efreetd
@@ -202,15 +202,15 @@ tags
 /src/examples/ecore/ecore_file_download_example
 /src/examples/ecore/ecore_imf_example
 /src/examples/ecore/ecore_pipe_gstreamer_example
-/src/examples/edbus/banshee
-/src/examples/edbus/client
-/src/examples/edbus/complex-types
-/src/examples/edbus/complex-types-client-eina-value
-/src/examples/edbus/complex-types-server
-/src/examples/edbus/connman-list-services
-/src/examples/edbus/ofono-dial
-/src/examples/edbus/server
-/src/examples/edbus/simple-signal-emit
+/src/examples/eldbus/banshee
+/src/examples/eldbus/client
+/src/examples/eldbus/complex-types
+/src/examples/eldbus/complex-types-client-eina-value
+/src/examples/eldbus/complex-types-server
+/src/examples/eldbus/connman-list-services
+/src/examples/eldbus/ofono-dial
+/src/examples/eldbus/server
+/src/examples/eldbus/simple-signal-emit
 /src/examples/edje/edje-multisense
 /src/examples/edje/edje_example
 /src/examples/eet/eet_basic
@@ -298,9 +298,9 @@ tags
 /src/tests/efreet/efreet_user_dir
 /src/tests/emotion/emotion_test
 /src/tests/ecore/ecore_suite
-/src/tests/edbus/edbus_suite
-/src/tests/edbus/edbus_suite.log
-/src/tests/edbus/edbus_suite.trs
+/src/tests/eldbus/eldbus_suite
+/src/tests/eldbus/eldbus_suite.log
+/src/tests/eldbus/eldbus_suite.trs
 /src/tests/edje/edje_suite
 /src/tests/eet/eet_suite
 /src/tests/eeze/eeze_suite
@@ -322,7 +322,7 @@ tags
 /src/tests/evas/evas_suite.trs
 /src/test-suite.log
 /src/tests/ecore/check-results.xml
-/src/tests/edbus/check-results.xml
+/src/tests/eldbus/check-results.xml
 /src/tests/edje/check-results.xml
 /src/tests/eet/check-results.xml
 /src/tests/eeze/check-results.xml

AUTHORS

@@ -215,7 +215,7 @@ Daniel Willmann <d.willmann@samsung.com>
 Jérémy Zurcher <jeremy@asynk.ch>
 
 
-EDBus
+Eldbus
 -----
 
 Gustavo Sverzut Barbieri <barbieri@profusion.mobi>

COPYING

@@ -20,7 +20,7 @@ evas:            licenses/COPYING.BSD
 embryo:          licenses/COPYING.SMALL
 ecore:           licenses/COPYING.BSD
 eio:             licenses/COPYING.LGPL
-edbus:           licenses/COPYING.LGPL
+eldbus:           licenses/COPYING.LGPL
 efreet:          licenses/COPYING.BSD
 eeze:            licenses/COPYING.BSD
 ephysics:        licenses/COPYING.BSD

Makefile.am

@@ -92,7 +92,7 @@ old/NEWS.ethumb \
 old/NEWS.evas \
 old/NEWS.evil \
 old/README.ecore \
-old/README.edbus \
+old/README.eldbus \
 old/README.edje \
 old/README.eet \
 old/README.eeze \
@@ -136,7 +136,7 @@ pc/ecore-imf-evas.pc \
 pc/ecore-evas.pc \
 pc/embryo.pc \
 pc/eio.pc \
-pc/edbus2.pc \
+pc/eldbus.pc \
 pc/efreet.pc \
 pc/efreet-mime.pc \
 pc/efreet-trash.pc \

configure.ac

@@ -3124,8 +3124,8 @@ if test "x${want_eo_id}" = "xyes" ; then
    AC_DEFINE([HAVE_EO_ID], [1], [Have eo id])
 fi
 
-#### EDBus
-EFL_LIB_START([EDBus])
+#### Eldbus
+EFL_LIB_START([Eldbus])
 
 ### Additional options to configure
 
@@ -3134,16 +3134,16 @@ EFL_LIB_START([EDBus])
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([EDBUS], [evil])
+EFL_PLATFORM_DEPEND([ELDBUS], [evil])
 
 ### Checks for libraries
-EFL_INTERNAL_DEPEND_PKG([EDBUS], [ecore])
-EFL_INTERNAL_DEPEND_PKG([EDBUS], [eo])
-EFL_INTERNAL_DEPEND_PKG([EDBUS], [eina])
+EFL_INTERNAL_DEPEND_PKG([ELDBUS], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ELDBUS], [eo])
+EFL_INTERNAL_DEPEND_PKG([ELDBUS], [eina])
 
-EFL_DEPEND_PKG([EDBUS], [DBUS], [dbus-1])
+EFL_DEPEND_PKG([ELDBUS], [DBUS], [dbus-1])
 
-EFL_EVAL_PKGS([EDBUS])
+EFL_EVAL_PKGS([ELDBUS])
 
 ### Checks for header files
 
@@ -3157,8 +3157,8 @@ EFL_EVAL_PKGS([EDBUS])
 
 ### Checks for library functions
 
-EFL_LIB_END([EDBus])
-#### End of EDBus
+EFL_LIB_END([Eldbus])
+#### End of Eldbus
 
 
 #### Efreet
@@ -3179,7 +3179,7 @@ EFL_PLATFORM_DEPEND([EFREET], [evil])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [eet])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-file])
-EFL_INTERNAL_DEPEND_PKG([EFREET], [edbus])
+EFL_INTERNAL_DEPEND_PKG([EFREET], [eldbus])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [eo])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
 
@@ -3611,7 +3611,7 @@ EFL_PLATFORM_DEPEND([ETHUMB_CLIENT], [evil])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eina])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eo])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ecore])
-EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [edbus])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eldbus])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ethumb])
 
 EFL_EVAL_PKGS([ETHUMB_CLIENT])
@@ -3662,7 +3662,7 @@ src/examples/eo/Makefile
 src/examples/evas/Makefile
 src/examples/ecore/Makefile
 src/examples/eio/Makefile
-src/examples/edbus/Makefile
+src/examples/eldbus/Makefile
 src/examples/ephysics/Makefile
 src/examples/edje/Makefile
 src/examples/emotion/Makefile
@@ -3709,7 +3709,7 @@ pc/ecore-imf-evas.pc
 pc/ecore-audio.pc
 pc/embryo.pc
 pc/eio.pc
-pc/edbus2.pc
+pc/eldbus.pc
 pc/efreet.pc
 pc/efreet-mime.pc
 pc/efreet-trash.pc

doc/Doxyfile.in

@@ -601,7 +601,7 @@ INPUT                  = @top_srcdir@/src/lib \
                          @srcdir@/evas_examples.dox \
                          @srcdir@/eo_tutorial.dox \
                          @srcdir@/eio_examples.dox \
-                         @srcdir@/edbus_examples.dox \
+                         @srcdir@/eldbus_examples.dox \
                          @srcdir@/ephysics_examples.dox \
                          @srcdir@/edje_examples.dox \
                          @top_srcdir@/src/bin/edje/edje_cc_handlers.c \
@@ -815,7 +815,7 @@ evas_ _evas_ Evas_ _Evas_ EVAS_ _EVAS_ \
 eet_ _eet_ Eet_ _Eet_ EET_ _EET_ \
 ecore_ _ecore_ Ecore_ _Ecore_ ECORE_ _ECORE_ \
 eio_ _eio_ Eio_ _Eio_ EIO_ _EIO_ \
-edbus_ _edbus_ EDBus_ _EDBus_ EDBUS_ _EDBUS_ \
+eldbus_ _eldbus_ Eldbus_ _Eldbus_ ELDBUS_ _ELDBUS_ \
 efreet_ _efreet_ Efreet_ _Efreet_ EFREET_ _EFREET_ \
 eeze_ _eeze_ Eeze_ _Eeze_ EEZE_ _EEZE_ \
 ephysics_ _ephysics_ EPhysics_ _EPhysics_ EPHYSICS_ _EPHYSICS_ \

doc/Makefile.am

@@ -38,7 +38,7 @@ e.css \
 head.html \
 foot.html \
 ecore_examples.dox \
-edbus_examples.dox \
+eldbus_examples.dox \
 edje_examples.dox \
 eet_examples.dox \
 eina_examples.dox \

doc/edbus_examples.dox → doc/eldbus_examples.dox

@@ -1,5 +1,5 @@
 /**
- * @page edbus_examples EDBus Examples
+ * @page eldbus_examples Eldbus Examples
  *
  * Examples:
  * @li @ref banshee.c

doc/main.dox

@@ -16,7 +16,7 @@
  * @li @ref escape_main playstation3 portability layer.
  * @li @ref evil_main microsoft windows portability layer.
  * @li @ref eio_main asynchronous input/output
- * @li @ref edbus_main d-bus integration.
+ * @li @ref eldbus_main d-bus integration.
  * @li @ref efreet_main freedesktop.org (xdg) menu and desktop integration.
  * @li @ref eeze_main hardware device manipulation and notification.
  * @li @ref ephysics_main physics simulation integration and visual effects.
@@ -205,7 +205,7 @@
  */
 
 /**
- * @defgroup EDBus
+ * @defgroup Eldbus
  *
  * @brief D-Bus integration with EFL (Ecore).
  */

m4/efl.m4

@@ -137,9 +137,9 @@ depname="$2"
 libdirname="m4_defn([DOWNOTHER])"
 libname="m4_defn([DOWNOTHER])"
 case "m4_defn([DOWNOTHER])" in
-   edbus)
-      depname="edbus2"
-      libname="edbus2"
+   eldbus)
+      depname="eldbus"
+      libname="eldbus"
       ;;
    ethumb_client)
       depname="ethumb_client"
@@ -357,8 +357,8 @@ m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
 libdirname="m4_defn([DOWN])"
 libname="m4_defn([DOWN])"
 case "m4_defn([DOWN])" in
-   edbus)
-      libname="edbus2"
+   eldbus)
+      libname="eldbus"
       ;;
 esac
 

old/ChangeLog.ethumb

@@ -1,6 +1,6 @@
 2012-12-03 Gustavo Sverzut Barbieri (k-s)
 
-	* port to edbus (v2)
+	* port to eldbus
 
 2012-04-26 Carsten Haitzler (The Rasterman)
 

old/NEWS.ethumb

@@ -4,7 +4,7 @@ Changes since Ethumb 1.7.0:
 
 Additions:
 
-        - Port to edbus (v2), added new dependency.
+        - Port to eldbus, added new dependency.
 
 Fixes:
 

old/README.edbus → old/README.eldbus

@@ -1,9 +1,9 @@
 ABOUT:
 -----
 
-EDBus provides easy access to D-Bus from EFL applications.
+Eldbus provides easy access to D-Bus from EFL applications.
 
-EDBus allows connecting to both system and session buses acting as
+Eldbus allows connecting to both system and session buses acting as
 both client and service roles.
 
 Many official D-Bus specifications and interfaces are supported, namely:
@@ -14,8 +14,8 @@ Many official D-Bus specifications and interfaces are supported, namely:
         - org.freedesktop.DBus.ObjectManager: partial support (under dev).
 
 One can create client-side objects using the low-level methods from
-EDBus_Connection and EDBus_Object, or go high level with
-EDBus_Proxy.
+Eldbus_Connection and Eldbus_Object, or go high level with
+Eldbus_Proxy.
 
 
 RELATION TO OLD E_DBUS:

pc/eldbus.pc.in

@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: eldbus
+Description: D-Bus access from Ecore
+Requires.private: @requirements_pc_eldbus@
+Version: @VERSION@
+Libs: -L${libdir} -leldbus
+Libs.private: @requirements_libs_eldbus@
+Cflags: -I${includedir}/eldbus-@VMAJ@
+

src/Makefile.am

@@ -42,7 +42,7 @@ include Makefile_Ecore_Evas.am
 include Makefile_Ecore_Audio.am
 include Makefile_Embryo.am
 include Makefile_Eio.am
-include Makefile_EDBus.am
+include Makefile_Eldbus.am
 include Makefile_Efreet.am
 include Makefile_Eeze.am
 include Makefile_EPhysics.am
@@ -71,7 +71,7 @@ examples/eet \
 examples/evas \
 examples/ecore \
 examples/eio \
-examples/edbus \
+examples/eldbus \
 examples/ephysics \
 examples/edje \
 examples/emotion \