DBus Menu

Merge lp:~laney/libdbusmenu/libtool-and-gi into lp:libdbusmenu/15.04

  1. libtool-and-gi
  2. Merge into trunk.15.04
Proposed by Iain Lane
Status: Merged
Approved by: Ted Gould
Approved revision: 476
Merged at revision: 474
Proposed branch: lp:~laney/libdbusmenu/libtool-and-gi
Merge into: lp:libdbusmenu/15.04
Diff against target: 109 lines (+11/-8)
8 files modified
debian/control (+4/-1)
debian/gir1.2-dbusmenu-glib-0.4.install (+1/-1)
debian/gir1.2-dbusmenu-gtk-0.4.install (+1/-1)
debian/gir1.2-dbusmenu-gtk3-0.4.install (+1/-1)
debian/rules (+1/-1)
libdbusmenu-glib/Makefile.am (+1/-1)
libdbusmenu-gtk/Makefile.am (+1/-1)
tests/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~laney/libdbusmenu/libtool-and-gi
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+240124@code.launchpad.net

Commit message

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.

Description of the change

libdbusmenu FTBFS in vivid currently

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:475
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/24/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-utopic-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-utopic-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libdbusmenu-ci/24/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ted Gould (ted) wrote :

Seems the GTK2 builds are getting confused with the multiarch changes.

review: Needs Fixing
lp:~laney/libdbusmenu/libtool-and-gi updated
476. By Iain Lane

Bump g-i build-dep version to the one which installs in MA paths

Revision history for this message
Iain Lane (laney) wrote :

On Fri, Oct 31, 2014 at 02:38:01AM -0000, Ted Gould wrote:
> Review: Needs Fixing
>
> Seems the GTK2 builds are getting confused with the multiarch changes.

It's because this CI build was on utopic but the new paths are on ≥
vivid. I just pushed another rev which bumps the version on the
build-dep so this can't be tried.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:476
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/25/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-utopic-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-utopic-armhf-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libdbusmenu-ci/25/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve
Revision history for this message
Ted Gould (ted) wrote :

Okay, that works for me. +1

lp:~laney/libdbusmenu/libtool-and-gi updated
477. By Iain Lane

