* Upstream Merge

  * Adding in building of the GObject Introspection details
  * Adding in building of VAPI files
* debian/control:
  * Adding dependency on valac
  * Adding in gir's as build dependencies.
  * Adding in build dependencies for GIR dev
* debian/libdbusmenu-glib-dev.install,
      debian/libdbusmenu-gtk-dev.install:
  * Added VAPI files to the packages.
  * Added GIR files to the packages.
* debian/control, debian/gir1.0-dbusmenu-glib-0.2.install,
  debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to
  hold the typelib files generated by GObject introspection.

6 files changed, 48 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 2f5d0c2..a6e3bea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+libdbusmenu (0.2.6-0ubuntu2~ppa1) UNRELEASED; urgency=low
+
+  * Upstream Merge
+    * Adding in building of the GObject Introspection details
+    * Adding in building of VAPI files
+  * debian/control:
+    * Adding dependency on valac
+    * Adding in gir's as build dependencies.
+    * Adding in build dependencies for GIR dev
+  * debian/libdbusmenu-glib-dev.install,
+        debian/libdbusmenu-gtk-dev.install:
+    * Added VAPI files to the packages.
+    * Added GIR files to the packages.
+  * debian/control, debian/gir1.0-dbusmenu-glib-0.2.install,
+    debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to
+    hold the typelib files generated by GObject introspection.
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 01 Mar 2010 22:06:01 -0600
+
 libdbusmenu (0.2.6-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.2.6
@@ -202,3 +221,4 @@ libdbusmenu (0.1~bzr5-0ubuntu1) karmic; urgency=low
   * First version.
 
  -- Ted Gould <ted@ubuntu.com>  Wed, 05 Aug 2009 00:46:41 +0100
+
diff --git a/debian/control b/debian/control
index 561429f..869b3e8 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,11 @@ Build-Depends: debhelper (>= 5.0),
                libtool,
                intltool,
                libxml2-dev,
-               libjson-glib-dev
+               libjson-glib-dev,
+               libgirepository1.0-dev,
+               gir1.0-glib-2.0,
+               gir1.0-gtk-2.0,
+               valac
 Standards-Version: 3.8.0
 Homepage: https://launchpad.net/libdbusmenu
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
@@ -72,3 +76,20 @@ Description: Tools useful during development with libdbusmenu
  .
  This package contains tools that are useful when building applications.
 
+Package: gir1.0-dbusmenu-glib-0.2
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+         libdbusmenu-glib1 (= ${binary:Version}),
+         gir1.0-glib-2.0
+Description: Typelib file for libdbusmenu-glib1
+
+Package: gir1.0-dbusmenu-gtk-0.2
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+         libdbusmenu-gtk1 (= ${binary:Version}),
+         gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}),
+         gir1.0-gtk-2.0
+Description: Typelib file for libdbusmenu-gtk1
+
diff --git a/debian/gir1.0-dbusmenu-glib-0.2.install b/debian/gir1.0-dbusmenu-glib-0.2.install
new file mode 100644
index 0000000..a6c4fd0
--- /dev/null
+++ b/debian/gir1.0-dbusmenu-glib-0.2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/DbusmenuGlib-0.2.typelib
diff --git a/debian/gir1.0-dbusmenu-gtk-0.2.install b/debian/gir1.0-dbusmenu-gtk-0.2.install
new file mode 100644
index 0000000..829a344
--- /dev/null
+++ b/debian/gir1.0-dbusmenu-gtk-0.2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.2.typelib
diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install
index 17ddd2b..724eb9c 100644
--- a/debian/libdbusmenu-glib-dev.install
+++ b/debian/libdbusmenu-glib-dev.install
@@ -2,3 +2,5 @@ debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-glib/*
 debian/tmp/usr/lib/pkgconfig/dbusmenu-glib.pc
 debian/tmp/usr/lib/libdbusmenu-glib.a
 debian/tmp/usr/lib/libdbusmenu-glib.so
+debian/tmp/usr/share/gir-1.0/DbusmenuGlib-0.2.gir
+debian/tmp/usr/share/vala/vapi/DbusmenuGlib-0.2.vapi
diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install
index 247fbca..3fa028f 100644
--- a/debian/libdbusmenu-gtk-dev.install
+++ b/debian/libdbusmenu-gtk-dev.install
@@ -2,3 +2,5 @@ debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-gtk/*
 debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk.pc
 debian/tmp/usr/lib/libdbusmenu-gtk.a
 debian/tmp/usr/lib/libdbusmenu-gtk.so
+debian/tmp/usr/share/gir-1.0/DbusmenuGtk-0.2.gir
+debian/tmp/usr/share/vala/vapi/DbusmenuGtk-0.2.vapi