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

Proposed by Iain Lane on 2014-10-30
Status: Merged
Approved by: Ted Gould on 2014-11-13
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) 2014-10-30 Approve on 2014-11-13
PS Jenkins bot (community) continuous-integration Needs Fixing on 2014-10-31
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.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
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 on 2014-10-31
476. By Iain Lane on 2014-10-31

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

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> ]

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Ted Gould (ted) :
review: Approve
Ted Gould (ted) wrote :

Okay, that works for me. +1

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

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
1=== modified file 'debian/control'
2--- debian/control 2013-12-18 23:16:03 +0000
3+++ debian/control 2015-04-09 17:34:38 +0000
4@@ -20,7 +20,7 @@
5 libdbus-glib-1-dev,
6 libatk1.0-dev,
7 libjson-glib-dev (>= 0.13.4),
8- gobject-introspection,
9+ gobject-introspection (>= 1.41.4-1~),
10 libgirepository1.0-dev (>= 0.9.3),
11 libx11-dev (>= 1.3),
12 valac (>= 0.16),
13@@ -114,6 +114,7 @@
14 Package: gir1.2-dbusmenu-glib-0.4
15 Section: introspection
16 Architecture: any
17+Multi-Arch: same
18 Depends: ${misc:Depends},
19 libdbusmenu-glib4 (= ${binary:Version}),
20 ${gir:Depends},
21@@ -128,6 +129,7 @@
22 Package: gir1.2-dbusmenu-gtk-0.4
23 Section: introspection
24 Architecture: any
25+Multi-Arch: same
26 Depends: ${misc:Depends},
27 libdbusmenu-gtk4 (= ${binary:Version}),
28 ${gir:Depends},
29@@ -229,6 +231,7 @@
30 Package: gir1.2-dbusmenu-gtk3-0.4
31 Section: introspection
32 Architecture: any
33+Multi-Arch: same
34 Depends: ${misc:Depends},
35 libdbusmenu-gtk3-4 (= ${binary:Version}),
36 ${gir:Depends},
37
38=== modified file 'debian/gir1.2-dbusmenu-glib-0.4.install'
39--- debian/gir1.2-dbusmenu-glib-0.4.install 2011-10-28 13:25:56 +0000
40+++ debian/gir1.2-dbusmenu-glib-0.4.install 2015-04-09 17:34:38 +0000
41@@ -1,1 +1,1 @@
42-usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/
43+usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib
44
45=== modified file 'debian/gir1.2-dbusmenu-gtk-0.4.install'
46--- debian/gir1.2-dbusmenu-gtk-0.4.install 2011-10-28 13:25:56 +0000
47+++ debian/gir1.2-dbusmenu-gtk-0.4.install 2015-04-09 17:34:38 +0000
48@@ -1,1 +1,1 @@
49-usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/
50+usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib
51
52=== modified file 'debian/gir1.2-dbusmenu-gtk3-0.4.install'
53--- debian/gir1.2-dbusmenu-gtk3-0.4.install 2011-10-28 13:25:56 +0000
54+++ debian/gir1.2-dbusmenu-gtk3-0.4.install 2015-04-09 17:34:38 +0000
55@@ -1,1 +1,1 @@
56-usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/
57+usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib
58
59=== modified file 'debian/rules'
60--- debian/rules 2014-03-17 15:51:48 +0000
61+++ debian/rules 2015-04-09 17:34:38 +0000
62@@ -12,7 +12,7 @@
63 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
64
65 %:
66- dh $@ --with autoreconf
67+ dh $@ --with autoreconf,gir
68
69 override_dh_autoreconf:
70 NOCONFIGURE=1 dh_autoreconf ./autogen.sh
71
72=== modified file 'libdbusmenu-glib/Makefile.am'
73--- libdbusmenu-glib/Makefile.am 2013-06-20 16:30:45 +0000
74+++ libdbusmenu-glib/Makefile.am 2015-04-09 17:34:38 +0000
75@@ -198,7 +198,7 @@
76 girdir = $(datadir)/gir-1.0
77 gir_DATA = $(INTROSPECTION_GIRS)
78
79-typelibdir = $(libdir)/girepository-1.0
80+typelibdir = $(INTROSPECTION_TYPELIBDIR)
81 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
82
83 CLEANFILES += $(gir_DATA) $(typelib_DATA)
84
85=== modified file 'libdbusmenu-gtk/Makefile.am'
86--- libdbusmenu-gtk/Makefile.am 2013-06-20 16:30:45 +0000
87+++ libdbusmenu-gtk/Makefile.am 2015-04-09 17:34:38 +0000
88@@ -142,7 +142,7 @@
89 girdir = $(datadir)/gir-1.0
90 gir_DATA = $(INTROSPECTION_GIRS)
91
92-typelibdir = $(libdir)/girepository-1.0
93+typelibdir = $(INTROSPECTION_TYPELIBDIR)
94 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
95
96 CLEANFILES += $(gir_DATA) $(typelib_DATA)
97
98=== modified file 'tests/Makefile.am'
99--- tests/Makefile.am 2014-03-18 18:27:18 +0000
100+++ tests/Makefile.am 2015-04-09 17:34:38 +0000
101@@ -249,7 +249,7 @@
102 @echo export G_DEBUG=fatal_criticals >> $@
103 @echo export G_MESSAGES_DEBUG=all >> $@
104 @echo $(XVFB_RUN) >> $@
105- @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 >> $@
106+ @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 >> $@
107 @chmod +x $@
108
109 EXTRA_DIST += \

Subscribers

People subscribed via source and target branches

to all changes: