Merge lp:~ken-vandine/dee/vapi_with_gir_info into lp:dee

[Ken VanDine]

Make sure gir_namespace and gir_version get in the vapi file. This at the very least quiets down build warnings for other apps that depend on dee.

[lp:~ken-vandine/dee/vapi_with_gir_info]

254. By Ken VanDine on 2011-03-08

use major.minor version instead of package version for generated gir

[Ken VanDine (ken-vandine)]

This fixes bug 730929

[Mikkel Kamstrup Erlandsen (kamstrup)]

Thanks - I did wonder about that warning, but never got around to investigating it!

review: Approve

=== modified file 'dee/Makefile.am'
--- dee/Makefile.am	2011-03-01 13:57:30 +0000
+++ dee/Makefile.am	2011-03-08 21:39:09 +0000
@@ -140,7 +140,7 @@
 $(dee_gir): $(devel_headers)
 	$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v --warn-all \
 	--namespace Dee \
-	--nsversion=$(PACKAGE_VERSION) \
+	--nsversion=$(DEE_MAJOR_VERSION).$(DEE_MINOR_VERSION) \
 	--add-include-path=$(srcdir) \
 	--add-include-path=$(top_builddir) \
 	--add-include-path=$(top_builddir)/dee \
 
=== modified file 'vapi/dee-1.0.metadata'
--- vapi/dee-1.0.metadata	2011-03-02 09:39:41 +0000
+++ vapi/dee-1.0.metadata	2011-03-08 21:39:09 +0000
@@ -1,4 +1,4 @@
-Dee cheader_filename="dee.h"
+Dee cheader_filename="dee.h" gir_namespace="Dee" gir_version="0.5"
 dee_model_set_schema ellipsis="1"
 dee_model_set_schema_full.column_schemas is_array="1" array_length_pos="1.5" array_length_type="guint"
 dee_model_set_schema_full.num_columns hidden="1"
 
=== modified file 'vapi/dee-1.0.vapi'
--- vapi/dee-1.0.vapi	2011-03-06 09:42:20 +0000
+++ vapi/dee-1.0.vapi	2011-03-08 21:39:09 +0000
@@ -1,6 +1,6 @@
 /* dee-1.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Dee", lower_case_cprefix = "dee_")]
+[CCode (cprefix = "Dee", lower_case_cprefix = "dee_", gir_namespace = "Dee", gir_version = "0.5")]
 namespace Dee {
 	[Compact]
 	[CCode (free_function = "g_free", cheader_filename = "dee.h")]