[libchamplain] Fix header collisions between clutter-gtk-0.10 and clutter-gtk-1.0

[Jiří Techet <jiritechet src gnome org>]

commit f5fd591556d44b1ed91d677ced3c4d016522d5ba
Author: Nirbheek Chauhan <nirbheek gentoo org>
Date:   Wed Feb 23 20:51:37 2011 +0530

    Fix header collisions between clutter-gtk-0.10 and clutter-gtk-1.0
    
    Always include clutter-gtk-1.0 first to avoid header-include-path problems
    
    https://bugzilla.gnome.org/show_bug.cgi?id=643077

 champlain-gtk.pc.in       |    2 +-
 champlain-gtk/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/champlain-gtk.pc.in b/champlain-gtk.pc.in
index c933537..c9ac01f 100644
--- a/champlain-gtk.pc.in
+++ b/champlain-gtk.pc.in
@@ -8,4 +8,4 @@ Description: Gtk+ Widget wrapper for libchamplain
 Version: @VERSION@
 Libs: -L${libdir} -lchamplain-gtk- CHAMPLAIN_API_VERSION@
 Cflags: -I${includedir}/libchamplain-gtk- CHAMPLAIN_API_VERSION@
-Requires: champlain- CHAMPLAIN_API_VERSION@ clutter-gtk-1.0 gtk+-3.0
+Requires: clutter-gtk-1.0 champlain- CHAMPLAIN_API_VERSION@ gtk+-3.0
diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 182b9ff..5c9ea1a 100644
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -78,7 +78,7 @@ GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-3.0
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources)
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-3.0 Champlain- CHAMPLAIN_API_VERSION@
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
-	$(DEPS_CFLAGS) $(SOUP_CFLAGS) $(GTK_CFLAGS) \
+	$(SOUP_CFLAGS) $(GTK_CFLAGS) $(DEPS_CFLAGS) \
 	-I$(top_srcdir) -I$(top_builddir)\
 	-DCHAMPLAIN_COMPILATION -DCHAMPLAIN_GTK_COMPILATION