Merging in Ubuntu Desktop

5 files changed, 27 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index df70c71..2a8b0af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low
+
+  * Updated for the gir abi transition
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 16 Dec 2010 10:06:26 -0500
+
+libdbusmenu (0.3.90-0ubuntu2) natty; urgency=low
+
+  * libdbusmenu-gtk/genericmenuitem.c
+    - Switching away from using set_activate as that doesn't actually set 
+      the value, it just signals
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 09 Dec 2010 17:46:41 -0500
+
 libdbusmenu (0.3.90-0ubuntu2~ppa3) natty; urgency=low
 
   * debian/control: Forgot jsonloader
@@ -23,7 +37,7 @@ libdbusmenu (0.3.90-0ubuntu2~ppa1) natty; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Wed, 08 Dec 2010 10:31:48 -0600
 
-libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.3.90-0ubuntu1) natty; urgency=low
 
   * debian/rules
     - Added build targets to build with gtk3 enabled in additional to 
diff --git a/debian/control b/debian/control
index 084f794..a93dc6a 100644
--- a/debian/control
+++ b/debian/control
@@ -18,9 +18,9 @@ Build-Depends: debhelper (>= 5.0),
                libjson-glib-dev,
                gobject-introspection,
                libgirepository1.0-dev (>= 0.9.3),
-               gir1.0-glib-2.0,
-               gir1.0-gtk-2.0,
-               gir1.0-gtk-3.0,
+               gir1.2-glib-2.0,
+               gir1.2-gtk-2.0,
+               gir1.2-gtk-3.0,
                libx11-dev (>= 1.3), 
                dh-autoreconf,
                valac-0.12
@@ -102,7 +102,9 @@ Description: tools useful during development with libdbusmenu
  This package contains tools that are useful when developing and building
  applications with libdbusmenu.
 
-Package: gir1.0-dbusmenu-glib-0.2
+Package: gir1.2-dbusmenu-glib-0.2
+Conflicts: gir1.0-dbusmenu-glib-0.2
+Replaces: gir1.0-dbusmenu-glib-0.2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
@@ -116,7 +118,9 @@ Description: typelib file for libdbusmenu-glib3
  This package can be used by other packages using the GIRepository format to
  generate dynamic bindings for libdbusmenu-glib3.
 
-Package: gir1.0-dbusmenu-gtk-0.2
+Package: gir1.2-dbusmenu-gtk-0.2
+Conflicts: gir1.0-dbusmenu-gtk-0.2
+Replaces: gir1.0-dbusmenu-gtk-0.2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
@@ -209,7 +213,9 @@ Description: library for passing menus over DBus - GTK+ version developement fil
  .
  This package contains files that are needed to build GTK+ applications.
 
-Package: gir1.0-dbusmenu-gtk3-0.2
+Package: gir1.2-dbusmenu-gtk3-0.2
+Conflicts: gir1.0-dbusmenu-gtk3-0.2
+Replaces: gir1.0-dbusmenu-gtk3-0.2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
diff --git a/debian/gir1.0-dbusmenu-glib-0.2.install b/debian/gir1.2-dbusmenu-glib-0.2.install
index bca065f..bca065f 100644
--- a/debian/gir1.0-dbusmenu-glib-0.2.install
+++ b/debian/gir1.2-dbusmenu-glib-0.2.install
diff --git a/debian/gir1.0-dbusmenu-gtk-0.2.install b/debian/gir1.2-dbusmenu-gtk-0.2.install
index 16bad97..16bad97 100644
--- a/debian/gir1.0-dbusmenu-gtk-0.2.install
+++ b/debian/gir1.2-dbusmenu-gtk-0.2.install
diff --git a/debian/gir1.0-dbusmenu-gtk3-0.2.install b/debian/gir1.2-dbusmenu-gtk3-0.2.install
index abf6fab..abf6fab 100644
--- a/debian/gir1.0-dbusmenu-gtk3-0.2.install
+++ b/debian/gir1.2-dbusmenu-gtk3-0.2.install