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

[Ken VanDine]

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)

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)

[PS Jenkins bot (ps-jenkins)]

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)

[Robert Bruce Park (robru)]

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

review: Approve

=== 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 @@
 AC_SUBST(BASE_CFLAGS)
 AC_SUBST(BASE_LIBS)
 
-
-# valadoc only looks in the vapidir for libvala-0.14 but we need
-# libvala-0.16 or libvala-0.18.  This checks for either libvala dev
-# package and sets the package to check for to set the vapidir
-# if documentation is enabled
-PKG_CHECK_MODULES([VALADEV], [libvala-0.18],
-        [LIBVALADEVPKG="libvala-0.18"],
-        [PKG_CHECK_MODULES([VALADEV], [libvala-0.16],
-                [LIBVALADEVPKG="libvala-0.16"])])
-
 ###########################
 # Documentation
 ###########################
@@ -168,7 +158,7 @@
 ])
 
 AS_IF([test "x$enable_docs" = "xyes" -a "x$have_valadoc" = "xyes"], [
-        VALADOCVAPIDIR=`$PKG_CONFIG --variable=vapidir $LIBVALADEVPKG`
+        VALADOCVAPIDIR=`$PKG_CONFIG --variable=vapidir valadoc-1.0`
         AC_SUBST(VALADOCVAPIDIR)
 ])
 

=== 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 @@
+libfriends (0.1.2+14.04.20131108.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/control
+    - build depend on valac instead of valac-0.18 and dropped 
+      libvala-0.18-dev (LP: #1194211)
+
+ -- Ken VanDine <[e-mail]>  Wed, 09 Jul 2014 09:12:54 -0400
+
 libfriends (0.1.2+14.04.20131108.1-0ubuntu1) trusty; urgency=low
 
   [ Colin Watson ]

=== 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 @@
                libgtk-3-dev,
                libgtkspell3-3-dev,
                libjson-glib-dev,
-               libvala-0.18-dev,
                python3-mock,
-               valac-0.18,
+               valac,
                xvfb,
 Standards-Version: 3.9.4
 Section: libs