* debian/control, debian/*: Renaming packages for library version

  bump from 3 to 4.
* New upstream release.
  * Fixing visibility for Eclipse (LP: #770263 and LP: #618587)
  * Unseting a GValue properly (LP: #785828)
  * Memory leaks for GVariant usage (LP: #784890)
  * Making GTK 3 default build
  * Removing the SerializableMenuitem object
* debian/rules: Making GTK2 the special build 
* New upstream release.
  - Fix a typo in the signal name to make it match the XML 
    files (LP: #641209)
  - Ref'ing the server for the entire time we're getting the 
    bus (LP: #738568)
  - Watch additions/removals from submenus that get added
  - Activate new toplevel menu items as they get added
  - Make sure we don't activate toplevel children that aren't
    menu items or don't have submenus (LP: #761112)

9 files changed, 64 insertions, 35 deletions

diff --git a/debian/changelog b/debian/changelog
index b4feae4..fb49c3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+libdbusmenu (0.4.90-0ubuntu1~ppa1) oneiric; urgency=low
+
+  * debian/control, debian/*: Renaming packages for library version
+    bump from 3 to 4.
+  * New upstream release.
+    * Fixing visibility for Eclipse (LP: #770263 and LP: #618587)
+    * Unseting a GValue properly (LP: #785828)
+    * Memory leaks for GVariant usage (LP: #784890)
+    * Making GTK 3 default build
+    * Removing the SerializableMenuitem object
+  * debian/rules: Making GTK2 the special build 
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 20 Jun 2011 17:00:12 -0500
+
+libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low
+
+  * New upstream release.
+    - Fix a typo in the signal name to make it match the XML 
+      files (LP: #641209)
+    - Ref'ing the server for the entire time we're getting the 
+      bus (LP: #738568)
+    - Watch additions/removals from submenus that get added
+    - Activate new toplevel menu items as they get added
+    - Make sure we don't activate toplevel children that aren't
+      menu items or don't have submenus (LP: #761112)
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 25 Apr 2011 15:19:25 -0500
+
 libdbusmenu (0.4.3-0ubuntu3) natty; urgency=low
 
   * Backport bug fixes from trunk:
diff --git a/debian/control b/debian/control
index a2cd3d3..da0842d 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
 
-Package: libdbusmenu-glib3
+Package: libdbusmenu-glib4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -49,7 +49,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-glib3 (= ${binary:Version}),
+         libdbusmenu-glib4 (= ${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-gtk3
+Package: libdbusmenu-gtk4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -76,7 +76,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-gtk3 (= ${binary:Version}),
+         libdbusmenu-gtk4 (= ${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-glib3 (= ${binary:Version})
+         libdbusmenu-glib4 (= ${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
@@ -106,29 +106,29 @@ Package: gir1.2-dbusmenu-glib-0.4
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-glib3 (= ${binary:Version}),
+         libdbusmenu-glib4 (= ${binary:Version}),
          ${gir:Depends}
-Description: typelib file for libdbusmenu-glib3
+Description: typelib file for libdbusmenu-glib4
  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-glib3.
+ generate dynamic bindings for libdbusmenu-glib4.
 
 Package: gir1.2-dbusmenu-gtk-0.4
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-gtk3 (= ${binary:Version}),
+         libdbusmenu-gtk4 (= ${binary:Version}),
          ${gir:Depends}
-Description: typelib file for libdbusmenu-gtk3
+Description: typelib file for libdbusmenu-gtk4
  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-gtk3.
+ generate dynamic bindings for libdbusmenu-gtk4.
 
 Package: libdbusmenu-glib-doc
 Section: doc
@@ -152,7 +152,7 @@ Description: library for passing menus over DBus - GTK+ version documentation
  .
  This package contains developer documentation for libdbusmenu-gtk.
 
-Package: libdbusmenu-jsonloader3
+Package: libdbusmenu-jsonloader4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -170,6 +170,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         libdbusmenu-jsonloader4 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libdbusmenu-glib-dev (= ${binary:Version}),
          libjson-glib-dev
@@ -181,7 +182,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-3
+Package: libdbusmenu-gtk3-4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -198,7 +199,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-gtk3-3 (= ${binary:Version}),
+         libdbusmenu-gtk3-4 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk-3-dev (>= 2.91.4-0ubuntu1),
          libdbusmenu-glib-dev
@@ -213,13 +214,13 @@ Package: gir1.2-dbusmenu-gtk3-0.4
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-gtk3-3 (= ${binary:Version}),
+         libdbusmenu-gtk3-4 (= ${binary:Version}),
          ${gir:Depends}
-Description: typelib file for libdbusmenu-gtk3-3
+Description: typelib file for libdbusmenu-gtk3-4
  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-gtk3.
+ generate dynamic bindings for libdbusmenu-gtk4.
 
diff --git a/debian/libdbusmenu-glib3.install b/debian/libdbusmenu-glib4.install
index acdbacf..acdbacf 100644
--- a/debian/libdbusmenu-glib3.install
+++ b/debian/libdbusmenu-glib4.install
diff --git a/debian/libdbusmenu-glib3.symbols b/debian/libdbusmenu-glib4.symbols
index 5cac25d..5cac25d 100644
--- a/debian/libdbusmenu-glib3.symbols
+++ b/debian/libdbusmenu-glib4.symbols
diff --git a/debian/libdbusmenu-gtk3-3.install b/debian/libdbusmenu-gtk3-4.install
index af2e9a3..af2e9a3 100644
--- a/debian/libdbusmenu-gtk3-3.install
+++ b/debian/libdbusmenu-gtk3-4.install
diff --git a/debian/libdbusmenu-gtk3.install b/debian/libdbusmenu-gtk4.install
index d677935..d677935 100644
--- a/debian/libdbusmenu-gtk3.install
+++ b/debian/libdbusmenu-gtk4.install
diff --git a/debian/libdbusmenu-gtk3.symbols b/debian/libdbusmenu-gtk4.symbols
index fd2d6aa..fd2d6aa 100644
--- a/debian/libdbusmenu-gtk3.symbols
+++ b/debian/libdbusmenu-gtk4.symbols
diff --git a/debian/libdbusmenu-jsonloader3.install b/debian/libdbusmenu-jsonloader4.install
index bff47f5..bff47f5 100644
--- a/debian/libdbusmenu-jsonloader3.install
+++ b/debian/libdbusmenu-jsonloader4.install
diff --git a/debian/rules b/debian/rules
index dd4f69c..2243a71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,32 +11,32 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-configure/libdbusmenu-gtk3-3:: stamp-configure-gtk3
-stamp-configure-gtk3:
-	: # configure for GTK+ 3.0
+configure/libdbusmenu-gtk4:: stamp-configure-gtk2
+stamp-configure-gtk2:
+	: # configure for GTK+ 2.0
 	set -e; \
-	rm -rf build-gtk3; \
-	mkdir build-gtk3; \
-	cd build-gtk3; \
-	$(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \
+	rm -rf build-gtk2; \
+	mkdir build-gtk2; \
+	cd build-gtk2; \
+	$(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=2 \
 		$(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)) \
 		--enable-gtk-doc=no; \
 	cd ..;
-	touch stamp-configure-gtk3
+	touch stamp-configure-gtk2
 
-build/libdbusmenu-gtk3-3:: stamp-build-gtk3
-stamp-build-gtk3: stamp-configure-gtk3
-	: # build for GTK+ 3.0
-	$(MAKE) -C build-gtk3;
-	touch stamp-build-gtk3
+build/libdbusmenu-gtk4:: stamp-build-gtk2
+stamp-build-gtk2: stamp-configure-gtk2
+	: # build for GTK+ 2.0
+	$(MAKE) -C build-gtk2;
+	touch stamp-build-gtk2
 
-common-install-prehook-arch:: stamp-build-gtk3
-	: # install for GTK+ 3.0
-	$(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install
+common-install-prehook-arch:: stamp-build-gtk2
+	: # install for GTK+ 2.0
+	$(MAKE) -C build-gtk2 DESTDIR=$(CURDIR)/debian/tmp install
 
 binary-predeb/gir%::
 	dh_girepository -p$(cdbs_curpkg)
 
 clean::
-	rm -f stamp-*-gtk3
-	rm -rf build-gtk3
+	rm -f stamp-*-gtk2
+	rm -rf build-gtk2