* debian/rules

  - Added build targets to build with gtk3 enabled in additional to 
    default build with gtk2
* debian/control
  - Updated build depends to support building with gtk+-3.0
  - Added dh-autoreconf build depends
  - Added libdbusmenu-gtk3-2, libdbusmenu-gtk3-dev, gir1.0-dbusmenu-gtk3-0.2
    binaries
  - build depend on libgdk-pixbuf2.0-dev >= 2.22.1-0ubuntu4, needed
    for GIR fixes
* docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am, 
  libdbusmenu-gtk/Makefile.am
  - Fixes needed for building with-gtk=3

8 files changed, 56 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index 3fc5e60..857b8c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,20 @@
-libdbusmenu (0.3.90-0ubuntu1~ppa1) maverick; urgency=low
+libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low
 
+  * debian/rules
+    - Added build targets to build with gtk3 enabled in additional to 
+      default build with gtk2
+  * debian/control
+    - Updated build depends to support building with gtk+-3.0
+    - Added dh-autoreconf build depends
+    - Added libdbusmenu-gtk3-2, libdbusmenu-gtk3-dev, gir1.0-dbusmenu-gtk3-0.2
+      binaries
+    - build depend on libgdk-pixbuf2.0-dev >= 2.22.1-0ubuntu4, needed
+      for GIR fixes
+  * docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am, 
+    libdbusmenu-gtk/Makefile.am
+    - Fixes needed for building with-gtk=3
+
+  [ Ted Gould ]
   * New upstream release.
     * Breaking ABI and getting reserved back
     * Adding build support for GTK2/3 builds
@@ -9,7 +24,7 @@ libdbusmenu (0.3.90-0ubuntu1~ppa1) maverick; urgency=low
     debian/libdbusmenu-gtk2.install: Switching package names to
     match .so bump.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 11 Nov 2010 11:34:00 -0600
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 24 Nov 2010 12:05:39 -0500
 
 libdbusmenu (0.3.16-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index bec5001..6a16de9 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
                libgtk2.0-dev (>= 2.23.2-0ubuntu2),
                libgtk3.0-dev (>= 2.91.4-0ubuntu1),
+               libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
                libdbus-glib-1-dev,
                gnome-doc-utils,
                gtk-doc-tools,
@@ -22,6 +23,7 @@ Build-Depends: debhelper (>= 5.0),
                gir1.0-gtk-2.0,
                gir1.0-gtk-3.0,
                libx11-dev (>= 1.3), 
+               dh-autoreconf,
                valac
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/dbusmenu
@@ -152,7 +154,7 @@ Description: library for passing menus over DBus - GTK+ version documentation
  .
  This package contains developer documentation for libdbusmenu-gtk.
 
-Package: libdbusmenu-jsonloader1
+Package: libdbusmenu-jsonloader2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -181,7 +183,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
+Package: libdbusmenu-gtk3-2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -198,7 +200,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbusmenu-gtk3 (= ${binary:Version}),
+         libdbusmenu-gtk3-2 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk3.0-dev (>= 2.91.4-0ubuntu1),
          libdbusmenu-glib-dev
@@ -213,7 +215,7 @@ Package: gir1.0-dbusmenu-gtk3-0.2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         libdbusmenu-gtk3 (= ${binary:Version}),
+         libdbusmenu-gtk3-2 (= ${binary:Version}),
          gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}),
          gir1.0-gtk-3.0
 Description: typelib file for libdbusmenu-gtk2
diff --git a/debian/libdbusmenu-gtk3.install b/debian/libdbusmenu-gtk3-2.install
index af2e9a3..af2e9a3 100644
--- a/debian/libdbusmenu-gtk3.install
+++ b/debian/libdbusmenu-gtk3-2.install
diff --git a/debian/libdbusmenu-jsonloader1.install b/debian/libdbusmenu-jsonloader2.install
index bff47f5..bff47f5 100644
--- a/debian/libdbusmenu-jsonloader1.install
+++ b/debian/libdbusmenu-jsonloader2.install
diff --git a/debian/rules b/debian/rules
index 7a88781..cd1d01f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_SRCDIR = .
 DEB_BUILDDIR = $(DEB_SRCDIR)/build
@@ -10,10 +11,10 @@ DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-in
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk2 += -V 'libdbusmenu-gtk2 (>= 0.3.90)'
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3 += -V 'libdbusmenu-gtk3 (>= 0.3.90)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3-2 += -V 'libdbusmenu-gtk3-2 (>= 0.3.90)'
 DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib2 += -V 'libdbusmenu-glib2 (>= 0.3.90)'
 
-configure/libdbusmenu-gtk3:: stamp-configure-gtk3
+configure/libdbusmenu-gtk3-2:: stamp-configure-gtk3
 stamp-configure-gtk3:
 	: # configure for GTK+ 3.0
 	set -e; \
@@ -26,16 +27,15 @@ stamp-configure-gtk3:
 	cd ..;
 	touch stamp-configure-gtk3
 
