[gxml/serialization] Build Fixes

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit e46d6f24c3fe8a55a6536260bd8c569d6eede4e2
Author: Daniel Espinosa <esodan gmail com>
Date:   Sat Feb 1 06:14:48 2014 -0600

    Build Fixes
    
    * Added versioned namespace accordding to configure.c
    * Fixed missing namespace for SerializableMapDualKey interface
    * GObject Introspection fixes

 configure.ac                     |    1 +
 gxml/Attr.vala                   |    2 +-
 gxml/Makefile.am                 |    4 +++-
 gxml/SerializableMapDualKey.vala |    2 +-
 gxml/namespace-info.vala.in      |   26 ++++++++++++++++++++++++++
 5 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 810b099..b32420b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,6 +158,7 @@ GOBJECT_INTROSPECTION_CHECK([1.32.0])
 ### Autoconf generating Makefiles
 AC_CONFIG_FILES([
 Makefile
+gxml/namespace-info.vala
 gxml/gxml-0.4.pc
 gxml/Makefile
 test/Makefile
diff --git a/gxml/Attr.vala b/gxml/Attr.vala
index 94dfaa5..e1c7e06 100644
--- a/gxml/Attr.vala
+++ b/gxml/Attr.vala
@@ -35,7 +35,7 @@
 /* NOTE: figure out how entity references work with Attrs */
 /* NOTE: value as children nodes: can contain Text and EntityReferences */
 
-[CCode (gir_namespace = "GXml", gir_version = "0.3")]
+
 namespace GXml {
        /**
         * An XML Attr node, which represents a name="value" pair.
diff --git a/gxml/Makefile.am b/gxml/Makefile.am
index ee6d3f3..8dd9cbb 100644
--- a/gxml/Makefile.am
+++ b/gxml/Makefile.am
@@ -33,6 +33,7 @@ VALAC=valac
 
 # Vala source code
 libgxml_0_4_la_SOURCES = \
+       namespace-info.vala \
        Attr.vala \
        BackedNode.vala \
        CDATASection.vala \
@@ -149,7 +150,7 @@ GXml-0.4.typelib: $(INTROSPECTION_GIRS)
 girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)
 typelibdir = $(INTROSPECTION_TYPELIBDIR)
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+typelib_DATA = GXml-0.4.typelib
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif
 ### Files to clean
@@ -161,6 +162,7 @@ BUILT_SOURCES = \
 
 CLEANFILES += \
        $(BUILT_SOURCES) \
+       namespace-info.vala \
        $(libgxml_0_4_la_SOURCES:.vala=.c)
 
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
diff --git a/gxml/SerializableMapDualKey.vala b/gxml/SerializableMapDualKey.vala
index e260cd8..5bfbf94 100644
--- a/gxml/SerializableMapDualKey.vala
+++ b/gxml/SerializableMapDualKey.vala
@@ -20,7 +20,7 @@
  *      Daniel Espinosa <esodan gmail com>
  */
 using GXml;
-public interface SerializableMapDualKey<P,S> : Object
+public interface GXml.SerializableMapDualKey<P,S> : Object
 {
   public abstract P get_map_primary_key  ();
   public abstract S get_map_secondary_key ();
diff --git a/gxml/namespace-info.vala.in b/gxml/namespace-info.vala.in
new file mode 100644
index 0000000..2b7dd2d
--- /dev/null
+++ b/gxml/namespace-info.vala.in
@@ -0,0 +1,26 @@
+/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
+/* Attr.vala
+ *
+ * Copyright (C) 2011-2013  Richard Schwarting <aquarichy gmail com>
+ * Copyright (C) 2011  Daniel Espinosa <esodan gmail com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * Authors:
+ *      Richard Schwarting <aquarichy gmail com>
+ *      Daniel Espinosa <esodan gmail com>
+ */
+[CCode (gir_namespace = "GXml", gir_version = "@API_VERSION@")]
+namespace GXml {}