diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 22 | ||||
| -rw-r--r-- | libdbusmenu-glib/Makefile.am | 6 | ||||
| -rw-r--r-- | libdbusmenu-gtk/Makefile.am | 8 |
4 files changed, 17 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index d34f32e..f391354 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.2.6, ted@canonical.com) +AC_INIT(libdbusmenu, 0.2.7, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.2.6, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 0.2.7, [-Wno-portability]) AM_MAINTAINER_MODE diff --git a/debian/changelog b/debian/changelog index fa4da1b..33df4ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,29 +1,23 @@ -libdbusmenu (0.2.6-0ubuntu2~ppa2) lucid; urgency=low +libdbusmenu (0.2.7-0ubuntu1~ppa1) UNRELEASED; urgency=low - * debian/control: - * Adding dependencies for gir-repository-dev and - gobject-introspection to ensure we get all the GI goodies. - - -- Ted Gould <ted@ubuntu.com> Tue, 02 Mar 2010 10:13:39 -0600 - -libdbusmenu (0.2.6-0ubuntu2~ppa1) lucid; urgency=low - - * Upstream Merge + * Upstream release 0.2.7 * Adding in building of the GObject Introspection details * Adding in building of VAPI files * debian/control: * Adding dependency on valac * Adding in gir's as build dependencies. * Adding in build dependencies for GIR dev + * Adding dependencies for gir-repository-dev and + gobject-introspection to ensure we get all the GI goodies. + * debian/control, debian/gir1.0-dbusmenu-glib-0.2.install, + debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to + hold the typelib files generated by GObject introspection. * debian/libdbusmenu-glib-dev.install, debian/libdbusmenu-gtk-dev.install: * Added VAPI files to the packages. * Added GIR files to the packages. - * debian/control, debian/gir1.0-dbusmenu-glib-0.2.install, - debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to - hold the typelib files generated by GObject introspection. - -- Ted Gould <ted@ubuntu.com> Mon, 01 Mar 2010 22:14:51 -0600 + -- Ted Gould <ted@ubuntu.com> Thu, 04 Mar 2010 11:11:01 -0600 libdbusmenu (0.2.6-0ubuntu1) lucid; urgency=low diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 1264525..c1aff41 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -100,7 +100,7 @@ menuitem-marshal.c: $(srcdir)/menuitem-marshal.list -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) +INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) if HAVE_INTROSPECTION @@ -116,12 +116,12 @@ DbusmenuGlib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) INTROSPECTION_GIRS += DbusmenuGlib-0.2.gir girdir = $(datadir)/gir-1.0 -dist_gir_DATA = $(INTROSPECTION_GIRS) +gir_DATA = $(INTROSPECTION_GIRS) typelibdir = $(libdir)/girepository-1.0 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) -CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) +CLEANFILES += $(gir_DATA) $(typelib_DATA) endif diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index e1b16a0..9cc557c 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -45,8 +45,8 @@ pkgconfigdir = $(libdir)/pkgconfig -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 +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(top_builddir)/libdbusmenu-glib +INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib if HAVE_INTROSPECTION @@ -64,12 +64,12 @@ DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) INTROSPECTION_GIRS += DbusmenuGtk-0.2.gir girdir = $(datadir)/gir-1.0 -dist_gir_DATA = $(INTROSPECTION_GIRS) +gir_DATA = $(INTROSPECTION_GIRS) typelibdir = $(libdir)/girepository-1.0 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) -CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) +CLEANFILES += $(gir_DATA) $(typelib_DATA) endif |