Merge lp:~sao/libpeas/added-libpeas-gtk-vapi-file into lp:~ubuntu-desktop/libpeas/ubuntu

[Oliver Sauder]

Added vapi generation for libpeas-gtk-1.0.vapi

[Oliver Sauder (sao)]

Sorry that was the wrong base branch. Gonna fix that ;).

[lp:~sao/libpeas/added-libpeas-gtk-vapi-file]

30. By Oliver Sauder on 2011-08-30

Added peas-gtk vapi file libpeas-gtk-1.0.vapi (LP: #825834)

[Martin Pitt (pitti)]

Looks good; I'll drop the unneeded "cd ..", every line in a Makefile is run in its own shell, so a "cd" only persists within one line.

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-13 13:34:32 +0000
+++ debian/changelog	2011-08-30 17:46:24 +0000
@@ -1,3 +1,9 @@
+libpeas (1.1.1-0ubuntu4) oneiric; urgency=low
+
+  * Added peas-gtk vapi file libpeas-gtk-1.0.vapi (LP: #825834) 
+
+ -- Oliver Sauder <[e-mail]>  Tue, 30 Aug 2011 19:25:25 +0200
+
 libpeas (1.1.1-0ubuntu3) oneiric; urgency=low
 
   * Renamed peas vapi file to libpeas-1.0.vapi
 
=== modified file 'debian/libpeas-dev.install'
--- debian/libpeas-dev.install	2011-07-06 14:18:37 +0000
+++ debian/libpeas-dev.install	2011-08-30 17:46:24 +0000
@@ -4,3 +4,4 @@
 usr/share/gir-1.0
 usr/share/glade/catalogs
 libpeas/*.vapi /usr/share/vala/vapi
+libpeas-gtk/*.vapi /usr/share/vala/vapi
 
=== modified file 'debian/rules'
--- debian/rules	2011-08-13 13:34:32 +0000
+++ debian/rules	2011-08-30 17:46:24 +0000
@@ -17,7 +17,8 @@
 
 common-post-build-arch::
 	# build vapi interface from gir
-	cd libpeas; vapigen --library libpeas-1.0 Peas-1.0.gir
+	cd libpeas; vapigen --library libpeas-1.0 Peas-1.0.gir; cd ..
+	cd libpeas-gtk; vapigen --library libpeas-gtk-1.0 PeasGtk-1.0.gir --pkg gtk+-3.0 --vapidir ../libpeas --girdir ../libpeas
 
 binary-post-install/libpeas-doc::
 	# remove compiled python and libtool .la files