Merge branch 'develop' into debian/wheezy

diff --cc .gitignore
index aa9fd7ecb0bc88cbde917ee1decea14744c86175,c6955c93ecdbccc3e7c20e2558f2d9dbdc0e2c3c..f13f37cc939efec3aeabb50fe3a311fa83e9ebb1
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -70,4 -70,5 +70,6 @@@ tests/utils_infoba
  tests/utils_message_dialog
  tests/utils_round
  *.csv
- build/
+ *.gir
 -*.typelib
++*.typelib
++build/

diff --cc src/Makefile.am
index a5a99f1c3c659218328c9ae4d60f354481f325e8,6b4c0c862af270d7df3c4804507bb5fa6b2dce5f..385fa993bacf76be68668f08d563e126a98b3bf6
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -114,3 -118,44 +118,45 @@@ install-exec-hook
  
  uninstall-hook:
        rm -f $(libzakformmodulesdir)/libsolipa$(libmodulesext)
+ 
++
+ CLEANFILES =
+ 
+ -include $(INTROSPECTION_MAKEFILE)
+ INTROSPECTION_GIRS =
+ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
+ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+ 
+ if HAVE_INTROSPECTION
+ introspection_sources = $(libsolipa_la_SOURCES) $(gir_include)
+ 
+ Solipa-1.0.gir: libsolipa.la
+ Solipa_1_0_gir_INCLUDES = GObject-2.0
+ Solipa_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
+ Solipa_1_0_gir_LIBS = libsolipa.la
+ Solipa_1_0_gir_FILES = $(introspection_sources)
+ 
+ SolipaCtpl-1.0.gir: libsolipactpl.la
+ SolipaCtpl_1_0_gir_INCLUDES = GObject-2.0
+ SolipaCtpl_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(CTPL_CFLAGS)
+ SolipaCtpl_1_0_gir_LIBS = libsolipa.la libsolipactpl.la
+ SolipaCtpl_1_0_gir_LDFLAGS = $(CTPL_LIBS)
+ SolipaCtpl_1_0_gir_FILES = $(libsolipactpl_la_SOURCES) $(libsolipactpl_include_HEADERS)
+ 
+ SolipaOoo-1.0.gir: libsolipaooo.la
+ SolipaOoo_1_0_gir_INCLUDES = GObject-2.0
+ SolipaOoo_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(PYTHON_CFLAGS)
+ SolipaOoo_1_0_gir_LIBS = libsolipa.la libsolipaooo.la
+ SolipaOoo_1_0_gir_LDFLAGS = $(PYTHON_LIBS)
+ SolipaOoo_1_0_gir_FILES = $(libsolipaooo_la_SOURCES) $(libsolipaooo_include_HEADERS)
+ 
+ INTROSPECTION_GIRS += Solipa-1.0.gir SolipaCtpl-1.0.gir SolipaOoo-1.0.gir
+ 
+ girdir = $(datadir)/gir-1.0
+ gir_DATA = $(INTROSPECTION_GIRS)
+ 
+ typelibdir = $(libdir)/girepository-1.0
+ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+ 
+ CLEANFILES += $(gir_DATA) $(typelib_DATA)
+ endif