Merge lp:~3v1n0/unity-scope-home/use-gee-0.8 into lp:unity-scope-home

Proposed by Marco Trevisan (Treviño) on 2016-02-12
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2016-02-12
Approved revision: no longer in the source branch.
Merged at revision: 184
Proposed branch: lp:~3v1n0/unity-scope-home/use-gee-0.8
Merge into: lp:unity-scope-home
Diff against target: 51 lines (+4/-4)
4 files modified
configure.ac (+1/-1)
debian/control (+1/-1)
src/Makefile.am (+1/-1)
tests/unit/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/unity-scope-home/use-gee-0.8
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve on 2016-02-12
Review via email: mp+285923@code.launchpad.net

Commit message

Build using libgee-0.8-dev instead of libgee-dev

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

Rubberstamp! Proposer approves of own proposal.

review: Approve
184. By Matthias Klose on 2016-02-12

Build using libgee-0.8-dev instead of libgee-dev

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-10-24 13:15:37 +0000
3+++ configure.ac 2016-02-12 19:37:11 +0000
4@@ -62,7 +62,7 @@
5 gio-2.0 >= $GLIB_REQUIRED
6 gio-unix-2.0 >= $GLIB_REQUIRED
7 dee-1.0 >= 1.0.7
8- gee-1.0
9+ gee-0.8
10 json-glib-1.0
11 libsoup-gnome-2.4
12 uuid >= 2.20.0
13
14=== modified file 'debian/control'
15--- debian/control 2013-10-24 13:15:37 +0000
16+++ debian/control 2016-02-12 19:37:11 +0000
17@@ -6,7 +6,7 @@
18 dh-autoreconf,
19 gnome-common,
20 libdee-dev (>= 1.0.7),
21- libgee-dev,
22+ libgee-0.8-dev,
23 libglib2.0-dev (>= 2.27),
24 libunity-dev (>= 7.1.3),
25 valac (>= 0.18.0),
26
27=== modified file 'src/Makefile.am'
28--- src/Makefile.am 2013-06-10 13:05:43 +0000
29+++ src/Makefile.am 2016-02-12 19:37:11 +0000
30@@ -27,7 +27,7 @@
31 unity_scope_home_VALAFLAGS = \
32 -C \
33 --pkg dee-1.0 \
34- --pkg gee-1.0 \
35+ --pkg gee-0.8 \
36 --pkg unity \
37 --pkg unity-extras \
38 --pkg unity-protocol \
39
40=== modified file 'tests/unit/Makefile.am'
41--- tests/unit/Makefile.am 2013-10-01 10:05:52 +0000
42+++ tests/unit/Makefile.am 2016-02-12 19:37:11 +0000
43@@ -18,7 +18,7 @@
44 --pkg gio-unix-2.0 \
45 --pkg glib-2.0 \
46 --pkg json-glib-1.0 \
47- --pkg gee-1.0 \
48+ --pkg gee-0.8 \
49 --pkg unity-extras \
50 --vapidir $(srcdir) \
51 --vapidir $(top_srcdir)/vapi \

Subscribers

People subscribed via source and target branches