diff options
| author | Iain Lane <iain@orangesquash.org.uk> | 2015-04-09 17:35:57 +0000 |
|---|---|---|
| committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-04-09 17:35:57 +0000 |
| commit | 719a40ec821dfbc2ec2f03fd1d1b0057d6e8dee8 (patch) | |
| tree | 3f88f07b08d5d0dc04dae53e6126b54bf3b110dc /debian | |
| parent | 3645d9efd849c56a1bece51d00b6aa76ff7bdda3 (diff) | |
| parent | 0f5a3df06500837b8251b99fed0c6d17b826576f (diff) | |
| download | libdbusmenu-719a40ec821dfbc2ec2f03fd1d1b0057d6e8dee8.tar.gz libdbusmenu-719a40ec821dfbc2ec2f03fd1d1b0057d6e8dee8.tar.bz2 libdbusmenu-719a40ec821dfbc2ec2f03fd1d1b0057d6e8dee8.zip | |
Use the configure-generated libtool script instead of /usr/bin/libtool, which might not match what we have. Also use gi's typelibdir pkgconfig variable and install into this directory, now that gi supports multiarch.
Approved by: Ted Gould
Diffstat (limited to 'debian')
| -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 |
5 files changed, 8 insertions, 5 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 |