diff options
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/gir1.2-dbusmenu-glib-0.4.install | 2 | ||||
| -rw-r--r-- | debian/gir1.2-dbusmenu-gtk-0.4.install | 2 | ||||
| -rw-r--r-- | debian/gir1.2-dbusmenu-gtk3-0.4.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | libdbusmenu-glib/Makefile.am | 2 | ||||
| -rw-r--r-- | libdbusmenu-gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
8 files changed, 11 insertions, 8 deletions
diff --git a/debian/control b/debian/control index 9a338d4..c0268e1 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 9), libdbus-glib-1-dev, libatk1.0-dev, libjson-glib-dev (>= 0.13.4), - gobject-introspection, + gobject-introspection (>= 1.41.4-1~), libgirepository1.0-dev (>= 0.9.3), libx11-dev (>= 1.3), valac (>= 0.16), @@ -114,6 +114,7 @@ Description: tools useful during development with libdbusmenu Package: gir1.2-dbusmenu-glib-0.4 Section: introspection Architecture: any +Multi-Arch: same Depends: ${misc:Depends}, libdbusmenu-glib4 (= ${binary:Version}), ${gir:Depends}, @@ -128,6 +129,7 @@ Description: typelib file for libdbusmenu-glib4 Package: gir1.2-dbusmenu-gtk-0.4 Section: introspection Architecture: any +Multi-Arch: same Depends: ${misc:Depends}, libdbusmenu-gtk4 (= ${binary:Version}), ${gir:Depends}, @@ -229,6 +231,7 @@ Description: library for passing menus over DBus - GTK+ version developement fil Package: gir1.2-dbusmenu-gtk3-0.4 Section: introspection Architecture: any +Multi-Arch: same Depends: ${misc:Depends}, libdbusmenu-gtk3-4 (= ${binary:Version}), ${gir:Depends}, diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install index da62142..83e9728 100644 --- a/debian/gir1.2-dbusmenu-glib-0.4.install +++ b/debian/gir1.2-dbusmenu-glib-0.4.install @@ -1 +1 @@ -usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/ +usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install index 1a62fd5..30c5870 100644 --- a/debian/gir1.2-dbusmenu-gtk-0.4.install +++ b/debian/gir1.2-dbusmenu-gtk-0.4.install @@ -1 +1 @@ -usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/ +usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install index 4c56230..f238a4b 100644 --- a/debian/gir1.2-dbusmenu-gtk3-0.4.install +++ b/debian/gir1.2-dbusmenu-gtk3-0.4.install @@ -1 +1 @@ -usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/ +usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib diff --git a/debian/rules b/debian/rules index 1f63427..5534dfa 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ INSTALL_COMMON_FLAGS = --fail-missing LDFLAGS += -Wl,-z,defs -Wl,--as-needed %: - dh $@ --with autoreconf + dh $@ --with autoreconf,gir override_dh_autoreconf: NOCONFIGURE=1 dh_autoreconf ./autogen.sh diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 26d900c..2dea5f6 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -198,7 +198,7 @@ INTROSPECTION_GIRS += Dbusmenu-0.4.gir girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) -typelibdir = $(libdir)/girepository-1.0 +typelibdir = $(INTROSPECTION_TYPELIBDIR) typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(gir_DATA) $(typelib_DATA) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index ff8555e..9a7a2b0 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -142,7 +142,7 @@ INTROSPECTION_GIRS += DbusmenuGtk$(VER)-0.4.gir girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) -typelibdir = $(libdir)/girepository-1.0 +typelibdir = $(INTROSPECTION_TYPELIBDIR) typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(gir_DATA) $(typelib_DATA) diff --git a/tests/Makefile.am b/tests/Makefile.am index 716d773..06191b1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -249,7 +249,7 @@ test-json-instruction: test-json-client test-json-server test-json-instruction-c @echo export G_DEBUG=fatal_criticals >> $@ @echo export G_MESSAGES_DEBUG=all >> $@ @echo $(XVFB_RUN) >> $@ - @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --task libtool --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@ + @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --task "$(abs_top_builddir)/libtool" --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@ @chmod +x $@ EXTRA_DIST += \ |