16 files changed, 49 insertions, 42 deletions
diff --git a/debian/changelog b/debian/changelog
index 86e7dfb..3de69dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libdbusmenu (0.3.91-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    * Porting from dbus-glib to GDBus
+    * Bumping the library ABI version
+  * debian/*.install: Changing to be the 0.4 version of the dbusmenu
+    API of all the filenames and paths.
+  * debian/control: Bumping ABI version in package names
+  * debian/control: Changing the GIR package names from "0.2" to
+    "0.4" which now the names of the actual files.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 13 Jan 2011 10:24:28 -0600
+
 libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low
 
   * Updated for the gir abi transition
diff --git a/debian/control b/debian/control
index e63b108..5d96966 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
 Vcs-Browser: http://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
 
-Package: libdbusmenu-glib2
+Package: libdbusmenu-glib3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -49,7 +49,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-glib2 (= ${binary:Version}),
+         libdbusmenu-glib3 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
 Description: library for passing menus over DBus - development files
@@ -59,7 +59,7 @@ Description: library for passing menus over DBus - development files
  .
  This package contains files that are needed to build applications.
 
-Package: libdbusmenu-gtk2
+Package: libdbusmenu-gtk3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -76,7 +76,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-gtk2 (= ${binary:Version}),
+         libdbusmenu-gtk3 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0),
          libdbusmenu-glib-dev
@@ -93,7 +93,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          python,
-         libdbusmenu-glib2 (= ${binary:Version})
+         libdbusmenu-glib3 (= ${binary:Version})
 Description: tools useful during development with libdbusmenu
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -102,37 +102,33 @@ Description: tools useful during development with libdbusmenu
  This package contains tools that are useful when developing and building
  applications with libdbusmenu.
 
-Package: gir1.2-dbusmenu-glib-0.2
-Conflicts: gir1.0-dbusmenu-glib-0.2
-Replaces: gir1.0-dbusmenu-glib-0.2
+Package: gir1.2-dbusmenu-glib-0.4
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-glib2 (= ${binary:Version}),
+         libdbusmenu-glib3 (= ${binary:Version}),
          ${gir:Depends}
-Description: typelib file for libdbusmenu-glib2
+Description: typelib file for libdbusmenu-glib3
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings for libdbusmenu-glib2.
+ generate dynamic bindings for libdbusmenu-glib3.
 
-Package: gir1.2-dbusmenu-gtk-0.2
-Conflicts: gir1.0-dbusmenu-gtk-0.2
-Replaces: gir1.0-dbusmenu-gtk-0.2
+Package: gir1.2-dbusmenu-gtk-0.4
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-gtk2 (= ${binary:Version}),
+         libdbusmenu-gtk3 (= ${binary:Version}),
          ${gir:Depends}
-Description: typelib file for libdbusmenu-gtk2
+Description: typelib file for libdbusmenu-gtk3
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings for libdbusmenu-gtk2.
+ generate dynamic bindings for libdbusmenu-gtk3.
 
 Package: libdbusmenu-glib-doc
 Section: doc
@@ -156,7 +152,7 @@ Description: library for passing menus over DBus - GTK+ version documentation
  .
  This package contains developer documentation for libdbusmenu-gtk.
 
-Package: libdbusmenu-jsonloader2
+Package: libdbusmenu-jsonloader3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -185,7 +181,7 @@ Description: library for passing menus over DBus - Test lib development files
  This package contains files that are needed to build test suites in 
  applications or libraries using dbusmenu.
 
-Package: libdbusmenu-gtk3-2
+Package: libdbusmenu-gtk3-3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -202,7 +198,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-gtk3-2 (= ${binary:Version}),
+         libdbusmenu-gtk3-3 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk3.0-dev (>= 2.91.4-0ubuntu1),
          libdbusmenu-glib-dev
@@ -213,19 +209,17 @@ Description: library for passing menus over DBus - GTK+ version developement fil
  .
  This package contains files that are needed to build GTK+ applications.
 
-Package: gir1.2-dbusmenu-gtk3-0.2
-Conflicts: gir1.0-dbusmenu-gtk3-0.2
-Replaces: gir1.0-dbusmenu-gtk3-0.2
+Package: gir1.2-dbusmenu-gtk3-0.4
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-gtk3-2 (= ${binary:Version}),
+         libdbusmenu-gtk3-3 (= ${binary:Version}),
          ${gir:Depends}
-Description: typelib file for libdbusmenu-gtk2
+Description: typelib file for libdbusmenu-gtk3-3
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
  other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings for libdbusmenu-gtk2.
+ generate dynamic bindings for libdbusmenu-gtk3.
 
diff --git a/debian/gir1.2-dbusmenu-glib-0.2.install b/debian/gir1.2-dbusmenu-glib-0.2.install
deleted file mode 100644
index 86f7711..0000000
--- a/debian/gir1.2-dbusmenu-glib-0.2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.2.typelib
diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install
new file mode 100644
index 0000000..bca065f
--- /dev/null
+++ b/debian/gir1.2-dbusmenu-glib-0.4.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.4.typelib
diff --git a/debian/gir1.2-dbusmenu-gtk-0.2.install b/debian/gir1.2-dbusmenu-gtk-0.2.install
deleted file mode 100644
index 829a344..0000000
--- a/debian/gir1.2-dbusmenu-gtk-0.2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.2.typelib
diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install
new file mode 100644
index 0000000..16bad97
--- /dev/null
+++ b/debian/gir1.2-dbusmenu-gtk-0.4.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib
diff --git a/debian/gir1.2-dbusmenu-gtk3-0.2.install b/debian/gir1.2-dbusmenu-gtk3-0.2.install
deleted file mode 100644
index 2da3933..0000000
--- a/debian/gir1.2-dbusmenu-gtk3-0.2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.2.typelib
diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install
new file mode 100644
index 0000000..abf6fab
--- /dev/null
+++ b/debian/gir1.2-dbusmenu-gtk3-0.4.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib
diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install
index b693fda..35c7805 100644
--- a/debian/libdbusmenu-glib-dev.install
+++ b/debian/libdbusmenu-glib-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-glib/*
-debian/tmp/usr/lib/pkgconfig/dbusmenu-glib.pc
+debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-glib/*
+debian/tmp/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc
 debian/tmp/usr/lib/libdbusmenu-glib.a
 debian/tmp/usr/lib/libdbusmenu-glib.so
-debian/tmp/usr/share/gir-1.0/Dbusmenu-Glib-0.2.gir
-debian/tmp/usr/share/vala/vapi/Dbusmenu-Glib-0.2.vapi
+debian/tmp/usr/share/gir-1.0/Dbusmenu-Glib-0.4.gir
+debian/tmp/usr/share/vala/vapi/Dbusmenu-Glib-0.4.vapi
diff --git a/debian/libdbusmenu-glib2.install b/debian/libdbusmenu-glib3.install
index acdbacf..acdbacf 100644
--- a/debian/libdbusmenu-glib2.install
+++ b/debian/libdbusmenu-glib3.install
diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install
index 3fa028f..0ce2419 100644
--- a/debian/libdbusmenu-gtk-dev.install
+++ b/debian/libdbusmenu-gtk-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-gtk/*
-debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk.pc
+debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-gtk/*
+debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk-0.4.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
+debian/tmp/usr/share/gir-1.0/DbusmenuGtk-0.4.gir
+debian/tmp/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi
diff --git a/debian/libdbusmenu-gtk3-2.install b/debian/libdbusmenu-gtk3-3.install
index af2e9a3..af2e9a3 100644
--- a/debian/libdbusmenu-gtk3-2.install
+++ b/debian/libdbusmenu-gtk3-3.install
diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install
index d81ce8b..2c9d2e3 100644
--- a/debian/libdbusmenu-gtk3-dev.install
+++ b/debian/libdbusmenu-gtk3-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk3.pc
+debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc
 debian/tmp/usr/lib/libdbusmenu-gtk3.a
 debian/tmp/usr/lib/libdbusmenu-gtk3.so
-debian/tmp/usr/share/gir-1.0/DbusmenuGtk3-0.2.gir
-debian/tmp/usr/share/vala/vapi/DbusmenuGtk3-0.2.vapi
+debian/tmp/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir
+debian/tmp/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi
diff --git a/debian/libdbusmenu-gtk2.install b/debian/libdbusmenu-gtk3.install
index d677935..d677935 100644
--- a/debian/libdbusmenu-gtk2.install
+++ b/debian/libdbusmenu-gtk3.install
diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install
index 27c41a5..9594064 100644
--- a/debian/libdbusmenu-jsonloader-dev.install
+++ b/debian/libdbusmenu-jsonloader-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-jsonloader/*
-debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader.pc
+debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader/*
+debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc
 debian/tmp/usr/lib/libdbusmenu-jsonloader.a
 debian/tmp/usr/lib/libdbusmenu-jsonloader.so
diff --git a/debian/libdbusmenu-jsonloader2.install b/debian/libdbusmenu-jsonloader3.install
index bff47f5..bff47f5 100644
--- a/debian/libdbusmenu-jsonloader2.install
+++ b/debian/libdbusmenu-jsonloader3.install