From 00dad70b56978403d6b42b780eb8067690815bd3 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Thu, 25 Feb 2010 14:58:50 +1100 Subject: Fix build failures on amd64 --- tests/test-glib-proxy-proxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-glib-proxy-proxy.c b/tests/test-glib-proxy-proxy.c index 1059cfd..722cf1f 100644 --- a/tests/test-glib-proxy-proxy.c +++ b/tests/test-glib-proxy-proxy.c @@ -19,7 +19,7 @@ static GMainLoop * mainloop = NULL; void root_changed (DbusmenuClient * client, DbusmenuMenuitem * newroot, gpointer user_data) { - g_debug("New root: %X", (guint)newroot); + g_debug("New root: %p", newroot); if (newroot == NULL) { g_debug("Root removed, exiting"); -- cgit v1.2.3 From 88aa20ebc30d6211edb9735be2632d6a2943073f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 26 Feb 2010 11:31:13 -0600 Subject: Adding in the introspection M4 file --- m4/introspection.m4 | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 m4/introspection.m4 diff --git a/m4/introspection.m4 b/m4/introspection.m4 new file mode 100644 index 0000000..589721c --- /dev/null +++ b/m4/introspection.m4 @@ -0,0 +1,94 @@ +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl + +# serial 1 + +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first + + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl + + AC_MSG_CHECKING([for gobject-introspection]) + + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl + + AC_MSG_RESULT([$found_introspection]) + + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) + + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +]) + + +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) + +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +]) + +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + + +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +]) -- cgit v1.2.3 From 92d470e0e88323236ec46e7e6e137cc2240cb3c8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 26 Feb 2010 11:34:22 -0600 Subject: GObject in the configure script --- configure.ac | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2d08437..46667d9 100644 --- a/configure.ac +++ b/configure.ac @@ -2,10 +2,10 @@ AC_INIT(libdbusmenu, 0.2.6, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) -AC_PREREQ(2.53) +AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.2.6) +AM_INIT_AUTOMAKE(libdbusmenu, 0.2.6, [-Wno-portability]) AM_MAINTAINER_MODE @@ -61,6 +61,12 @@ PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION) AC_SUBST(DBUSMENUTESTS_CFLAGS) AC_SUBST(DBUSMENUTESTS_LIBS) +########################### +# GObject Introspection +########################### + +GOBJECT_INTROSPECTION_CHECK([0.6.7]) + ########################### # Lib versioning ########################### -- cgit v1.2.3 From e903caad15ee840224010d237dc1cd81fc6627fb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 26 Feb 2010 11:48:11 -0600 Subject: Cleaning up the make file and making sure to enable introspection for distcheck. --- Makefile.am | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index c99525b..658f946 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,14 @@ -EXTRA_DIST = COPYING.2.1 COPYING-GPL3 -SUBDIRS = libdbusmenu-glib libdbusmenu-gtk tools tests po +EXTRA_DIST = \ + COPYING.2.1 \ + COPYING-GPL3 \ + m4/introspection.m4 + +SUBDIRS = \ + libdbusmenu-glib \ + libdbusmenu-gtk \ + tools \ + tests \ + po + +DISTCHECK_CONFIGURE_FLAGS = --enable-introspection -- cgit v1.2.3 From 00cc2d7a9dcd132e0a58daf84eb0008102dbd691 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 26 Feb 2010 12:10:12 -0600 Subject: First pass at building GIR. Still errors --- libdbusmenu-glib/Makefile.am | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 65ebf4c..ed523da 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -1,4 +1,6 @@ +CLEANFILES = + EXTRA_DIST = \ dbusmenu-glib.pc.in \ dbus-menu.xml \ @@ -91,3 +93,35 @@ menuitem-marshal.c: $(srcdir)/menuitem-marshal.list --prefix=_dbusmenu_menuitem_marshal $(srcdir)/menuitem-marshal.list \ > menuitem-marshal.c +######################### +# GObject Introsepction +######################### + +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) +INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) + +if HAVE_INTROSPECTION + +introspection_sources = $(libdbusmenu_glib_la_SOURCES) + +DbusmenuGlib-1.0.gir: libdbusmenu-glib.la +DbusmenuGlib_1_0_gir_INCLUDES = \ + GObject-2.0 +DbusmenuGlib_1_0_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) +DbusmenuGlib_1_0_gir_LIBS = libdbusmenu-glib.la +DbusmenuGlib_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) + +INTROSPECTION_GIRS += DbusmenuGlib-1.0.gir + +girdir = $(datadir)/gir-1.0 +dist_gir_DATA = $(INTROSPECTION_GIRS) + +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) + +endif + -- cgit v1.2.3 From fa8ad4d6cda123c9247e8c8fc1c44e317a563626 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 26 Feb 2010 17:40:53 -0600 Subject: Only intropsecting the headers instead of all the files. --- libdbusmenu-glib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index ed523da..c1c213b 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -104,7 +104,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) if HAVE_INTROSPECTION -introspection_sources = $(libdbusmenu_glib_la_SOURCES) +introspection_sources = $(libdbusmenu_glibinclude_HEADERS) DbusmenuGlib-1.0.gir: libdbusmenu-glib.la DbusmenuGlib_1_0_gir_INCLUDES = \ -- cgit v1.2.3 From 556a787f197e63fbe6457e16e19545e24b455fab Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 13:41:22 -0600 Subject: Generating the introspection data --- libdbusmenu-gtk/Makefile.am | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index 97d8563..e787582 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -1,4 +1,6 @@ +CLEANFILES = + EXTRA_DIST = \ dbusmenu-gtk.pc.in @@ -28,7 +30,7 @@ libdbusmenu_gtk_la_LDFLAGS = \ -export-symbols-regex "^[^_].*" libdbusmenu_gtk_la_CFLAGS = \ - $(DBUSMENUGTK_CFLAGS) -I$(srcdir)/.. -Wall -Werror -DG_DISABLE_DEPRECATED -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\"" + $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) -Wall -Werror -DG_DISABLE_DEPRECATED -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\"" libdbusmenu_gtk_la_LIBADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ @@ -37,3 +39,36 @@ libdbusmenu_gtk_la_LIBADD = \ pkgconfig_DATA = dbusmenu-gtk.pc pkgconfigdir = $(libdir)/pkgconfig +######################### +# GObject Introsepction +######################### + +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(top_srcdir)/libdbusmenu-glib +INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(top_srcdir)/libdbusmenu-glib + +if HAVE_INTROSPECTION + +introspection_sources = $(libdbusmenu_gtkinclude_HEADERS) + +DbusmenuGtk-1.0.gir: libdbusmenu-gtk.la +DbusmenuGtk_1_0_gir_INCLUDES = \ + GObject-2.0 \ + Gtk-2.0 \ + DbusmenuGlib-1.0 +DbusmenuGtk_1_0_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) +DbusmenuGtk_1_0_gir_LIBS = libdbusmenu-gtk.la +DbusmenuGtk_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) + +INTROSPECTION_GIRS += DbusmenuGtk-1.0.gir + +girdir = $(datadir)/gir-1.0 +dist_gir_DATA = $(INTROSPECTION_GIRS) + +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) + +endif -- cgit v1.2.3 From 564af2f2a7318d43e8749a9388e24e9245b49c81 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 13:51:32 -0600 Subject: Ignoring the generated GI files. --- .bzrignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.bzrignore b/.bzrignore index c9483e7..f23db72 100644 --- a/.bzrignore +++ b/.bzrignore @@ -64,3 +64,7 @@ tests/test-glib-proxy-client tests/test-glib-proxy-server tests/test-glib-proxy-proxy tests/test-glib-proxy +libdbusmenu-glib/DbusmenuGlib-1.0.gir +libdbusmenu-glib/DbusmenuGlib-1.0.typelib +libdbusmenu-gtk/DbusmenuGtk-1.0.gir +libdbusmenu-gtk/DbusmenuGtk-1.0.typelib -- cgit v1.2.3 From e011a35e634aeb0a35c95e2c5b982062845262f1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 13:54:03 -0600 Subject: Change version number to 0.2 --- .bzrignore | 8 ++++---- libdbusmenu-glib/Makefile.am | 12 ++++++------ libdbusmenu-gtk/Makefile.am | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.bzrignore b/.bzrignore index f23db72..6cb6a31 100644 --- a/.bzrignore +++ b/.bzrignore @@ -64,7 +64,7 @@ tests/test-glib-proxy-client tests/test-glib-proxy-server tests/test-glib-proxy-proxy tests/test-glib-proxy -libdbusmenu-glib/DbusmenuGlib-1.0.gir -libdbusmenu-glib/DbusmenuGlib-1.0.typelib -libdbusmenu-gtk/DbusmenuGtk-1.0.gir -libdbusmenu-gtk/DbusmenuGtk-1.0.typelib +libdbusmenu-glib/DbusmenuGlib-0.2.gir +libdbusmenu-glib/DbusmenuGlib-0.2.typelib +libdbusmenu-gtk/DbusmenuGtk-0.2.gir +libdbusmenu-gtk/DbusmenuGtk-0.2.typelib diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index c1c213b..dc3dbe1 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -106,14 +106,14 @@ if HAVE_INTROSPECTION introspection_sources = $(libdbusmenu_glibinclude_HEADERS) -DbusmenuGlib-1.0.gir: libdbusmenu-glib.la -DbusmenuGlib_1_0_gir_INCLUDES = \ +DbusmenuGlib-0.2.gir: libdbusmenu-glib.la +DbusmenuGlib_0_2_gir_INCLUDES = \ GObject-2.0 -DbusmenuGlib_1_0_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -DbusmenuGlib_1_0_gir_LIBS = libdbusmenu-glib.la -DbusmenuGlib_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) +DbusmenuGlib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) +DbusmenuGlib_0_2_gir_LIBS = libdbusmenu-glib.la +DbusmenuGlib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) -INTROSPECTION_GIRS += DbusmenuGlib-1.0.gir +INTROSPECTION_GIRS += DbusmenuGlib-0.2.gir girdir = $(datadir)/gir-1.0 dist_gir_DATA = $(INTROSPECTION_GIRS) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index e787582..d14b4d5 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -52,16 +52,16 @@ if HAVE_INTROSPECTION introspection_sources = $(libdbusmenu_gtkinclude_HEADERS) -DbusmenuGtk-1.0.gir: libdbusmenu-gtk.la -DbusmenuGtk_1_0_gir_INCLUDES = \ +DbusmenuGtk-0.2.gir: libdbusmenu-gtk.la +DbusmenuGtk_0_2_gir_INCLUDES = \ GObject-2.0 \ Gtk-2.0 \ - DbusmenuGlib-1.0 -DbusmenuGtk_1_0_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) -DbusmenuGtk_1_0_gir_LIBS = libdbusmenu-gtk.la -DbusmenuGtk_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) + DbusmenuGlib-0.2 +DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) +DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk.la +DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) -INTROSPECTION_GIRS += DbusmenuGtk-1.0.gir +INTROSPECTION_GIRS += DbusmenuGtk-0.2.gir girdir = $(datadir)/gir-1.0 dist_gir_DATA = $(INTROSPECTION_GIRS) -- cgit v1.2.3 From 9d30df280c0f9ea924891ff9546a9f2743a79eb8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 14:46:01 -0600 Subject: debian/control, debian/gir1.0-dbusmenu-glib-0.2.install, gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to hold the typelib files generated by GObject introspection. --- debian/changelog | 3 +++ debian/control | 12 ++++++++++++ debian/gir1.0-dbusmenu-glib-0.2.install | 1 + debian/gir1.0-dbusmenu-gtk-0.2.install | 1 + 4 files changed, 17 insertions(+) create mode 100644 debian/gir1.0-dbusmenu-glib-0.2.install create mode 100644 debian/gir1.0-dbusmenu-gtk-0.2.install diff --git a/debian/changelog b/debian/changelog index 2a55e3a..107b9d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) UNRELEASED; urgency=low * Upstream Merge * Adding in building of the GObject Introspection details + * debian/control, debian/gir1.0-dbusmenu-glib-0.2.install, + gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to hold + the typelib files generated by GObject introspection. -- Ted Gould Sun, 28 Feb 2010 14:35:59 -0600 diff --git a/debian/control b/debian/control index 561429f..8e72167 100644 --- a/debian/control +++ b/debian/control @@ -72,3 +72,15 @@ 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: libdbusmenu-glib1 (= ${binary:Version}) +Description: Typelib file for libdbusmenu-glib1 + +Package: gir1.0-dbusmenu-gtk-0.2 +Section: libs +Architecture: any +Depends: libdbusmenu-gtk1 (= ${binary:Version}) +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 -- cgit v1.2.3 From fd15b2518b038e31c95f0ecad8f8331d3cba3914 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 14:52:48 -0600 Subject: debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to hold the typelib files generated by GObject introspection. * debian/control: Adding in build dependencies for GIR dev --- debian/changelog | 5 +++-- debian/control | 10 +++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 107b9d8..91938b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) UNRELEASED; urgency=low * Upstream Merge * Adding in building of the GObject Introspection details * debian/control, debian/gir1.0-dbusmenu-glib-0.2.install, - gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to hold - the typelib files generated by GObject introspection. + debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to + hold the typelib files generated by GObject introspection. + * debian/control: Adding in build dependencies for GIR dev -- Ted Gould Sun, 28 Feb 2010 14:35:59 -0600 diff --git a/debian/control b/debian/control index 8e72167..5575fb9 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 5.0), libtool, intltool, libxml2-dev, - libjson-glib-dev + libjson-glib-dev, + libgirepository1.0-dev Standards-Version: 3.8.0 Homepage: https://launchpad.net/libdbusmenu Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu @@ -75,12 +76,15 @@ Description: Tools useful during development with libdbusmenu Package: gir1.0-dbusmenu-glib-0.2 Section: libs Architecture: any -Depends: libdbusmenu-glib1 (= ${binary:Version}) +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: libdbusmenu-gtk1 (= ${binary:Version}) +Depends: libdbusmenu-gtk1 (= ${binary:Version}), + gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}), + gir1.0-gtk-2.0 Description: Typelib file for libdbusmenu-gtk1 -- cgit v1.2.3 From 219065ec232985727a201fd1eac7cfd42ea72d22 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 14:58:31 -0600 Subject: Fixing deps --- debian/control | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 5575fb9..10a0d82 100644 --- a/debian/control +++ b/debian/control @@ -76,14 +76,16 @@ Description: Tools useful during development with libdbusmenu Package: gir1.0-dbusmenu-glib-0.2 Section: libs Architecture: any -Depends: libdbusmenu-glib1 (= ${binary:Version}), +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: libdbusmenu-gtk1 (= ${binary:Version}), +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 -- cgit v1.2.3 From ee337328f1addebce24029d8416c4fc8de6ddf83 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 14:58:49 -0600 Subject: releasing version 0.2.6-0ubuntu1~ppa2~gir1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 91938b0..7700b4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) UNRELEASED; urgency=low +libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) lucid; urgency=low * Upstream Merge * Adding in building of the GObject Introspection details @@ -7,7 +7,7 @@ libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) UNRELEASED; urgency=low hold the typelib files generated by GObject introspection. * debian/control: Adding in build dependencies for GIR dev - -- Ted Gould Sun, 28 Feb 2010 14:35:59 -0600 + -- Ted Gould Sun, 28 Feb 2010 14:58:45 -0600 libdbusmenu (0.2.6-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From 0f771fe8f7985930d4935de3208207f06a4aa78f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 20:30:21 -0600 Subject: debian/control: Adding in gir's as build dependencies. --- debian/changelog | 6 ++++++ debian/control | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7700b4f..7b90555 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdbusmenu (0.2.6-0ubuntu1~ppa2~gir2) UNRELEASED; urgency=low + + * debian/control: Adding in gir's as build dependencies. + + -- Ted Gould Sun, 28 Feb 2010 20:29:56 -0600 + libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) lucid; urgency=low * Upstream Merge diff --git a/debian/control b/debian/control index 10a0d82..ebd3ca9 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,9 @@ Build-Depends: debhelper (>= 5.0), intltool, libxml2-dev, libjson-glib-dev, - libgirepository1.0-dev + libgirepository1.0-dev, + gir1.0-glib-2.0, + gir1.0-gtk-2.0 Standards-Version: 3.8.0 Homepage: https://launchpad.net/libdbusmenu Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu -- cgit v1.2.3 From 9fdaca202c2ad5188f42893a7a058493afea28f9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 20:30:31 -0600 Subject: releasing version 0.2.6-0ubuntu1~ppa2~gir2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7b90555..0dcd128 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.2.6-0ubuntu1~ppa2~gir2) UNRELEASED; urgency=low +libdbusmenu (0.2.6-0ubuntu1~ppa2~gir2) lucid; urgency=low * debian/control: Adding in gir's as build dependencies. - -- Ted Gould Sun, 28 Feb 2010 20:29:56 -0600 + -- Ted Gould Sun, 28 Feb 2010 20:30:27 -0600 libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) lucid; urgency=low -- cgit v1.2.3 From b8e941ef47f14e81afc063250472c64d163de13b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 22:17:43 -0600 Subject: debian/libdbusmenu-glib-dev.install, debian/libdbusmenu-gtk-dev.install: Added GIR files to the packages. --- debian/changelog | 8 ++++++++ debian/libdbusmenu-glib-dev.install | 1 + debian/libdbusmenu-gtk-dev.install | 1 + 3 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0dcd128..4c82134 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libdbusmenu (0.2.6-0ubuntu1~ppa2~gir3) UNRELEASED; urgency=low + + * debian/libdbusmenu-glib-dev.install, + debian/libdbusmenu-gtk-dev.install: Added GIR files to + the packages. + + -- Ted Gould Sun, 28 Feb 2010 22:15:49 -0600 + libdbusmenu (0.2.6-0ubuntu1~ppa2~gir2) lucid; urgency=low * debian/control: Adding in gir's as build dependencies. diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install index 17ddd2b..64c14d8 100644 --- a/debian/libdbusmenu-glib-dev.install +++ b/debian/libdbusmenu-glib-dev.install @@ -2,3 +2,4 @@ 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 diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install index 247fbca..a235baa 100644 --- a/debian/libdbusmenu-gtk-dev.install +++ b/debian/libdbusmenu-gtk-dev.install @@ -2,3 +2,4 @@ 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 -- cgit v1.2.3 From 2906283edf2a5248a94aad276a201ec1be35b7da Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 22:22:24 -0600 Subject: releasing version 0.2.6-0ubuntu1~ppa2~gir3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4c82134..589b8fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libdbusmenu (0.2.6-0ubuntu1~ppa2~gir3) UNRELEASED; urgency=low +libdbusmenu (0.2.6-0ubuntu1~ppa2~gir3) lucid; urgency=low * debian/libdbusmenu-glib-dev.install, debian/libdbusmenu-gtk-dev.install: Added GIR files to the packages. - -- Ted Gould Sun, 28 Feb 2010 22:15:49 -0600 + -- Ted Gould Sun, 28 Feb 2010 22:22:21 -0600 libdbusmenu (0.2.6-0ubuntu1~ppa2~gir2) lucid; urgency=low -- cgit v1.2.3 From e5933b7ccca264b6e0a4fa206d7402119ad6defe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:21:51 -0600 Subject: Looking for vapigen --- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index 46667d9..d34f32e 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,12 @@ AC_SUBST(DBUSMENUTESTS_LIBS) GOBJECT_INTROSPECTION_CHECK([0.6.7]) +########################### +# Vala API Generation +########################### + +AC_PATH_PROG([VALA_API_GEN], [vapigen]) + ########################### # Lib versioning ########################### -- cgit v1.2.3 From 1c3e46d6c67bf175fa2354e327488e74486294fe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:28:25 -0600 Subject: Adding in VAPI generation --- libdbusmenu-glib/Makefile.am | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index dc3dbe1..1264525 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -125,3 +125,19 @@ CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) endif +######################### +# VAPI Files +######################### + +if HAVE_INTROSPECTION + +vapidir = $(datadir)/vala/vapi +vapi_DATA = DbusmenuGlib-0.2.vapi + +DbusmenuGlib-0.2.vapi: DbusmenuGlib-0.2.gir + $(VALA_API_GEN) --library=DbusmenuGlib-0.2 $< + +CLEANFILES += $(vapi_DATA) + +endif + -- cgit v1.2.3 From 23736426a5804d2d17825c01dc661dd4dbb66dc3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:35:21 -0600 Subject: Generating the VAPI files --- libdbusmenu-gtk/Makefile.am | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index d14b4d5..b18d33c 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -72,3 +72,32 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) endif + +######################### +# VAPI Files +######################### + +if HAVE_INTROSPECTION + +vapidir = $(datadir)/vala/vapi +vapi_DATA = DbusmenuGtk-0.2.vapi + +DbusmenuGtk-0.2.vapi: DbusmenuGtk-0.2.tmp.gir Makefile.am + $(VALA_API_GEN) --library=DbusmenuGtk-0.2 \ + --pkg gdk-pixbuf-2.0 \ + --pkg gtk+-2.0 \ + --pkg atk \ + --pkg DbusmenuGlib-0.2 \ + --vapidir=$(top_builddir)/libdbusmenu-glib \ + $< + +DbusmenuGtk-0.2.tmp.gir: DbusmenuGtk-0.2.gir + $(SED) \ + -e "s|GdkPixbuf.Pixbuf|Gdk.Pixbuf|g" \ + -e "s|Atk.ImplementorIface|Atk.Implementor|g" \ + $< > $@ + +CLEANFILES += $(vapi_DATA) + +endif + -- cgit v1.2.3 From 9e56feb947b96367299207cc1eef3761d96e0287 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:39:38 -0600 Subject: Adding the temp file to the clean stuff --- libdbusmenu-gtk/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index b18d33c..e1b16a0 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -97,7 +97,7 @@ DbusmenuGtk-0.2.tmp.gir: DbusmenuGtk-0.2.gir -e "s|Atk.ImplementorIface|Atk.Implementor|g" \ $< > $@ -CLEANFILES += $(vapi_DATA) +CLEANFILES += $(vapi_DATA) DbusmenuGtk-0.2.tmp.gir endif -- cgit v1.2.3 From 61ff7d827555b8f8fc60122ebdc5b3cebb0e21de Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:53:04 -0600 Subject: * debian/control: Adding dependency on valac * debian/libdbusmenu-glib-dev.install, debian/libdbusmenu-gtk-dev.install: Added VAPI files to the packages. --- debian/changelog | 4 ++++ debian/control | 3 ++- debian/libdbusmenu-glib-dev.install | 1 + debian/libdbusmenu-gtk-dev.install | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1ad4ba5..cdf5e13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) UNRELEASED; urgency=low * Upstream Merge * Adding in building of VAPI files + * debian/control: Adding dependency on valac + * debian/libdbusmenu-glib-dev.install, + debian/libdbusmenu-gtk-dev.install: Added VAPI files to + the packages. -- Ted Gould Mon, 01 Mar 2010 10:50:08 -0600 diff --git a/debian/control b/debian/control index ebd3ca9..869b3e8 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,8 @@ Build-Depends: debhelper (>= 5.0), libjson-glib-dev, libgirepository1.0-dev, gir1.0-glib-2.0, - gir1.0-gtk-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 diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install index 64c14d8..724eb9c 100644 --- a/debian/libdbusmenu-glib-dev.install +++ b/debian/libdbusmenu-glib-dev.install @@ -3,3 +3,4 @@ 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 a235baa..3fa028f 100644 --- a/debian/libdbusmenu-gtk-dev.install +++ b/debian/libdbusmenu-gtk-dev.install @@ -3,3 +3,4 @@ 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 -- cgit v1.2.3 From ed2766ed77d7a5e7e094cb7f05957dc6186f2cf8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:56:51 -0600 Subject: releasing version 0.2.6-0ubuntu1~ppa2~gir4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cdf5e13..bf47970 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) UNRELEASED; urgency=low +libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) lucid; urgency=low * Upstream Merge * Adding in building of VAPI files @@ -7,7 +7,7 @@ libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) UNRELEASED; urgency=low debian/libdbusmenu-gtk-dev.install: Added VAPI files to the packages. - -- Ted Gould Mon, 01 Mar 2010 10:50:08 -0600 + -- Ted Gould Mon, 01 Mar 2010 10:56:47 -0600 libdbusmenu (0.2.6-0ubuntu1~ppa2~gir3) lucid; urgency=low -- cgit v1.2.3 From e77ba68be1e4429a94ce5f6513fadb289cc9c987 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 14:04:38 -0600 Subject: * debian/rules: Setting up to run autogen.sh * debian/control: Adding dep on gnome-common --- debian/changelog | 7 +++++++ debian/control | 1 + debian/rules | 1 + 3 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index bf47970..b0e05cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.6-0ubuntu1~ppa2~gir5) UNRELEASED; urgency=low + + * debian/rules: Setting up to run autogen.sh + * debian/control: Adding dep on gnome-common + + -- Ted Gould Mon, 01 Mar 2010 14:04:01 -0600 + libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) lucid; urgency=low * Upstream Merge diff --git a/debian/control b/debian/control index 869b3e8..6c925e5 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 5.0), intltool, libxml2-dev, libjson-glib-dev, + gnome-common, libgirepository1.0-dev, gir1.0-glib-2.0, gir1.0-gtk-2.0, diff --git a/debian/rules b/debian/rules index 90e7af5..3b6e341 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +DEB_CONFIGURE_SCRIPT=$(CURDIR)/$(DEB_SRCDIR)/autogen.sh DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper LDFLAGS += -Wl,-z,defs -Wl,--as-needed -- cgit v1.2.3 From 9bb2be1cf05e30786e3d887bd701f213748cd81d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 14:06:03 -0600 Subject: releasing version 0.2.6-0ubuntu1~ppa2~gir5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b0e05cb..90a728d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.2.6-0ubuntu1~ppa2~gir5) UNRELEASED; urgency=low +libdbusmenu (0.2.6-0ubuntu1~ppa2~gir5) lucid; urgency=low * debian/rules: Setting up to run autogen.sh * debian/control: Adding dep on gnome-common - -- Ted Gould Mon, 01 Mar 2010 14:04:01 -0600 + -- Ted Gould Mon, 01 Mar 2010 14:06:00 -0600 libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) lucid; urgency=low -- cgit v1.2.3