aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--configure.ac16
-rw-r--r--debian/changelog6
3 files changed, 22 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 6beed00..3fbd7b9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+16.04.0
+ - Lots of fixes...
+
12.10.2
- Fix crashed introduced in 12.10.0's gtk-menu-images code (LP: #1053670)
diff --git a/configure.ac b/configure.ac
index ff12a43..ace54d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(libdbusmenu, 12.10.2, ted@canonical.com)
-AC_COPYRIGHT([Copyright 2009,2010 Canonical])
+AC_INIT(libdbusmenu, 16.04.0, ted@canonical.com)
+AC_COPYRIGHT([Copyright 2009-2016 Canonical])
AC_PREREQ(2.62)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 12.10.2, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 16.04.0, [-Wno-portability])
AM_MAINTAINER_MODE
@@ -138,6 +138,16 @@ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 0.10],
AM_CONDITIONAL(INTROSPECTION_TEN, [test "x$introspection_ten" = "xyes"])
+if test "$enable_introspection" = "yes"; then
+ # Redefine introspection dirs using proper prefixes
+
+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --define-variable=datadir=${datadir} --variable=girdir gobject-introspection-1.0`
+ AC_SUBST(INTROSPECTION_GIRDIR)
+
+ INTROSPECTION_TYPELIBDIR=`$PKG_CONFIG --define-variable=libdir=${libdir} --variable=typelibdir gobject-introspection-1.0`
+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
+fi
+
###########################
# Vala API Generation
###########################
diff --git a/debian/changelog b/debian/changelog
index 6313c97..bcca6c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (16.04.1-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Marco Trevisan (TreviƱo) <marco@ubuntu.com> Sat, 27 Feb 2016 19:44:28 +0100
+
libdbusmenu (12.10.3+16.04.20160223.1-0ubuntu1) xenial; urgency=medium
[ Dan Williams ]