aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--NEWS3
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac4
-rw-r--r--docs/libdbusmenu-glib/reference/html/ch01.html2
-rw-r--r--docs/libdbusmenu-glib/reference/version.xml2
-rw-r--r--docs/libdbusmenu-gtk/reference/html/ch01.html2
-rw-r--r--docs/libdbusmenu-gtk/reference/version.xml2
-rw-r--r--libdbusmenu-glib/Makefile.am6
-rw-r--r--libdbusmenu-glib/Makefile.in6
-rw-r--r--libdbusmenu-gtk/Makefile.am8
-rw-r--r--libdbusmenu-gtk/Makefile.in8
12 files changed, 41 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index 2935b40..f041824 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
2012-09-20 Charles Kerr <charles.kerr@canonical.com>
+ 12.10.1
+
+2012-09-20 Charles Kerr <charles.kerr@canonical.com>
+
+ revert r417 so that we don't change the vapi name at the last minute for 12.10 (LP: #978687)
+
+2012-09-20 Charles Kerr <charles.kerr@canonical.com>
+
12.10.0
2012-09-20 Charles Kerr <charles.kerr@canonical.com>
diff --git a/NEWS b/NEWS
index d6ecc08..c9cc147 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+12.10.1
+ - Revert the vala bindings' naming for the 12.10 cycle; revisit next time
+
12.10.0
- Honor changes to GtkSettings' gtk-menu-images value (LP: #927236)
- don't display an underscore on menuitimes containing a '&' (LP: #994564)
diff --git a/configure b/configure
index 75fc00d..a0974d7 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libdbusmenu 12.10.0.
+# Generated by GNU Autoconf 2.69 for libdbusmenu 12.10.1.
#
# Report bugs to <ted@canonical.com>.
#
@@ -592,8 +592,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libdbusmenu'
PACKAGE_TARNAME='libdbusmenu'
-PACKAGE_VERSION='12.10.0'
-PACKAGE_STRING='libdbusmenu 12.10.0'
+PACKAGE_VERSION='12.10.1'
+PACKAGE_STRING='libdbusmenu 12.10.1'
PACKAGE_BUGREPORT='ted@canonical.com'
PACKAGE_URL=''
@@ -1474,7 +1474,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libdbusmenu 12.10.0 to adapt to many kinds of systems.
+\`configure' configures libdbusmenu 12.10.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1544,7 +1544,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libdbusmenu 12.10.0:";;
+ short | recursive ) echo "Configuration of libdbusmenu 12.10.1:";;
esac
cat <<\_ACEOF
@@ -1699,7 +1699,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libdbusmenu configure 12.10.0
+libdbusmenu configure 12.10.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2070,7 +2070,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libdbusmenu $as_me 12.10.0, which was
+It was created by libdbusmenu $as_me 12.10.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2891,7 +2891,7 @@ fi
# Define the identity of the package.
PACKAGE=libdbusmenu
- VERSION=12.10.0
+ VERSION=12.10.1
# Some tools Automake needs.
@@ -16181,7 +16181,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libdbusmenu $as_me 12.10.0, which was
+This file was extended by libdbusmenu $as_me 12.10.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16247,7 +16247,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libdbusmenu config.status 12.10.0
+libdbusmenu config.status 12.10.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index e0c61bd..9a05419 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(libdbusmenu, 12.10.0, ted@canonical.com)
+AC_INIT(libdbusmenu, 12.10.1, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009,2010 Canonical])
AC_PREREQ(2.62)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 12.10.0, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 12.10.1, [-Wno-portability])
AM_MAINTAINER_MODE
diff --git a/docs/libdbusmenu-glib/reference/html/ch01.html b/docs/libdbusmenu-glib/reference/html/ch01.html
index e25b948..fa864ce 100644
--- a/docs/libdbusmenu-glib/reference/html/ch01.html
+++ b/docs/libdbusmenu-glib/reference/html/ch01.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp2764600"></a>API</h2></div></div></div>
+<a name="idp6779816"></a>API</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"> — The server signals changed and
diff --git a/docs/libdbusmenu-glib/reference/version.xml b/docs/libdbusmenu-glib/reference/version.xml
index 4de623c..714065c 100644
--- a/docs/libdbusmenu-glib/reference/version.xml
+++ b/docs/libdbusmenu-glib/reference/version.xml
@@ -1 +1 @@
-12.10.0
+12.10.1
diff --git a/docs/libdbusmenu-gtk/reference/html/ch01.html b/docs/libdbusmenu-gtk/reference/html/ch01.html
index c01888c..a90b01e 100644
--- a/docs/libdbusmenu-gtk/reference/html/ch01.html
+++ b/docs/libdbusmenu-gtk/reference/html/ch01.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp17448616"></a>API</h2></div></div></div>
+<a name="idp17964048"></a>API</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"> — A GTK Menu Object that syncronizes over DBus</span>
diff --git a/docs/libdbusmenu-gtk/reference/version.xml b/docs/libdbusmenu-gtk/reference/version.xml
index 4de623c..714065c 100644
--- a/docs/libdbusmenu-gtk/reference/version.xml
+++ b/docs/libdbusmenu-gtk/reference/version.xml
@@ -1 +1 @@
-12.10.0
+12.10.1
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index 7fe8030..b2e796c 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -216,10 +216,10 @@ if HAVE_VALA
if HAVE_INTROSPECTION
vapidir = $(datadir)/vala/vapi
-vapi_DATA = dbusmenu-glib-0.4.vapi
+vapi_DATA = Dbusmenu-0.4.vapi
-dbusmenu-glib-0.4.vapi: Dbusmenu-0.4.gir
- $(VALA_API_GEN) --library=dbusmenu-glib-0.4 $<
+Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir
+ $(VALA_API_GEN) --library=Dbusmenu-0.4 $<
CLEANFILES += $(vapi_DATA)
diff --git a/libdbusmenu-glib/Makefile.in b/libdbusmenu-glib/Makefile.in
index a838092..af91b04 100644
--- a/libdbusmenu-glib/Makefile.in
+++ b/libdbusmenu-glib/Makefile.in
@@ -502,7 +502,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
# VAPI Files
#########################
@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@vapidir = $(datadir)/vala/vapi
-@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@vapi_DATA = dbusmenu-glib-0.4.vapi
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@vapi_DATA = Dbusmenu-0.4.vapi
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1094,8 +1094,8 @@ menuitem-marshal.c: $(srcdir)/menuitem-marshal.list
@HAVE_INTROSPECTION_TRUE@Dbusmenu-0.4.gir: libdbusmenu-glib.la
-@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@dbusmenu-glib-0.4.vapi: Dbusmenu-0.4.gir
-@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@ $(VALA_API_GEN) --library=dbusmenu-glib-0.4 $<
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@ $(VALA_API_GEN) --library=Dbusmenu-0.4 $<
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am
index a255a69..b52098f 100644
--- a/libdbusmenu-gtk/Makefile.am
+++ b/libdbusmenu-gtk/Makefile.am
@@ -160,14 +160,14 @@ if HAVE_VALA
if HAVE_INTROSPECTION
vapidir = $(datadir)/vala/vapi
-vapi_DATA = dbusmenu-gtk$(VER)-0.4.vapi
+vapi_DATA = DbusmenuGtk$(VER)-0.4.vapi
-dbusmenu-gtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
- $(VALA_API_GEN) --library=dbusmenu-gtk$(VER)-0.4 \
+DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
+ $(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.4 \
--pkg gdk-pixbuf-2.0 \
--pkg $(GTKVALA) \
--pkg atk \
- --pkg dbusmenu-glib-0.4 \
+ --pkg Dbusmenu-0.4 \
--vapidir=$(top_builddir)/libdbusmenu-glib \
$<
diff --git a/libdbusmenu-gtk/Makefile.in b/libdbusmenu-gtk/Makefile.in
index d1586c1..cecab73 100644
--- a/libdbusmenu-gtk/Makefile.in
+++ b/libdbusmenu-gtk/Makefile.in
@@ -516,7 +516,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_buildd
# VAPI Files
#########################
@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@vapidir = $(datadir)/vala/vapi
-@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@vapi_DATA = dbusmenu-gtk$(VER)-0.4.vapi
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@vapi_DATA = DbusmenuGtk$(VER)-0.4.vapi
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1104,12 +1104,12 @@ $(glib_enum_c): $(builddir)/$(glib_enum_h)
@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.4.gir: libdbusmenu-gtk$(VER).la
-@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@dbusmenu-gtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
-@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@ $(VALA_API_GEN) --library=dbusmenu-gtk$(VER)-0.4 \
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@ $(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.4 \
@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@ --pkg gdk-pixbuf-2.0 \
@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@ --pkg $(GTKVALA) \
@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@ --pkg atk \
-@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@ --pkg dbusmenu-glib-0.4 \
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@ --pkg Dbusmenu-0.4 \
@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@ --vapidir=$(top_builddir)/libdbusmenu-glib \
@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@ $<
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 08:32:08 +0000