Run the gir debhelper sequence to get proper deps

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2013-12-18 23:16:03 +0000
+++ debian/control 2015-04-09 17:34:38 +0000
@@ -20,7 +20,7 @@
20 libdbus-glib-1-dev,20 libdbus-glib-1-dev,
21 libatk1.0-dev,21 libatk1.0-dev,
22 libjson-glib-dev (>= 0.13.4),22 libjson-glib-dev (>= 0.13.4),
23 gobject-introspection,23 gobject-introspection (>= 1.41.4-1~),
24 libgirepository1.0-dev (>= 0.9.3),24 libgirepository1.0-dev (>= 0.9.3),
25 libx11-dev (>= 1.3), 25 libx11-dev (>= 1.3),
26 valac (>= 0.16),26 valac (>= 0.16),
@@ -114,6 +114,7 @@
114Package: gir1.2-dbusmenu-glib-0.4114Package: gir1.2-dbusmenu-glib-0.4
115Section: introspection115Section: introspection
116Architecture: any116Architecture: any
117Multi-Arch: same
117Depends: ${misc:Depends},118Depends: ${misc:Depends},
118 libdbusmenu-glib4 (= ${binary:Version}),119 libdbusmenu-glib4 (= ${binary:Version}),
119 ${gir:Depends},120 ${gir:Depends},
@@ -128,6 +129,7 @@
128Package: gir1.2-dbusmenu-gtk-0.4129Package: gir1.2-dbusmenu-gtk-0.4
129Section: introspection130Section: introspection
130Architecture: any131Architecture: any
132Multi-Arch: same
131Depends: ${misc:Depends},133Depends: ${misc:Depends},
132 libdbusmenu-gtk4 (= ${binary:Version}),134 libdbusmenu-gtk4 (= ${binary:Version}),
133 ${gir:Depends},135 ${gir:Depends},
@@ -229,6 +231,7 @@
229Package: gir1.2-dbusmenu-gtk3-0.4231Package: gir1.2-dbusmenu-gtk3-0.4
230Section: introspection232Section: introspection
231Architecture: any233Architecture: any
234Multi-Arch: same
232Depends: ${misc:Depends},235Depends: ${misc:Depends},
233 libdbusmenu-gtk3-4 (= ${binary:Version}),236 libdbusmenu-gtk3-4 (= ${binary:Version}),
234 ${gir:Depends},237 ${gir:Depends},
235238
=== modified file 'debian/gir1.2-dbusmenu-glib-0.4.install'
--- debian/gir1.2-dbusmenu-glib-0.4.install 2011-10-28 13:25:56 +0000
+++ debian/gir1.2-dbusmenu-glib-0.4.install 2015-04-09 17:34:38 +0000
@@ -1,1 +1,1 @@
1usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/1usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib
22
=== modified file 'debian/gir1.2-dbusmenu-gtk-0.4.install'
--- debian/gir1.2-dbusmenu-gtk-0.4.install 2011-10-28 13:25:56 +0000
+++ debian/gir1.2-dbusmenu-gtk-0.4.install 2015-04-09 17:34:38 +0000
@@ -1,1 +1,1 @@
1usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/1usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib
22
=== modified file 'debian/gir1.2-dbusmenu-gtk3-0.4.install'
--- debian/gir1.2-dbusmenu-gtk3-0.4.install 2011-10-28 13:25:56 +0000
+++ debian/gir1.2-dbusmenu-gtk3-0.4.install 2015-04-09 17:34:38 +0000
@@ -1,1 +1,1 @@
1usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/1usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib
22
=== modified file 'debian/rules'
--- debian/rules 2014-03-17 15:51:48 +0000
+++ debian/rules 2015-04-09 17:34:38 +0000
@@ -12,7 +12,7 @@
12LDFLAGS += -Wl,-z,defs -Wl,--as-needed12LDFLAGS += -Wl,-z,defs -Wl,--as-needed
1313
14%:14%:
15 dh $@ --with autoreconf15 dh $@ --with autoreconf,gir
1616
17override_dh_autoreconf:17override_dh_autoreconf:
18 NOCONFIGURE=1 dh_autoreconf ./autogen.sh18 NOCONFIGURE=1 dh_autoreconf ./autogen.sh
1919
=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am 2013-06-20 16:30:45 +0000
+++ libdbusmenu-glib/Makefile.am 2015-04-09 17:34:38 +0000
@@ -198,7 +198,7 @@
198girdir = $(datadir)/gir-1.0198girdir = $(datadir)/gir-1.0
199gir_DATA = $(INTROSPECTION_GIRS)199gir_DATA = $(INTROSPECTION_GIRS)
200200
201typelibdir = $(libdir)/girepository-1.0201typelibdir = $(INTROSPECTION_TYPELIBDIR)
202typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)202typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
203203
204CLEANFILES += $(gir_DATA) $(typelib_DATA)204CLEANFILES += $(gir_DATA) $(typelib_DATA)
205205
=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am 2013-06-20 16:30:45 +0000
+++ libdbusmenu-gtk/Makefile.am 2015-04-09 17:34:38 +0000
@@ -142,7 +142,7 @@
142girdir = $(datadir)/gir-1.0142girdir = $(datadir)/gir-1.0
143gir_DATA = $(INTROSPECTION_GIRS)143gir_DATA = $(INTROSPECTION_GIRS)
144144
145typelibdir = $(libdir)/girepository-1.0145typelibdir = $(INTROSPECTION_TYPELIBDIR)
146typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)146typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
147147
148CLEANFILES += $(gir_DATA) $(typelib_DATA)148CLEANFILES += $(gir_DATA) $(typelib_DATA)
149149
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2014-03-18 18:27:18 +0000
+++ tests/Makefile.am 2015-04-09 17:34:38 +0000
@@ -249,7 +249,7 @@
249 @echo export G_DEBUG=fatal_criticals >> $@249 @echo export G_DEBUG=fatal_criticals >> $@
250 @echo export G_MESSAGES_DEBUG=all >> $@250 @echo export G_MESSAGES_DEBUG=all >> $@
251 @echo $(XVFB_RUN) >> $@251 @echo $(XVFB_RUN) >> $@
252 @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 >> $@252 @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 >> $@
253 @chmod +x $@253 @chmod +x $@
254254
255EXTRA_DIST += \255EXTRA_DIST += \

Subscribers

People subscribed via source and target branches

to all changes: