Merge lp:~3v1n0/unity-lens-applications/use-gee-0.8 into lp:unity-lens-applications

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: 381
Proposed branch: lp:~3v1n0/unity-lens-applications/use-gee-0.8
Merge into: lp:unity-lens-applications
Diff against target: 70 lines (+6/-7)
4 files modified
configure.ac (+1/-1)
debian/control (+2/-3)
src/Makefile.am (+1/-1)
tests/unit/Makefile.am (+2/-2)
To merge this branch: bzr merge lp:~3v1n0/unity-lens-applications/use-gee-0.8
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve on 2016-02-12
Review via email: mp+285921@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
381. By Matthias Klose on 2016-02-12

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

382. By Marco Trevisan (Treviño) on 2016-02-17

debian/control: move unity dependency to a racommendation

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-09-06 15:12:00 +0000
3+++ configure.ac 2016-02-17 15:30:51 +0000
4@@ -74,7 +74,7 @@
5 gobject-2.0 >= $GLIB_REQUIRED
6 gio-2.0 >= $GLIB_REQUIRED
7 gio-unix-2.0 >= $GLIB_REQUIRED
8- gee-1.0
9+ gee-0.8
10 dee-1.0 >= 0.5.16
11 zeitgeist-1.0 >= 0.3.8
12 libcolumbus >= 1.0.0
13
14=== modified file 'debian/control'
15--- debian/control 2013-09-06 15:12:00 +0000
16+++ debian/control 2016-02-17 15:30:51 +0000
17@@ -8,7 +8,7 @@
18 pkg-config,
19 valac (>= 0.18.0),
20 libglib2.0-dev (>= 2.27),
21- libgee-dev,
22+ libgee-0.8-dev,
23 libdee-dev (>= 0.5.16),
24 libzeitgeist-dev (>= 0.3.8),
25 libunity-dev (>= 7.1.1),
26@@ -28,9 +28,8 @@
27 Architecture: any
28 Depends: ${shlibs:Depends},
29 ${misc:Depends},
30- unity-common-7.0 | unity-common (>= 7.0.0)
31+Recommends: unity-common-7.0 | unity-common (>= 7.0.0)
32 Breaks: unity (<< 6.0.0),
33 Description: Application lens for unity
34 This package contains the "application" lens which can be used
35 inside Unity to launch and install applications.
36-
37
38=== modified file 'src/Makefile.am'
39--- src/Makefile.am 2013-08-06 16:32:26 +0000
40+++ src/Makefile.am 2016-02-17 15:30:51 +0000
41@@ -38,7 +38,7 @@
42 --pkg zeitgeist-1.0 \
43 --pkg unity \
44 --pkg unity-protocol \
45- --pkg gee-1.0 \
46+ --pkg gee-0.8 \
47 --pkg libgnome-menu-3.0 \
48 --pkg unity-package-search \
49 --pkg unity-ratings-db \
50
51=== modified file 'tests/unit/Makefile.am'
52--- tests/unit/Makefile.am 2013-08-29 11:01:54 +0000
53+++ tests/unit/Makefile.am 2016-02-17 15:30:51 +0000
54@@ -16,7 +16,7 @@
55 --pkg posix \
56 --pkg dee-1.0 \
57 --pkg gio-2.0 \
58- --pkg gee-1.0 \
59+ --pkg gee-0.8 \
60 --pkg gio-unix-2.0 \
61 --pkg unity-package-search \
62 --pkg unity \
63@@ -108,7 +108,7 @@
64 nodist_test_software_center_details_SOURCES = $(test_software_center_details_VALASOURCES:.vala=.c)
65
66 unity-package-search.o : $(top_srcdir)/src/unity-package-search.cc $(top_srcdir)/src/unity-package-search.h
67- $(AM_V_GEN)$(CXX) --std=c++11 -g $(COVERAGE_CFLAGS) $(UNITY_PACKAGE_SEARCH_LIBS) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu-3.0 unity gee-1.0 libcolumbus` -c $(top_srcdir)/src/unity-package-search.cc
68+ $(AM_V_GEN)$(CXX) --std=c++11 -g $(COVERAGE_CFLAGS) $(UNITY_PACKAGE_SEARCH_LIBS) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu-3.0 unity gee-0.8 libcolumbus` -c $(top_srcdir)/src/unity-package-search.cc
69 unity-ratings-db.o : $(top_srcdir)/src/unity-ratings-db.c $(top_srcdir)/src/unity-ratings-db.h
70 $(AM_V_CC)$(CC) -g $(COVERAGE_CFLAGS) $(unity_ratings_db_libs) `pkg-config --cflags --libs glib-2.0` -c $(top_srcdir)/src/unity-ratings-db.c
71

Subscribers

People subscribed via source and target branches