libfriends

Merge lp:~ken-vandine/libfriends/lp1194211 into lp:libfriends

  1. lp1194211
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 83
Merged at revision: 83
Proposed branch: lp:~ken-vandine/libfriends/lp1194211
Merge into: lp:libfriends
Diff against target: 60 lines (+10/-13)
3 files modified
configure.ac (+1/-11)
debian/changelog (+8/-0)
debian/control (+1/-2)
To merge this branch: bzr merge lp:~ken-vandine/libfriends/lp1194211
Reviewer Review Type Date Requested Status
Robert Bruce Park Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+226155@code.launchpad.net

Commit message

Use valadoc-1.0 to get vapidir when building docs so we can clean up build depends. Build depend on valac instead of valac-0.18 and dropped libvala-0.18-dev (LP: #1194211)

Description of the change

Use valadoc-1.0 to get vapidir when building docs so we can clean up build depends. Build depend on valac instead of valac-0.18 and dropped libvala-0.18-dev (LP: #1194211)

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

PASSED: Continuous integration, rev:83
http://jenkins.qa.ubuntu.com/job/libfriends-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libfriends-utopic-amd64-ci/1

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

review: Approve (continuous-integration)
Revision history for this message
Robert Bruce Park (robru) wrote :

Looks fine to me, let's put this in a silo for testing.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2013-10-24 15:28:15 +0000
+++ configure.ac 2014-07-09 15:20:41 +0000
@@ -135,16 +135,6 @@
135AC_SUBST(BASE_CFLAGS)135AC_SUBST(BASE_CFLAGS)
136AC_SUBST(BASE_LIBS)136AC_SUBST(BASE_LIBS)
137137
138
139# valadoc only looks in the vapidir for libvala-0.14 but we need
140# libvala-0.16 or libvala-0.18. This checks for either libvala dev
141# package and sets the package to check for to set the vapidir
142# if documentation is enabled
143PKG_CHECK_MODULES([VALADEV], [libvala-0.18],
144 [LIBVALADEVPKG="libvala-0.18"],
145 [PKG_CHECK_MODULES([VALADEV], [libvala-0.16],
146 [LIBVALADEVPKG="libvala-0.16"])])
147
148###########################138###########################
149# Documentation139# Documentation
150###########################140###########################
@@ -168,7 +158,7 @@
168])158])
169159
170AS_IF([test "x$enable_docs" = "xyes" -a "x$have_valadoc" = "xyes"], [160AS_IF([test "x$enable_docs" = "xyes" -a "x$have_valadoc" = "xyes"], [
171 VALADOCVAPIDIR=`$PKG_CONFIG --variable=vapidir $LIBVALADEVPKG`161 VALADOCVAPIDIR=`$PKG_CONFIG --variable=vapidir valadoc-1.0`
172 AC_SUBST(VALADOCVAPIDIR)162 AC_SUBST(VALADOCVAPIDIR)
173])163])
174164
175165
=== modified file 'debian/changelog'
--- debian/changelog 2013-11-08 17:13:17 +0000
+++ debian/changelog 2014-07-09 15:20:41 +0000
@@ -1,3 +1,11 @@
1libfriends (0.1.2+14.04.20131108.1-0ubuntu2) UNRELEASED; urgency=medium
2
3 * debian/control
4 - build depend on valac instead of valac-0.18 and dropped
5 libvala-0.18-dev (LP: #1194211)
6
7 -- Ken VanDine <ken.vandine@canonical.com> Wed, 09 Jul 2014 09:12:54 -0400
8
1libfriends (0.1.2+14.04.20131108.1-0ubuntu1) trusty; urgency=low9libfriends (0.1.2+14.04.20131108.1-0ubuntu1) trusty; urgency=low
210
3 [ Colin Watson ]11 [ Colin Watson ]
412
=== modified file 'debian/control'
--- debian/control 2013-11-07 14:47:35 +0000
+++ debian/control 2014-07-09 15:20:41 +0000
@@ -21,9 +21,8 @@
21 libgtk-3-dev,21 libgtk-3-dev,
22 libgtkspell3-3-dev,22 libgtkspell3-3-dev,
23 libjson-glib-dev,23 libjson-glib-dev,
24 libvala-0.18-dev,
25 python3-mock,24 python3-mock,
26 valac-0.18,25 valac,
27 xvfb,26 xvfb,
28Standards-Version: 3.9.427Standards-Version: 3.9.4
29Section: libs28Section: libs

Subscribers

People subscribed via source and target branches

to all changes: