Merge branch 'develop' into debian/sid

diff --cc .gitignore
index 3cb7ad347d5ff20eeaccb0547c8ecadb1389a231,5196c170f65e9d754f7f57f661a74fcbd9989ca6..514f1d35c53f4e1518944a8e37d1d5f963db17ce
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -65,4 -65,5 +65,6 @@@ compil
  gtk-doc.m4
  src/lexycal.yy.[ch]
  src/rptmarshal.[ch]
- build/*
++build/*
+ *.gir
 -*.typelib
++*.typelib