-build/libdbusmenu-gtk3:: stamp-build-gtk3
+build/libdbusmenu-gtk3-2:: stamp-build-gtk3
 stamp-build-gtk3: stamp-configure-gtk3
 	: # build for GTK+ 3.0
 	$(MAKE) -C build-gtk3;
 	touch stamp-build-gtk3
 
-binary-install/libdbusmenu:: binary-install/libdbusmenu-gtk2 stamp-build-gtk3
+common-install-prehook-arch:: stamp-build-gtk3
 	: # install for GTK+ 3.0
 	$(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install
-	$(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
 
 binary-predeb/gir%::
 	dh_girepository -p$(cdbs_curpkg)
diff --git a/docs/libdbusmenu-gtk/reference/Makefile.am b/docs/libdbusmenu-gtk/reference/Makefile.am
index ec1bd28..6e44a23 100644
--- a/docs/libdbusmenu-gtk/reference/Makefile.am
+++ b/docs/libdbusmenu-gtk/reference/Makefile.am
@@ -1,5 +1,12 @@
+
 ## Process this file with automake to produce Makefile.in
 
+if USE_GTK3
+VER=3
+else
+VER=
+endif
+
 # We require automake 1.6 at least.
 AUTOMAKE_OPTIONS = 1.6
 
@@ -9,7 +16,7 @@ AUTOMAKE_OPTIONS = 1.6
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE=libdbusmenu-gtk
+DOC_MODULE=libdbusmenu-gtk$(VER)
 
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -68,7 +75,7 @@ expand_content_files=
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES=-I$(top_srcdir) $(DBUSMENUGLIB_CFLAGS) $(DBUSMENUGTK_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk.la 
+GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk$(VER).la $(DBUSMENUGLIB_LIBS) $(DBUSMENUGTK_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.local.make
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index 0a6513f..adf4607 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -114,9 +114,12 @@ menuitem-marshal.c: $(srcdir)/menuitem-marshal.list
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS = 
-INTROSPECTION_SCANNER_ARGS = \
-	--add-include-path=$(srcdir) \
-	$(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources))
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+        --add-include-path=$(srcdir) \
+        $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \
+        --symbol-prefix=dbusmenu \
+        --identifier-prefix=Dbusmenu
+
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 
 if HAVE_INTROSPECTION
@@ -131,6 +134,8 @@ Dbusmenu_Glib_0_2_gir_LIBS = libdbusmenu-glib.la
 Dbusmenu_Glib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
 Dbusmenu_Glib_0_2_gir_NAMESPACE = Dbusmenu
 Dbusmenu_Glib_0_2_gir_VERSION = Glib-0.2
+Dbusmenu_Glib_0_2_gir_PACKAGES = dbusmenu-glib
+Dbusmenu_Glib_0_2_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
 
 INTROSPECTION_GIRS += Dbusmenu-Glib-0.2.gir
 
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am
index b30cac9..e539aa6 100644
--- a/libdbusmenu-gtk/Makefile.am
+++ b/libdbusmenu-gtk/Makefile.am
@@ -66,10 +66,11 @@ pkgconfigdir = $(libdir)/pkgconfig
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS = 
-INTROSPECTION_SCANNER_ARGS = \
-	--add-include-path=$(srcdir) \
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
 	--add-include-path=$(top_builddir)/libdbusmenu-glib \
-	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources))
+	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \
+	--symbol-prefix=dbusmenu \
+	--identifier-prefix=DbusmenuGtk
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib
 
 if HAVE_INTROSPECTION
@@ -80,16 +81,22 @@ DbusmenuGtk$(VER)-0.2.gir: libdbusmenu-gtk$(VER).la
 DbusmenuGtk_0_2_gir_INCLUDES = \
 	GObject-2.0 \
 	$(GTKGIR) \
-	Dbusmenu-Glib-0.2
+	Dbusmenu-Glib-0.2 
 DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
 DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk$(VER).la
 DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+DbusmenuGtk_0_2_gir_NAMESPACE = DbusmenuGtk$(VER)
+DbusmenuGtk_0_2_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS)
+DbusmenuGtk_0_2_gir_PACKAGES = dbusmenu-gtk$(VER)
 
 # We duplicate these for the same reason as libdbusmenu_gtk3includedir above
 DbusmenuGtk3_0_2_gir_INCLUDES = $(DbusmenuGtk_0_2_gir_INCLUDES)
 DbusmenuGtk3_0_2_gir_CFLAGS = $(DbusmenuGtk_0_2_gir_CFLAGS)
 DbusmenuGtk3_0_2_gir_LIBS = $(DbusmenuGtk_0_2_gir_LIBS)
 DbusmenuGtk3_0_2_gir_FILES = $(DbusmenuGtk_0_2_gir_FILES)
+DbusmenuGtk3_0_2_gir_NAMESPACE = $(DbusmenuGtk_0_2_gir_NAMESPACE)
+DbusmenuGtk3_0_2_gir_SCANNERFLAGS = $(DbusmenuGtk_0_2_gir_SCANNERFLAGS)
+DbusmenuGtk3_0_2_gir_PACKAGES = $(DbusmenuGtk_0_2_gir_PACKAGES)
 
 INTROSPECTION_GIRS += DbusmenuGtk$(VER)-0.2.gir