From 39b36ed6a1773a1a336414262e3923914596208b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Dec 2010 10:00:57 -0600 Subject: debian/*.install: Changing to be the 0.4 version of the dbusmenu API of all the filenames and paths. --- debian/changelog | 4 +++- debian/gir1.0-dbusmenu-glib-0.2.install | 2 +- debian/gir1.0-dbusmenu-gtk-0.2.install | 2 +- debian/gir1.0-dbusmenu-gtk3-0.2.install | 2 +- debian/libdbusmenu-glib-dev.install | 8 ++++---- debian/libdbusmenu-gtk-dev.install | 8 ++++---- debian/libdbusmenu-gtk3-dev.install | 6 +++--- debian/libdbusmenu-jsonloader-dev.install | 4 ++-- 8 files changed, 19 insertions(+), 17 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 309ad63..a2ddd53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus1) UNRELEASED; urgency=low * Upstream Merge * Porting from dbus-glib to GDBus + * debian/*.install: Changing to be the 0.4 version of the dbusmenu + API of all the filenames and paths. - -- Ted Gould Tue, 07 Dec 2010 09:45:06 -0600 + -- Ted Gould Tue, 07 Dec 2010 10:00:29 -0600 libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low diff --git a/debian/gir1.0-dbusmenu-glib-0.2.install b/debian/gir1.0-dbusmenu-glib-0.2.install index 86f7711..bca065f 100644 --- a/debian/gir1.0-dbusmenu-glib-0.2.install +++ b/debian/gir1.0-dbusmenu-glib-0.2.install @@ -1 +1 @@ -debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.2.typelib +debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.4.typelib diff --git a/debian/gir1.0-dbusmenu-gtk-0.2.install b/debian/gir1.0-dbusmenu-gtk-0.2.install index 829a344..16bad97 100644 --- a/debian/gir1.0-dbusmenu-gtk-0.2.install +++ b/debian/gir1.0-dbusmenu-gtk-0.2.install @@ -1 +1 @@ -debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.2.typelib +debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib diff --git a/debian/gir1.0-dbusmenu-gtk3-0.2.install b/debian/gir1.0-dbusmenu-gtk3-0.2.install index 2da3933..abf6fab 100644 --- a/debian/gir1.0-dbusmenu-gtk3-0.2.install +++ b/debian/gir1.0-dbusmenu-gtk3-0.2.install @@ -1 +1 @@ -debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.2.typelib +debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install index b693fda..35c7805 100644 --- a/debian/libdbusmenu-glib-dev.install +++ b/debian/libdbusmenu-glib-dev.install @@ -1,6 +1,6 @@ -debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-glib/* -debian/tmp/usr/lib/pkgconfig/dbusmenu-glib.pc +debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-glib/* +debian/tmp/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc debian/tmp/usr/lib/libdbusmenu-glib.a debian/tmp/usr/lib/libdbusmenu-glib.so -debian/tmp/usr/share/gir-1.0/Dbusmenu-Glib-0.2.gir -debian/tmp/usr/share/vala/vapi/Dbusmenu-Glib-0.2.vapi +debian/tmp/usr/share/gir-1.0/Dbusmenu-Glib-0.4.gir +debian/tmp/usr/share/vala/vapi/Dbusmenu-Glib-0.4.vapi diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install index 3fa028f..0ce2419 100644 --- a/debian/libdbusmenu-gtk-dev.install +++ b/debian/libdbusmenu-gtk-dev.install @@ -1,6 +1,6 @@ -debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-gtk/* -debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk.pc +debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-gtk/* +debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk-0.4.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 +debian/tmp/usr/share/gir-1.0/DbusmenuGtk-0.4.gir +debian/tmp/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install index d81ce8b..2c9d2e3 100644 --- a/debian/libdbusmenu-gtk3-dev.install +++ b/debian/libdbusmenu-gtk3-dev.install @@ -1,5 +1,5 @@ -debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk3.pc +debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc debian/tmp/usr/lib/libdbusmenu-gtk3.a debian/tmp/usr/lib/libdbusmenu-gtk3.so -debian/tmp/usr/share/gir-1.0/DbusmenuGtk3-0.2.gir -debian/tmp/usr/share/vala/vapi/DbusmenuGtk3-0.2.vapi +debian/tmp/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir +debian/tmp/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install index 27c41a5..9594064 100644 --- a/debian/libdbusmenu-jsonloader-dev.install +++ b/debian/libdbusmenu-jsonloader-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-jsonloader/* -debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader.pc +debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader/* +debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc debian/tmp/usr/lib/libdbusmenu-jsonloader.a debian/tmp/usr/lib/libdbusmenu-jsonloader.so -- cgit v1.2.3 From 6fe974028fbc908d56e58fc6f262359782a37089 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Dec 2010 10:03:05 -0600 Subject: Autogen --- Makefile.in | 8 +- configure | 153 +++++++++++++++++++--------- debian/changelog | 3 +- docs/Makefile.in | 1 + docs/libdbusmenu-glib/Makefile.in | 1 + docs/libdbusmenu-glib/reference/Makefile.in | 1 + docs/libdbusmenu-gtk/Makefile.in | 1 + docs/libdbusmenu-gtk/reference/Makefile.in | 7 +- libdbusmenu-glib/Makefile.in | 94 ++++++++++------- libdbusmenu-gtk/Makefile.in | 81 +++++++++------ tests/Makefile.in | 9 +- tools/Makefile.in | 1 + tools/testapp/Makefile.in | 8 +- 13 files changed, 242 insertions(+), 126 deletions(-) (limited to 'debian') diff --git a/Makefile.in b/Makefile.in index 10932aa..b123f90 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,7 +40,12 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ compile config.guess config.sub depcomp install-sh ltmain.sh \ missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -223,6 +228,7 @@ USE_NLS = @USE_NLS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XSLT_PROC = @XSLT_PROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/configure b/configure index 221ec41..4c50547 100755 --- a/configure +++ b/configure @@ -763,7 +763,10 @@ GETTEXT_PACKAGE LIBDBUSMENU_AGE LIBDBUSMENU_REVISION LIBDBUSMENU_CURRENT +XSLT_PROC VALA_API_GEN +INTROSPECTION_TEN_FALSE +INTROSPECTION_TEN_TRUE HAVE_INTROSPECTION_FALSE HAVE_INTROSPECTION_TRUE INTROSPECTION_MAKEFILE @@ -6312,13 +6315,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6315: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6318: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6318: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6321: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6321: output\"" >&5) + (eval echo "\"\$as_me:6324: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7523,7 +7526,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7526 "configure"' > conftest.$ac_ext + echo '#line 7529 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8773,6 +8776,10 @@ _lt_linker_boilerplate=`cat conftest.err` $RM -r conftest* +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= @@ -8798,11 +8805,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8801: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8808: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8805: \$? = $ac_status" >&5 + echo "$as_me:8812: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9137,11 +9144,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9140: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9147: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9144: \$? = $ac_status" >&5 + echo "$as_me:9151: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9242,11 +9249,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9245: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9252: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9249: \$? = $ac_status" >&5 + echo "$as_me:9256: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9297,11 +9304,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9300: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9307: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9304: \$? = $ac_status" >&5 + echo "$as_me:9311: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11681,7 +11688,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11684 "configure" +#line 11691 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11777,7 +11784,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11780 "configure" +#line 11787 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12477,8 +12484,7 @@ fi # Dependencies - GLib ########################### -GLIB_REQUIRED_VERSION=2.18 -DBUS_REQUIRED_VERSION=0.76 +GLIB_REQUIRED_VERSION=2.26 XML_REQUIRED_VERSION=2.6 @@ -12491,16 +12497,16 @@ if test -n "$DBUSMENUGLIB_CFLAGS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_REQUIRED_VERSION + gio-2.0 >= \$GLIB_REQUIRED_VERSION libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUSMENUGLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes @@ -12513,16 +12519,16 @@ if test -n "$DBUSMENUGLIB_LIBS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_REQUIRED_VERSION + gio-2.0 >= \$GLIB_REQUIRED_VERSION libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUSMENUGLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes @@ -12544,18 +12550,18 @@ else fi if test $_pkg_short_errors_supported = yes; then DBUSMENUGLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1` else DBUSMENUGLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUSMENUGLIB_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION) were not met: $DBUSMENUGLIB_PKG_ERRORS @@ -12619,18 +12625,15 @@ if test -n "$DBUSMENUGTK_CFLAGS"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION glib-2.0 >= \$GLIB_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_REQUIRED_VERSION libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUSMENUGTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes @@ -12644,18 +12647,15 @@ if test -n "$DBUSMENUGTK_LIBS"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION glib-2.0 >= \$GLIB_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_REQUIRED_VERSION libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUSMENUGTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes @@ -12678,12 +12678,10 @@ fi if test $_pkg_short_errors_supported = yes; then DBUSMENUGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1` else DBUSMENUGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -12691,7 +12689,6 @@ fi as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK3_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION) were not met: $DBUSMENUGTK_PKG_ERRORS @@ -12742,18 +12739,15 @@ if test -n "$DBUSMENUGTK_CFLAGS"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION glib-2.0 >= \$GLIB_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_REQUIRED_VERSION libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUSMENUGTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes @@ -12767,18 +12761,15 @@ if test -n "$DBUSMENUGTK_LIBS"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION glib-2.0 >= \$GLIB_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_REQUIRED_VERSION libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUSMENUGTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes @@ -12801,12 +12792,10 @@ fi if test $_pkg_short_errors_supported = yes; then DBUSMENUGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1` else DBUSMENUGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -12814,7 +12803,6 @@ fi as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION) were not met: $DBUSMENUGTK_PKG_ERRORS @@ -13181,6 +13169,26 @@ fi +if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.10") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + introspection_ten=yes +else + introspection_ten=no +fi + + if test "x$introspection_ten" = "xyes"; then + INTROSPECTION_TEN_TRUE= + INTROSPECTION_TEN_FALSE='#' +else + INTROSPECTION_TEN_TRUE='#' + INTROSPECTION_TEN_FALSE= +fi + + ########################### # Vala API Generation ########################### @@ -13226,6 +13234,51 @@ fi +########################### +# XSLT Processor +########################### + +# Extract the first word of "xsltproc", so it can be a program name with args. +set dummy xsltproc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XSLT_PROC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $XSLT_PROC in + [\\/]* | ?:[\\/]*) + ac_cv_path_XSLT_PROC="$XSLT_PROC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_XSLT_PROC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +XSLT_PROC=$ac_cv_path_XSLT_PROC +if test -n "$XSLT_PROC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLT_PROC" >&5 +$as_echo "$XSLT_PROC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + ########################### # Lib versioning ########################### @@ -13977,7 +14030,7 @@ fi # Files ########################### -ac_config_files="$ac_config_files Makefile po/Makefile.in libdbusmenu-glib/Makefile libdbusmenu-glib/dbusmenu-glib.pc libdbusmenu-gtk/Makefile libdbusmenu-gtk/dbusmenu-gtk.pc libdbusmenu-gtk/dbusmenu-gtk3.pc tools/Makefile tools/testapp/Makefile tests/Makefile tests/dbusmenu-jsonloader.pc docs/Makefile docs/libdbusmenu-glib/Makefile docs/libdbusmenu-glib/reference/Makefile docs/libdbusmenu-glib/reference/version.xml docs/libdbusmenu-gtk/Makefile docs/libdbusmenu-gtk/reference/Makefile docs/libdbusmenu-gtk/reference/version.xml" +ac_config_files="$ac_config_files Makefile po/Makefile.in libdbusmenu-glib/Makefile libdbusmenu-glib/dbusmenu-glib-0.4.pc libdbusmenu-gtk/Makefile libdbusmenu-gtk/dbusmenu-gtk-0.4.pc libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc tools/Makefile tools/testapp/Makefile tests/Makefile tests/dbusmenu-jsonloader-0.4.pc docs/Makefile docs/libdbusmenu-glib/Makefile docs/libdbusmenu-glib/reference/Makefile docs/libdbusmenu-glib/reference/version.xml docs/libdbusmenu-gtk/Makefile docs/libdbusmenu-gtk/reference/Makefile docs/libdbusmenu-gtk/reference/version.xml" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14141,6 +14194,10 @@ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}" as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${INTROSPECTION_TEN_TRUE}" && test -z "${INTROSPECTION_TEN_FALSE}"; then + as_fn_error $? "conditional \"INTROSPECTION_TEN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 @@ -15007,14 +15064,14 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "libdbusmenu-glib/Makefile") CONFIG_FILES="$CONFIG_FILES libdbusmenu-glib/Makefile" ;; - "libdbusmenu-glib/dbusmenu-glib.pc") CONFIG_FILES="$CONFIG_FILES libdbusmenu-glib/dbusmenu-glib.pc" ;; + "libdbusmenu-glib/dbusmenu-glib-0.4.pc") CONFIG_FILES="$CONFIG_FILES libdbusmenu-glib/dbusmenu-glib-0.4.pc" ;; "libdbusmenu-gtk/Makefile") CONFIG_FILES="$CONFIG_FILES libdbusmenu-gtk/Makefile" ;; - "libdbusmenu-gtk/dbusmenu-gtk.pc") CONFIG_FILES="$CONFIG_FILES libdbusmenu-gtk/dbusmenu-gtk.pc" ;; - "libdbusmenu-gtk/dbusmenu-gtk3.pc") CONFIG_FILES="$CONFIG_FILES libdbusmenu-gtk/dbusmenu-gtk3.pc" ;; + "libdbusmenu-gtk/dbusmenu-gtk-0.4.pc") CONFIG_FILES="$CONFIG_FILES libdbusmenu-gtk/dbusmenu-gtk-0.4.pc" ;; + "libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc") CONFIG_FILES="$CONFIG_FILES libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "tools/testapp/Makefile") CONFIG_FILES="$CONFIG_FILES tools/testapp/Makefile" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; - "tests/dbusmenu-jsonloader.pc") CONFIG_FILES="$CONFIG_FILES tests/dbusmenu-jsonloader.pc" ;; + "tests/dbusmenu-jsonloader-0.4.pc") CONFIG_FILES="$CONFIG_FILES tests/dbusmenu-jsonloader-0.4.pc" ;; "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; "docs/libdbusmenu-glib/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/Makefile" ;; "docs/libdbusmenu-glib/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/reference/Makefile" ;; diff --git a/debian/changelog b/debian/changelog index a2ddd53..ceabf87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus1) UNRELEASED; urgency=low * Porting from dbus-glib to GDBus * debian/*.install: Changing to be the 0.4 version of the dbusmenu API of all the filenames and paths. + * Autogen - -- Ted Gould Tue, 07 Dec 2010 10:00:29 -0600 + -- Ted Gould Tue, 07 Dec 2010 10:02:55 -0600 libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low diff --git a/docs/Makefile.in b/docs/Makefile.in index 7f4a52b..c47df3f 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -212,6 +212,7 @@ USE_NLS = @USE_NLS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XSLT_PROC = @XSLT_PROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/docs/libdbusmenu-glib/Makefile.in b/docs/libdbusmenu-glib/Makefile.in index 4823a1d..d18dc84 100644 --- a/docs/libdbusmenu-glib/Makefile.in +++ b/docs/libdbusmenu-glib/Makefile.in @@ -212,6 +212,7 @@ USE_NLS = @USE_NLS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XSLT_PROC = @XSLT_PROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/docs/libdbusmenu-glib/reference/Makefile.in b/docs/libdbusmenu-glib/reference/Makefile.in index cf17c7b..acd1735 100644 --- a/docs/libdbusmenu-glib/reference/Makefile.in +++ b/docs/libdbusmenu-glib/reference/Makefile.in @@ -179,6 +179,7 @@ USE_NLS = @USE_NLS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XSLT_PROC = @XSLT_PROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/docs/libdbusmenu-gtk/Makefile.in b/docs/libdbusmenu-gtk/Makefile.in index c3bf5e8..1dd1094 100644 --- a/docs/libdbusmenu-gtk/Makefile.in +++ b/docs/libdbusmenu-gtk/Makefile.in @@ -212,6 +212,7 @@ USE_NLS = @USE_NLS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XSLT_PROC = @XSLT_PROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/docs/libdbusmenu-gtk/reference/Makefile.in b/docs/libdbusmenu-gtk/reference/Makefile.in index b9e1d6d..a9548c4 100644 --- a/docs/libdbusmenu-gtk/reference/Makefile.in +++ b/docs/libdbusmenu-gtk/reference/Makefile.in @@ -179,6 +179,7 @@ USE_NLS = @USE_NLS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XSLT_PROC = @XSLT_PROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -231,6 +232,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +@USE_GTK3_FALSE@VER = +@USE_GTK3_TRUE@VER = 3 # We require automake 1.6 at least. AUTOMAKE_OPTIONS = 1.6 @@ -241,7 +244,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 @@ -300,7 +303,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) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) diff --git a/libdbusmenu-glib/Makefile.in b/libdbusmenu-glib/Makefile.in index 2bcede7..86c95f4 100644 --- a/libdbusmenu-glib/Makefile.in +++ b/libdbusmenu-glib/Makefile.in @@ -36,12 +36,12 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@HAVE_INTROSPECTION_TRUE@am__append_1 = Dbusmenu-Glib-0.2.gir +@HAVE_INTROSPECTION_TRUE@am__append_1 = Dbusmenu-Glib-0.4.gir @HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA) \ @HAVE_INTROSPECTION_TRUE@ $(vapi_DATA) subdir = libdbusmenu-glib DIST_COMMON = $(libdbusmenu_glibinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/dbusmenu-glib.pc.in + $(srcdir)/Makefile.in $(srcdir)/dbusmenu-glib-0.4.pc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -53,7 +53,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = dbusmenu-glib.pc +CONFIG_CLEAN_FILES = dbusmenu-glib-0.4.pc CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -83,7 +83,9 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \ LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libdbusmenu_glib_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libdbusmenu_glib_la_OBJECTS = libdbusmenu_glib_la-menuitem.lo \ +am_libdbusmenu_glib_la_OBJECTS = \ + libdbusmenu_glib_la-dbus-menu-clean.xml.lo \ + libdbusmenu_glib_la-menuitem.lo \ libdbusmenu_glib_la-menuitem-marshal.lo \ libdbusmenu_glib_la-menuitem-proxy.lo \ libdbusmenu_glib_la-server.lo \ @@ -247,6 +249,7 @@ USE_NLS = @USE_NLS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XSLT_PROC = @XSLT_PROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -299,9 +302,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -CLEANFILES = $(am__append_2) +CLEANFILES = dbus-menu-clean.xml $(BUILT_SOURCES) $(am__append_2) EXTRA_DIST = \ - dbusmenu-glib.pc.in \ + clean-namespaces.xslt \ + dbusmenu-glib-0.4.pc.in \ dbus-menu.xml \ client-marshal.list \ menuitem-marshal.list \ @@ -310,7 +314,7 @@ EXTRA_DIST = \ lib_LTLIBRARIES = \ libdbusmenu-glib.la -libdbusmenu_glibincludedir = $(includedir)/libdbusmenu-0.1/libdbusmenu-glib/ +libdbusmenu_glibincludedir = $(includedir)/libdbusmenu-0.4/libdbusmenu-glib/ libdbusmenu_glibinclude_HEADERS = \ menuitem.h \ menuitem-proxy.h \ @@ -318,8 +322,8 @@ libdbusmenu_glibinclude_HEADERS = \ client.h libdbusmenu_glib_la_SOURCES = \ - dbusmenu-server.h \ - dbusmenu-client.h \ + dbus-menu-clean.xml.h \ + dbus-menu-clean.xml.c \ menuitem.h \ menuitem.c \ menuitem-marshal.h \ @@ -349,11 +353,11 @@ libdbusmenu_glib_la_CFLAGS = \ libdbusmenu_glib_la_LIBADD = \ $(DBUSMENUGLIB_LIBS) -pkgconfig_DATA = dbusmenu-glib.pc +pkgconfig_DATA = dbusmenu-glib-0.4.pc pkgconfigdir = $(libdir)/pkgconfig BUILT_SOURCES = \ - dbusmenu-client.h \ - dbusmenu-server.h \ + dbus-menu-clean.xml.c \ + dbus-menu-clean.xml.h \ client-marshal.h \ client-marshal.c \ menuitem-marshal.h \ @@ -362,20 +366,28 @@ BUILT_SOURCES = \ server-marshal.c INTROSPECTION_GIRS = $(am__append_1) -INTROSPECTION_SCANNER_ARGS = \ - --add-include-path=$(srcdir) \ - $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) +@INTROSPECTION_TEN_FALSE@INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \ +@INTROSPECTION_TEN_FALSE@ --add-include-path=$(srcdir) \ +@INTROSPECTION_TEN_FALSE@ $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) + +@INTROSPECTION_TEN_TRUE@INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \ +@INTROSPECTION_TEN_TRUE@ --add-include-path=$(srcdir) \ +@INTROSPECTION_TEN_TRUE@ $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \ +@INTROSPECTION_TEN_TRUE@ --symbol-prefix=dbusmenu \ +@INTROSPECTION_TEN_TRUE@ --identifier-prefix=Dbusmenu INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) @HAVE_INTROSPECTION_TRUE@introspection_sources = $(libdbusmenu_glibinclude_HEADERS) -@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_INCLUDES = \ +@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_INCLUDES = \ @HAVE_INTROSPECTION_TRUE@ GObject-2.0 -@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_LIBS = libdbusmenu-glib.la -@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) -@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_NAMESPACE = Dbusmenu -@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_2_gir_VERSION = Glib-0.2 +@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) +@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_LIBS = libdbusmenu-glib.la +@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) +@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu +@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_VERSION = Glib-0.4 +@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_PACKAGES = dbusmenu-glib +@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS) @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS) @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0 @@ -385,7 +397,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) # VAPI Files ######################### @HAVE_INTROSPECTION_TRUE@vapidir = $(datadir)/vala/vapi -@HAVE_INTROSPECTION_TRUE@vapi_DATA = Dbusmenu-Glib-0.2.vapi +@HAVE_INTROSPECTION_TRUE@vapi_DATA = Dbusmenu-Glib-0.4.vapi all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -421,7 +433,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -dbusmenu-glib.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-glib.pc.in +dbusmenu-glib-0.4.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-glib-0.4.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -466,6 +478,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-client-marshal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-client-menuitem.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-client.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-dbus-menu-clean.xml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-menuitem-marshal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-menuitem-proxy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_glib_la-menuitem.Plo@am__quote@ @@ -496,6 +509,14 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +libdbusmenu_glib_la-dbus-menu-clean.xml.lo: dbus-menu-clean.xml.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_glib_la_CFLAGS) $(CFLAGS) -MT libdbusmenu_glib_la-dbus-menu-clean.xml.lo -MD -MP -MF $(DEPDIR)/libdbusmenu_glib_la-dbus-menu-clean.xml.Tpo -c -o libdbusmenu_glib_la-dbus-menu-clean.xml.lo `test -f 'dbus-menu-clean.xml.c' || echo '$(srcdir)/'`dbus-menu-clean.xml.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdbusmenu_glib_la-dbus-menu-clean.xml.Tpo $(DEPDIR)/libdbusmenu_glib_la-dbus-menu-clean.xml.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dbus-menu-clean.xml.c' object='libdbusmenu_glib_la-dbus-menu-clean.xml.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_glib_la_CFLAGS) $(CFLAGS) -c -o libdbusmenu_glib_la-dbus-menu-clean.xml.lo `test -f 'dbus-menu-clean.xml.c' || echo '$(srcdir)/'`dbus-menu-clean.xml.c + libdbusmenu_glib_la-menuitem.lo: menuitem.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_glib_la_CFLAGS) $(CFLAGS) -MT libdbusmenu_glib_la-menuitem.lo -MD -MP -MF $(DEPDIR)/libdbusmenu_glib_la-menuitem.Tpo -c -o libdbusmenu_glib_la-menuitem.lo `test -f 'menuitem.c' || echo '$(srcdir)/'`menuitem.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdbusmenu_glib_la-menuitem.Tpo $(DEPDIR)/libdbusmenu_glib_la-menuitem.Plo @@ -882,19 +903,16 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ uninstall-vapiDATA -dbusmenu-server.h: dbus-menu.xml - dbus-binding-tool \ - --prefix=_dbusmenu_server \ - --mode=glib-server \ - --output=dbusmenu-server.h \ - $(srcdir)/dbus-menu.xml +%.xml.h: %.xml + echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@ + +%.xml.c: %.xml + echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@ + sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ + echo ";" >> $@ -dbusmenu-client.h: dbus-menu.xml - dbus-binding-tool \ - --prefix=_dbusmenu_client \ - --mode=glib-client \ - --output=dbusmenu-client.h \ - $(srcdir)/dbus-menu.xml +dbus-menu-clean.xml: dbus-menu.xml + $(XSLT_PROC) $(srcdir)/clean-namespaces.xslt $< > $@ || (rm -f $@ && /bin/false) client-marshal.h: $(srcdir)/client-marshal.list glib-genmarshal --header \ @@ -932,10 +950,10 @@ menuitem-marshal.c: $(srcdir)/menuitem-marshal.list -include $(INTROSPECTION_MAKEFILE) -@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib-0.2.gir: libdbusmenu-glib.la +@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la -@HAVE_INTROSPECTION_TRUE@Dbusmenu-Glib-0.2.vapi: Dbusmenu-Glib-0.2.gir -@HAVE_INTROSPECTION_TRUE@ $(VALA_API_GEN) --library=Dbusmenu-Glib-0.2 $< +@HAVE_INTROSPECTION_TRUE@Dbusmenu-Glib-0.4.vapi: Dbusmenu-Glib-0.4.gir +@HAVE_INTROSPECTION_TRUE@ $(VALA_API_GEN) --library=Dbusmenu-Glib-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.in b/libdbusmenu-gtk/Makefile.in index 59434eb..777906b 100644 --- a/libdbusmenu-gtk/Makefile.in +++ b/libdbusmenu-gtk/Makefile.in @@ -36,22 +36,27 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@HAVE_INTROSPECTION_TRUE@am__append_1 = DbusmenuGtk$(VER)-0.2.gir +@HAVE_INTROSPECTION_TRUE@am__append_1 = DbusmenuGtk$(VER)-0.4.gir @HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA) \ @HAVE_INTROSPECTION_TRUE@ $(vapi_DATA) \ -@HAVE_INTROSPECTION_TRUE@ DbusmenuGtk$(VER)-0.2.tmp.gir +@HAVE_INTROSPECTION_TRUE@ DbusmenuGtk$(VER)-0.4.tmp.gir subdir = libdbusmenu-gtk DIST_COMMON = $(libdbusmenu_gtk3include_HEADERS) \ $(libdbusmenu_gtkinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/dbusmenu-gtk.pc.in \ - $(srcdir)/dbusmenu-gtk3.pc.in + $(srcdir)/Makefile.in $(srcdir)/dbusmenu-gtk-0.4.pc.in \ + $(srcdir)/dbusmenu-gtk3-0.4.pc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = dbusmenu-gtk.pc dbusmenu-gtk3.pc +CONFIG_CLEAN_FILES = dbusmenu-gtk-0.4.pc dbusmenu-gtk3-0.4.pc CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -258,6 +263,7 @@ USE_NLS = @USE_NLS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XSLT_PROC = @XSLT_PROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -320,10 +326,10 @@ CLEANFILES = $(am__append_2) @USE_GTK3_FALSE@lib_LTLIBRARIES = libdbusmenu-gtk.la @USE_GTK3_TRUE@lib_LTLIBRARIES = libdbusmenu-gtk3.la EXTRA_DIST = \ - dbusmenu-gtk.pc.in \ - dbusmenu-gtk3.pc.in + dbusmenu-gtk-0.4.pc.in \ + dbusmenu-gtk3-0.4.pc.in -libdbusmenu_gtkincludedir = $(includedir)/libdbusmenu-0.1/libdbusmenu-gtk$(VER)/ +libdbusmenu_gtkincludedir = $(includedir)/libdbusmenu-0.4/libdbusmenu-gtk$(VER)/ libdbusmenu_gtkinclude_HEADERS = \ client.h \ menu.h \ @@ -362,30 +368,43 @@ libdbusmenu_gtk3_la_SOURCES = $(libdbusmenu_gtk_la_SOURCES) libdbusmenu_gtk3_la_LDFLAGS = $(libdbusmenu_gtk_la_LDFLAGS) libdbusmenu_gtk3_la_CFLAGS = $(libdbusmenu_gtk_la_CFLAGS) libdbusmenu_gtk3_la_LIBADD = $(libdbusmenu_gtk_la_LIBADD) -pkgconfig_DATA = dbusmenu-gtk$(VER).pc +pkgconfig_DATA = dbusmenu-gtk$(VER)-0.4.pc pkgconfigdir = $(libdir)/pkgconfig INTROSPECTION_GIRS = $(am__append_1) -INTROSPECTION_SCANNER_ARGS = \ - --add-include-path=$(srcdir) \ - --add-include-path=$(top_builddir)/libdbusmenu-glib \ - $(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) +@INTROSPECTION_TEN_FALSE@INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \ +@INTROSPECTION_TEN_FALSE@ --add-include-path=$(top_builddir)/libdbusmenu-glib \ +@INTROSPECTION_TEN_FALSE@ $(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \ +@INTROSPECTION_TEN_FALSE@ --symbol-prefix=dbusmenu \ +@INTROSPECTION_TEN_FALSE@ --identifier-prefix=DbusmenuGtk + +@INTROSPECTION_TEN_TRUE@INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \ +@INTROSPECTION_TEN_TRUE@ --add-include-path=$(top_builddir)/libdbusmenu-glib \ +@INTROSPECTION_TEN_TRUE@ $(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \ +@INTROSPECTION_TEN_TRUE@ --symbol-prefix=dbusmenu \ +@INTROSPECTION_TEN_TRUE@ --identifier-prefix=DbusmenuGtk INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib @HAVE_INTROSPECTION_TRUE@introspection_sources = $(libdbusmenu_gtkinclude_HEADERS) -@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_2_gir_INCLUDES = \ +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_INCLUDES = \ @HAVE_INTROSPECTION_TRUE@ GObject-2.0 \ @HAVE_INTROSPECTION_TRUE@ $(GTKGIR) \ -@HAVE_INTROSPECTION_TRUE@ Dbusmenu-Glib-0.2 +@HAVE_INTROSPECTION_TRUE@ Dbusmenu-Glib-0.4 -@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) -@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk$(VER).la -@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_NAMESPACE = DbusmenuGtk$(VER) +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_PACKAGES = dbusmenu-gtk$(VER) # We duplicate these for the same reason as libdbusmenu_gtk3includedir above -@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_2_gir_INCLUDES = $(DbusmenuGtk_0_2_gir_INCLUDES) -@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_2_gir_CFLAGS = $(DbusmenuGtk_0_2_gir_CFLAGS) -@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_2_gir_LIBS = $(DbusmenuGtk_0_2_gir_LIBS) -@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_2_gir_FILES = $(DbusmenuGtk_0_2_gir_FILES) +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_INCLUDES = $(DbusmenuGtk_0_4_gir_INCLUDES) +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_CFLAGS = $(DbusmenuGtk_0_4_gir_CFLAGS) +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_LIBS = $(DbusmenuGtk_0_4_gir_LIBS) +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_FILES = $(DbusmenuGtk_0_4_gir_FILES) +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_NAMESPACE = $(DbusmenuGtk_0_4_gir_NAMESPACE) +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_SCANNERFLAGS = $(DbusmenuGtk_0_4_gir_SCANNERFLAGS) +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_PACKAGES = $(DbusmenuGtk_0_4_gir_PACKAGES) @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS) @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0 @@ -395,7 +414,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_buildd # VAPI Files ######################### @HAVE_INTROSPECTION_TRUE@vapidir = $(datadir)/vala/vapi -@HAVE_INTROSPECTION_TRUE@vapi_DATA = DbusmenuGtk$(VER)-0.2.vapi +@HAVE_INTROSPECTION_TRUE@vapi_DATA = DbusmenuGtk$(VER)-0.4.vapi all: all-am .SUFFIXES: @@ -430,9 +449,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -dbusmenu-gtk.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-gtk.pc.in +dbusmenu-gtk-0.4.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-gtk-0.4.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -dbusmenu-gtk3.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-gtk3.pc.in +dbusmenu-gtk3-0.4.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-gtk3-0.4.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -922,18 +941,18 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ -include $(INTROSPECTION_MAKEFILE) -@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.2.gir: libdbusmenu-gtk$(VER).la +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.4.gir: libdbusmenu-gtk$(VER).la -@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.2.vapi: DbusmenuGtk$(VER)-0.2.tmp.gir Makefile.am -@HAVE_INTROSPECTION_TRUE@ $(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.2 \ +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am +@HAVE_INTROSPECTION_TRUE@ $(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.4 \ @HAVE_INTROSPECTION_TRUE@ --pkg gdk-pixbuf-2.0 \ @HAVE_INTROSPECTION_TRUE@ --pkg $(GTKVALA) \ @HAVE_INTROSPECTION_TRUE@ --pkg atk \ -@HAVE_INTROSPECTION_TRUE@ --pkg Dbusmenu-Glib-0.2 \ +@HAVE_INTROSPECTION_TRUE@ --pkg Dbusmenu-Glib-0.4 \ @HAVE_INTROSPECTION_TRUE@ --vapidir=$(top_builddir)/libdbusmenu-glib \ @HAVE_INTROSPECTION_TRUE@ $< -@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.2.tmp.gir: DbusmenuGtk$(VER)-0.2.gir +@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.4.tmp.gir: DbusmenuGtk$(VER)-0.4.gir @HAVE_INTROSPECTION_TRUE@ $(SED) \ @HAVE_INTROSPECTION_TRUE@ -e "s|GdkPixbuf.Pixbuf|Gdk.Pixbuf|g" \ @HAVE_INTROSPECTION_TRUE@ -e "s|Atk.ImplementorIface|Atk.Implementor|g" \ diff --git a/tests/Makefile.in b/tests/Makefile.in index a8ee723..30851b3 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -62,7 +62,7 @@ check_PROGRAMS = glib-server-nomenu$(EXEEXT) \ subdir = tests DIST_COMMON = $(libdbusmenu_jsonloaderinclude_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/dbusmenu-jsonloader.pc.in + $(srcdir)/dbusmenu-jsonloader-0.4.pc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -74,7 +74,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = dbusmenu-jsonloader.pc +CONFIG_CLEAN_FILES = dbusmenu-jsonloader-0.4.pc CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -557,6 +557,7 @@ USE_NLS = @USE_NLS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XSLT_PROC = @XSLT_PROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -645,7 +646,7 @@ libdbusmenu_jsonloader_la_LIBADD = \ $(DBUSMENUGLIB_LIBS) \ $(DBUSMENUTESTS_LIBS) -pkgconfig_DATA = dbusmenu-jsonloader.pc +pkgconfig_DATA = dbusmenu-jsonloader-0.4.pc pkgconfigdir = $(libdir)/pkgconfig ###################### @@ -1055,7 +1056,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -dbusmenu-jsonloader.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-jsonloader.pc.in +dbusmenu-jsonloader-0.4.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-jsonloader-0.4.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) diff --git a/tools/Makefile.in b/tools/Makefile.in index 167f6d0..7d48bd7 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -276,6 +276,7 @@ USE_NLS = @USE_NLS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XSLT_PROC = @XSLT_PROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tools/testapp/Makefile.in b/tools/testapp/Makefile.in index 8a7a441..387c6bb 100644 --- a/tools/testapp/Makefile.in +++ b/tools/testapp/Makefile.in @@ -38,7 +38,12 @@ libexec_PROGRAMS = dbusmenu-testapp$(EXEEXT) subdir = tools/testapp DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -207,6 +212,7 @@ USE_NLS = @USE_NLS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XSLT_PROC = @XSLT_PROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ -- cgit v1.2.3 From 59eb3099efa8d7d8f4be86a626a79da16a5c2899 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Dec 2010 21:22:16 -0600 Subject: releasing version 0.3.90-0ubuntu2~ppa1~gdbus1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ceabf87..e25b513 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus1) UNRELEASED; urgency=low +libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus1) natty; urgency=low * Upstream Merge * Porting from dbus-glib to GDBus @@ -6,7 +6,7 @@ libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus1) UNRELEASED; urgency=low API of all the filenames and paths. * Autogen - -- Ted Gould Tue, 07 Dec 2010 10:02:55 -0600 + -- Ted Gould Tue, 07 Dec 2010 21:22:12 -0600 libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low -- cgit v1.2.3 From c8543838d28f4db39effdc0bac1eb7621ceb26d3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 09:33:35 -0600 Subject: releasing version 0.3.90-0ubuntu2~ppa1~gdbus2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b22d110..969466a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus2) UNRELEASED; urgency=low +libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus2) natty; urgency=low * Upstream Merge * Fixing the pc files - -- Ted Gould Wed, 08 Dec 2010 09:28:08 -0600 + -- Ted Gould Wed, 08 Dec 2010 09:33:32 -0600 libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus1) natty; urgency=low -- cgit v1.2.3 From 8a45c95d29e19e453a63ebef41da26462a85ddfa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 10:31:50 -0600 Subject: releasing version 0.3.90-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c8cfd0a..aa3dd69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdbusmenu (0.3.90-0ubuntu2~ppa1) UNRELEASED; urgency=low +libdbusmenu (0.3.90-0ubuntu2~ppa1) natty; urgency=low * Upstream Merge * Porting from dbus-glib to GDBus @@ -6,7 +6,7 @@ libdbusmenu (0.3.90-0ubuntu2~ppa1) UNRELEASED; urgency=low API of all the filenames and paths. * Autogen - -- Ted Gould Wed, 08 Dec 2010 10:26:05 -0600 + -- Ted Gould Wed, 08 Dec 2010 10:31:48 -0600 libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low -- cgit v1.2.3 From 38c611a94f1bf07f33e5e9470c06812bce32088f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 9 Dec 2010 16:54:26 -0600 Subject: debian/control: Bumping ABI version in package names --- debian/changelog | 3 ++- debian/control | 32 ++++++++++++++++---------------- debian/libdbusmenu-glib2.install | 1 - debian/libdbusmenu-glib3.install | 1 + debian/libdbusmenu-gtk2.install | 1 - debian/libdbusmenu-gtk3-2.install | 1 - debian/libdbusmenu-gtk3-3.install | 1 + debian/libdbusmenu-gtk3.install | 1 + 8 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 debian/libdbusmenu-glib2.install create mode 100644 debian/libdbusmenu-glib3.install delete mode 100644 debian/libdbusmenu-gtk2.install delete mode 100644 debian/libdbusmenu-gtk3-2.install create mode 100644 debian/libdbusmenu-gtk3-3.install create mode 100644 debian/libdbusmenu-gtk3.install (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3edcafd..9079b54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ libdbusmenu (0.3.90-0ubuntu2~ppa2) UNRELEASED; urgency=low * Upstream Merge * Fixing check items * Bumping the library ABI version + * debian/control: Bumping ABI version in package names - -- Ted Gould Thu, 09 Dec 2010 16:50:31 -0600 + -- Ted Gould Thu, 09 Dec 2010 16:54:05 -0600 libdbusmenu (0.3.90-0ubuntu2~ppa1) natty; urgency=low diff --git a/debian/control b/debian/control index bef3fd0..b8f965c 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu -Package: libdbusmenu-glib2 +Package: libdbusmenu-glib3 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -49,7 +49,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-glib2 (= ${binary:Version}), + libdbusmenu-glib3 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) Description: library for passing menus over DBus - development files @@ -59,7 +59,7 @@ Description: library for passing menus over DBus - development files . This package contains files that are needed to build applications. -Package: libdbusmenu-gtk2 +Package: libdbusmenu-gtk3 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -76,7 +76,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-gtk2 (= ${binary:Version}), + libdbusmenu-gtk3 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0), libdbusmenu-glib-dev @@ -93,7 +93,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, - libdbusmenu-glib2 (= ${binary:Version}) + libdbusmenu-glib3 (= ${binary:Version}) Description: tools useful during development with libdbusmenu libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -106,29 +106,29 @@ Package: gir1.0-dbusmenu-glib-0.2 Section: libs Architecture: any Depends: ${misc:Depends}, - libdbusmenu-glib2 (= ${binary:Version}), + libdbusmenu-glib3 (= ${binary:Version}), ${gir:Depends} -Description: typelib file for libdbusmenu-glib2 +Description: typelib file for libdbusmenu-glib3 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-glib2. + generate dynamic bindings for libdbusmenu-glib3. Package: gir1.0-dbusmenu-gtk-0.2 Section: libs Architecture: any Depends: ${misc:Depends}, - libdbusmenu-gtk2 (= ${binary:Version}), + libdbusmenu-gtk3 (= ${binary:Version}), ${gir:Depends} -Description: typelib file for libdbusmenu-gtk2 +Description: typelib file for libdbusmenu-gtk3 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-gtk2. + generate dynamic bindings for libdbusmenu-gtk3. Package: libdbusmenu-glib-doc Section: doc @@ -181,7 +181,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-2 +Package: libdbusmenu-gtk3-3 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -198,7 +198,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-gtk3-2 (= ${binary:Version}), + libdbusmenu-gtk3-3 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk3.0-dev (>= 2.91.4-0ubuntu1), libdbusmenu-glib-dev @@ -213,13 +213,13 @@ Package: gir1.0-dbusmenu-gtk3-0.2 Section: libs Architecture: any Depends: ${misc:Depends}, - libdbusmenu-gtk3-2 (= ${binary:Version}), + libdbusmenu-gtk3-3 (= ${binary:Version}), ${gir:Depends} -Description: typelib file for libdbusmenu-gtk2 +Description: typelib file for libdbusmenu-gtk3-3 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-gtk2. + generate dynamic bindings for libdbusmenu-gtk3. diff --git a/debian/libdbusmenu-glib2.install b/debian/libdbusmenu-glib2.install deleted file mode 100644 index acdbacf..0000000 --- a/debian/libdbusmenu-glib2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-glib.so.* diff --git a/debian/libdbusmenu-glib3.install b/debian/libdbusmenu-glib3.install new file mode 100644 index 0000000..acdbacf --- /dev/null +++ b/debian/libdbusmenu-glib3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-glib.so.* diff --git a/debian/libdbusmenu-gtk2.install b/debian/libdbusmenu-gtk2.install deleted file mode 100644 index d677935..0000000 --- a/debian/libdbusmenu-gtk2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-gtk.so.* diff --git a/debian/libdbusmenu-gtk3-2.install b/debian/libdbusmenu-gtk3-2.install deleted file mode 100644 index af2e9a3..0000000 --- a/debian/libdbusmenu-gtk3-2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-gtk3.so.* diff --git a/debian/libdbusmenu-gtk3-3.install b/debian/libdbusmenu-gtk3-3.install new file mode 100644 index 0000000..af2e9a3 --- /dev/null +++ b/debian/libdbusmenu-gtk3-3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-gtk3.so.* diff --git a/debian/libdbusmenu-gtk3.install b/debian/libdbusmenu-gtk3.install new file mode 100644 index 0000000..d677935 --- /dev/null +++ b/debian/libdbusmenu-gtk3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-gtk.so.* -- cgit v1.2.3 From 458082e650f570306eef18601aee0a6ff60e82f2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 9 Dec 2010 16:57:04 -0600 Subject: releasing version 0.3.90-0ubuntu2~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9079b54..14669d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libdbusmenu (0.3.90-0ubuntu2~ppa2) UNRELEASED; urgency=low +libdbusmenu (0.3.90-0ubuntu2~ppa2) natty; urgency=low * Upstream Merge * Fixing check items * Bumping the library ABI version * debian/control: Bumping ABI version in package names - -- Ted Gould Thu, 09 Dec 2010 16:54:05 -0600 + -- Ted Gould Thu, 09 Dec 2010 16:56:55 -0600 libdbusmenu (0.3.90-0ubuntu2~ppa1) natty; urgency=low -- cgit v1.2.3 From 8b80249372e0050fd6daf2ad73b4abd94feda477 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 9 Dec 2010 16:58:17 -0600 Subject: debian/control: Forgot jsonloader --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/libdbusmenu-jsonloader2.install | 1 - debian/libdbusmenu-jsonloader3.install | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 debian/libdbusmenu-jsonloader2.install create mode 100644 debian/libdbusmenu-jsonloader3.install (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 14669d8..318a782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdbusmenu (0.3.90-0ubuntu2~ppa3) UNRELEASED; urgency=low + + * debian/control: Forgot jsonloader + + -- Ted Gould Thu, 09 Dec 2010 16:58:02 -0600 + libdbusmenu (0.3.90-0ubuntu2~ppa2) natty; urgency=low * Upstream Merge diff --git a/debian/control b/debian/control index b8f965c..084f794 100644 --- a/debian/control +++ b/debian/control @@ -152,7 +152,7 @@ Description: library for passing menus over DBus - GTK+ version documentation . This package contains developer documentation for libdbusmenu-gtk. -Package: libdbusmenu-jsonloader2 +Package: libdbusmenu-jsonloader3 Section: libs Architecture: any Depends: ${shlibs:Depends}, diff --git a/debian/libdbusmenu-jsonloader2.install b/debian/libdbusmenu-jsonloader2.install deleted file mode 100644 index bff47f5..0000000 --- a/debian/libdbusmenu-jsonloader2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* diff --git a/debian/libdbusmenu-jsonloader3.install b/debian/libdbusmenu-jsonloader3.install new file mode 100644 index 0000000..bff47f5 --- /dev/null +++ b/debian/libdbusmenu-jsonloader3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* -- cgit v1.2.3 From 9b52fc3b27335fa6b7582c7a25bb1a39532ece05 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 9 Dec 2010 17:00:49 -0600 Subject: releasing version 0.3.90-0ubuntu2~ppa3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 318a782..df70c71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdbusmenu (0.3.90-0ubuntu2~ppa3) UNRELEASED; urgency=low +libdbusmenu (0.3.90-0ubuntu2~ppa3) natty; urgency=low * debian/control: Forgot jsonloader - -- Ted Gould Thu, 09 Dec 2010 16:58:02 -0600 + -- Ted Gould Thu, 09 Dec 2010 17:00:47 -0600 libdbusmenu (0.3.90-0ubuntu2~ppa2) natty; urgency=low -- cgit v1.2.3 From 4df4ee42222a893f2f243bb58aae031225db32ee Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 5 Jan 2011 21:48:15 -0600 Subject: * Upstream Merge * Supporting removing properties --- debian/changelog | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d5a79cc..d2817a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.90-0ubuntu4~remove1) UNRELEASED; urgency=low + + * Upstream Merge + * Supporting removing properties + + -- Ted Gould Wed, 05 Jan 2011 21:47:45 -0600 + libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low * Updated for the gir abi transition @@ -12,13 +19,6 @@ libdbusmenu (0.3.90-0ubuntu2) natty; urgency=low -- Ken VanDine Thu, 09 Dec 2010 17:46:41 -0500 -libdbusmenu (0.3.90-0ubuntu2~ppa4~remove1) UNRELEASED; urgency=low - - * Upstream Merge - * Supporting removing properties - - -- Ted Gould Wed, 05 Jan 2011 21:24:36 -0600 - libdbusmenu (0.3.90-0ubuntu2~ppa3) natty; urgency=low * debian/control: Forgot jsonloader -- cgit v1.2.3 From 1f9dddfbc341fc73cce1854c5d3ca949f346e1ef Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 5 Jan 2011 21:53:31 -0600 Subject: debian/control: Changing the GIR package names from "0.2" to "0.4" which now the names of the actual files. --- debian/changelog | 7 +++++++ debian/control | 12 +++--------- debian/gir1.2-dbusmenu-glib-0.2.install | 1 - debian/gir1.2-dbusmenu-glib-0.4.install | 1 + debian/gir1.2-dbusmenu-gtk-0.2.install | 1 - debian/gir1.2-dbusmenu-gtk-0.4.install | 1 + debian/gir1.2-dbusmenu-gtk3-0.2.install | 1 - debian/gir1.2-dbusmenu-gtk3-0.4.install | 1 + 8 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 debian/gir1.2-dbusmenu-glib-0.2.install create mode 100644 debian/gir1.2-dbusmenu-glib-0.4.install delete mode 100644 debian/gir1.2-dbusmenu-gtk-0.2.install create mode 100644 debian/gir1.2-dbusmenu-gtk-0.4.install delete mode 100644 debian/gir1.2-dbusmenu-gtk3-0.2.install create mode 100644 debian/gir1.2-dbusmenu-gtk3-0.4.install (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2a8b0af..3a6d3ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.90-0ubuntu4~ppa1) UNRELEASED; urgency=low + + * debian/control: Changing the GIR package names from "0.2" to + "0.4" which now the names of the actual files. + + -- Ted Gould Wed, 05 Jan 2011 21:52:50 -0600 + libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low * Updated for the gir abi transition diff --git a/debian/control b/debian/control index a93dc6a..5d96966 100644 --- a/debian/control +++ b/debian/control @@ -102,9 +102,7 @@ Description: tools useful during development with libdbusmenu This package contains tools that are useful when developing and building applications with libdbusmenu. -Package: gir1.2-dbusmenu-glib-0.2 -Conflicts: gir1.0-dbusmenu-glib-0.2 -Replaces: gir1.0-dbusmenu-glib-0.2 +Package: gir1.2-dbusmenu-glib-0.4 Section: libs Architecture: any Depends: ${misc:Depends}, @@ -118,9 +116,7 @@ Description: typelib file for libdbusmenu-glib3 This package can be used by other packages using the GIRepository format to generate dynamic bindings for libdbusmenu-glib3. -Package: gir1.2-dbusmenu-gtk-0.2 -Conflicts: gir1.0-dbusmenu-gtk-0.2 -Replaces: gir1.0-dbusmenu-gtk-0.2 +Package: gir1.2-dbusmenu-gtk-0.4 Section: libs Architecture: any Depends: ${misc:Depends}, @@ -213,9 +209,7 @@ Description: library for passing menus over DBus - GTK+ version developement fil . This package contains files that are needed to build GTK+ applications. -Package: gir1.2-dbusmenu-gtk3-0.2 -Conflicts: gir1.0-dbusmenu-gtk3-0.2 -Replaces: gir1.0-dbusmenu-gtk3-0.2 +Package: gir1.2-dbusmenu-gtk3-0.4 Section: libs Architecture: any Depends: ${misc:Depends}, diff --git a/debian/gir1.2-dbusmenu-glib-0.2.install b/debian/gir1.2-dbusmenu-glib-0.2.install deleted file mode 100644 index bca065f..0000000 --- a/debian/gir1.2-dbusmenu-glib-0.2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.4.typelib diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install new file mode 100644 index 0000000..bca065f --- /dev/null +++ b/debian/gir1.2-dbusmenu-glib-0.4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.4.typelib diff --git a/debian/gir1.2-dbusmenu-gtk-0.2.install b/debian/gir1.2-dbusmenu-gtk-0.2.install deleted file mode 100644 index 16bad97..0000000 --- a/debian/gir1.2-dbusmenu-gtk-0.2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install new file mode 100644 index 0000000..16bad97 --- /dev/null +++ b/debian/gir1.2-dbusmenu-gtk-0.4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib diff --git a/debian/gir1.2-dbusmenu-gtk3-0.2.install b/debian/gir1.2-dbusmenu-gtk3-0.2.install deleted file mode 100644 index abf6fab..0000000 --- a/debian/gir1.2-dbusmenu-gtk3-0.2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install new file mode 100644 index 0000000..abf6fab --- /dev/null +++ b/debian/gir1.2-dbusmenu-gtk3-0.4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib -- cgit v1.2.3 From 2af93062f8a8fb18e84c8b3f9704fdcd970c5219 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 5 Jan 2011 21:53:59 -0600 Subject: releasing version 0.3.90-0ubuntu4~remove1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d2817a3..429c600 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.3.90-0ubuntu4~remove1) UNRELEASED; urgency=low +libdbusmenu (0.3.90-0ubuntu4~remove1) natty; urgency=low * Upstream Merge * Supporting removing properties - -- Ted Gould Wed, 05 Jan 2011 21:47:45 -0600 + -- Ted Gould Wed, 05 Jan 2011 21:53:56 -0600 libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low -- cgit v1.2.3 From 13f405d76a1549715e153d5634dd82eb7dee0a82 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 6 Jan 2011 10:32:18 -0600 Subject: releasing version 0.3.90-0ubuntu4~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3a6d3ab..4f8a751 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.3.90-0ubuntu4~ppa1) UNRELEASED; urgency=low +libdbusmenu (0.3.90-0ubuntu4~ppa1) natty; urgency=low * debian/control: Changing the GIR package names from "0.2" to "0.4" which now the names of the actual files. - -- Ted Gould Wed, 05 Jan 2011 21:52:50 -0600 + -- Ted Gould Thu, 06 Jan 2011 10:32:15 -0600 libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low -- cgit v1.2.3 From dd94c4c1fa27db3555c363abf130164e6c97d510 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 6 Jan 2011 10:36:46 -0600 Subject: releasing version 0.3.90-0ubuntu4~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2d3c3ed..bc42561 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.3.90-0ubuntu4~ppa2) UNRELEASED; urgency=low +libdbusmenu (0.3.90-0ubuntu4~ppa2) natty; urgency=low * Upstream Merge * Supporting removing properties - -- Ted Gould Thu, 06 Jan 2011 10:32:30 -0600 + -- Ted Gould Thu, 06 Jan 2011 10:36:43 -0600 libdbusmenu (0.3.90-0ubuntu4~ppa1) natty; urgency=low -- cgit v1.2.3 From bdea6b479fe42197519c98900f726c53b9e8e66f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 13 Jan 2011 10:24:31 -0600 Subject: releasing version 0.3.91-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e7935e4..526cb9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdbusmenu (0.3.91-0ubuntu1~ppa1) UNRELEASED; urgency=low +libdbusmenu (0.3.91-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * Porting from dbus-glib to GDBus @@ -9,7 +9,7 @@ libdbusmenu (0.3.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * debian/control: Changing the GIR package names from "0.2" to "0.4" which now the names of the actual files. - -- Ted Gould Thu, 13 Jan 2011 10:13:02 -0600 + -- Ted Gould Thu, 13 Jan 2011 10:24:28 -0600 libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low -- cgit v1.2.3