Merge lp:~jbicha/unity-lens-music/build-with-valac into lp:unity-lens-music

[Jeremy Bícha]

Build with default valac

This has unity-lens-music build against the default valac (for Ubuntu 13.10 this is currently valac 0.18 but we may switch to 0.20 as Debian testing already has). I have successfully test-built against valac-0.20.

[Michael Terry (mterry)]

Either continue to require a hard version of valac in both debian/control and debian/rules or neither place.

That is, update both to valac-0.20 or change debian/control to be valac (>= 0.18) and drop the bits in debian/rules.

I think I prefer the latter these days. I wrote these bits originally because I still remembered early valac days, where each new version basically guaranteed source incompatibility. But nowadays these can be handled like normal compiler issues (i.e. bugs that are dealt with as they come up, rather than expected issues).

review: Needs Fixing

[lp:~jbicha/unity-lens-music/build-with-valac]

142. By Jeremy Bícha on 2013-06-12

Build with default valac (for real)

[Jeremy Bícha (jbicha)]

Yeah, that's what I meant to do but I pushed my test commit (to make sure it still built against vala-0.20) instead of the real thing.

[Michael Terry (mterry)]

(>= 0.18.0) is missing, but it's not a big deal.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-05-29 15:04:08 +0000
+++ debian/control	2013-06-12 19:53:24 +0000
@@ -7,7 +7,7 @@
                gnome-common,
                pkg-config,
                dh-translations,
-               valac-0.18,
+               valac,
                libglib2.0-dev (>= 2.32),
                libgee-dev,
                libjson-glib-dev,

=== modified file 'debian/rules'
--- debian/rules	2012-12-12 16:11:55 +0000
+++ debian/rules	2013-06-12 19:53:24 +0000
@@ -10,11 +10,6 @@
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
-override_dh_auto_configure:
-	# Manually specify compiler in case user has multiple valac's lying around,
-	# in which case 0.18 may not be the default.
-	dh_auto_configure -- VALAC=/usr/bin/valac-0.18
-
 override_dh_auto_build:
 	# TOREMOVE
 	touch tests/test_rhythmbox_parser_vala.stamp