diff options
| author | Iain Lane <iain@orangesquash.org.uk> | 2014-10-30 13:56:39 +0000 |
|---|---|---|
| committer | Iain Lane <iain@orangesquash.org.uk> | 2014-10-30 13:56:39 +0000 |
| commit | 1ba6c834236985901179f133152bdc9916a41079 (patch) | |
| tree | b67971f23aafec7e977fa65e7fec951d4886fad4 | |
| parent | 9306f1798fc3c4ab7c9fd5d2852f5f05181c093d (diff) | |
| download | libdbusmenu-1ba6c834236985901179f133152bdc9916a41079.tar.gz libdbusmenu-1ba6c834236985901179f133152bdc9916a41079.tar.bz2 libdbusmenu-1ba6c834236985901179f133152bdc9916a41079.zip | |
Use gi's typelibdir and install in its (multiarch) locations
| -rw-r--r-- | debian/control | 3 | ||||
| -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 | ||||
| -rw-r--r-- | libdbusmenu-glib/Makefile.am | 2 | ||||
| -rw-r--r-- | libdbusmenu-gtk/Makefile.am | 2 |
6 files changed, 8 insertions, 5 deletions
diff --git a/debian/control b/debian/control index 9a338d4..0fd1470 100644 --- a/debian/control +++ b/debian/control @@ -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/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) |