[eog-plugins/map-plugin-fixes: 1/7] Rename champlain plugin as "map".

[Pierre-Luc Beaudoin <plbeaudoin src gnome org>]

commit d6688233dc202c5860b68191ed84511b614370d3
Author: Pierre-Luc Beaudoin <pierre-luc pierlux com>
Date:   Fri Feb 5 15:50:07 2010 -0500

    Rename champlain plugin as "map".

 configure.ac                                       |   24 ++++++++++----------
 plugins/{champlain => map}/Makefile.am             |   12 +++++-----
 .../eog-map-plugin.c}                              |    2 +-
 .../eog-map-plugin.h}                              |    0
 .../map.eog-plugin.desktop.in}                     |    0
 po/POTFILES.in                                     |    4 +-
 6 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index dd78b1a..146937e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,9 +60,9 @@ EOG_HAS_PYTHON=1
 
 AC_MSG_CHECKING([which plugins to build])
 
-ALL_PLUGINS="postr champlain fit-to-width exif-display send-by-mail"
-USEFUL_PLUGINS="postr champlain fit-to-width exif-display send-by-mail"
-DEFAULT_PLUGINS="postr champlain fit-to-width exif-display send-by-mail"
+ALL_PLUGINS="postr map fit-to-width exif-display send-by-mail"
+USEFUL_PLUGINS="postr map fit-to-width exif-display send-by-mail"
+DEFAULT_PLUGINS="postr map fit-to-width exif-display send-by-mail"
 
 PYTHON_ALL_PLUGINS="slideshowshuffle pythonconsole"
 PYTHON_USEFUL_PLUGINS="slideshowshuffle pythonconsole"
@@ -81,7 +81,7 @@ fi
 AC_ARG_WITH([plugins],
 	    [AS_HELP_STRING([--with-plugins=LIST],
 			    [Comma-separated list specifying the plugins to build.
-			    Available: champlain, exif-display, fit-to-width,
+			    Available: map, exif-display, fit-to-width,
 			    postr, pythonconsole, slideshowshuffle,
 			    as well as the aliases default,
 			    all, and really-all])],
@@ -289,10 +289,10 @@ then
 	fi
 fi
 
-# *********
-# Champlain 
-# *********
-plugin_defined champlain
+# ***
+# Map
+# ***
+plugin_defined map
 if test "$?" = 1
 then
 	
@@ -301,12 +301,12 @@ then
 		  champlain-gtk-0.4 >= 0.4,
 		  clutter-gtk-0.10 >= 0.10,
 		  libexif >= 0.6.16 ],
-		[],[have_champlain=no])
+		[],[have_libchamplain=no])
 	AC_SUBST(CHAMPLAIN_LIBS)
 	AC_SUBST(CHAMPLAIN_CFLAGS)
-	if test "x$have_champlain" = "xno"
+	if test "x$have_libchamplain" = "xno"
 	then
-		undef_plugin champlain "champlain or libexif was not found"
+		undef_plugin map "libchamplain or libexif was not found"
 	fi
 fi
 
@@ -350,7 +350,7 @@ AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
 AC_CONFIG_FILES([
 Makefile
 plugins/Makefile
-plugins/champlain/Makefile
+plugins/map/Makefile
 plugins/fit-to-width/Makefile
 plugins/exif-display/Makefile
 plugins/send-by-mail/Makefile
diff --git a/plugins/champlain/Makefile.am b/plugins/map/Makefile.am
similarity index 77%
rename from plugins/champlain/Makefile.am
rename to plugins/map/Makefile.am
index c08d26f..0c65539 100644
--- a/plugins/champlain/Makefile.am
+++ b/plugins/map/Makefile.am
@@ -8,20 +8,20 @@ INCLUDES = \
 	$(WARN_CFLAGS)					\
 	-DEOG_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
 
-plugin_LTLIBRARIES = libchamplain.la
+plugin_LTLIBRARIES = libmap.la
 
-libchamplain_la_SOURCES = \
-	eog-champlain-plugin.h				\
-	eog-champlain-plugin.c
+libmap_la_SOURCES = \
+	eog-map-plugin.h				\
+	eog-map-plugin.c
 
-libchamplain_la_LDFLAGS = \
+libmap_la_LDFLAGS = \
 	$(PLUGIN_LIBTOOL_FLAGS)				\
 	$(EOG_LIBS) \
 	$(CHAMPLAIN_LIBS)
 
 # Plugin Info
 
-plugin_in_files = champlain.eog-plugin.desktop.in
+plugin_in_files = map.eog-plugin.desktop.in
 
 %.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
diff --git a/plugins/champlain/eog-champlain-plugin.c b/plugins/map/eog-map-plugin.c
similarity index 99%
rename from plugins/champlain/eog-champlain-plugin.c
rename to plugins/map/eog-map-plugin.c
index e0d296c..737e2cc 100644
--- a/plugins/champlain/eog-champlain-plugin.c
+++ b/plugins/map/eog-map-plugin.c
@@ -2,7 +2,7 @@
 #include <config.h>
 #endif
 
-#include "eog-champlain-plugin.h"
+#include "eog-map-plugin.h"
 
 #include <gmodule.h>
 #include <glib/gi18n-lib.h>
diff --git a/plugins/champlain/eog-champlain-plugin.h b/plugins/map/eog-map-plugin.h
similarity index 100%
rename from plugins/champlain/eog-champlain-plugin.h
rename to plugins/map/eog-map-plugin.h
diff --git a/plugins/champlain/champlain.eog-plugin.desktop.in b/plugins/map/map.eog-plugin.desktop.in
similarity index 100%
rename from plugins/champlain/champlain.eog-plugin.desktop.in
rename to plugins/map/map.eog-plugin.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0b19e39..31dabb5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,5 @@
-plugins/champlain/champlain.eog-plugin.desktop.in
-plugins/champlain/eog-champlain-plugin.c
+plugins/champlain/map.eog-plugin.desktop.in
+plugins/champlain/eog-map-plugin.c
 plugins/exif-display/eog-exif-display-plugin.c
 [type: gettext/glade]plugins/exif-display/exif-display-config.ui
 plugins/exif-display/exif-display.eog-plugin.desktop.in