Merge lp:~gordallott/nux/nux-5.0 into lp:nux/2.0

[Gord Allott]

Updates nux to nux 2.0 - including pc file and libs

[Jay Taoko (jaytaoko)]

review: Approve

[Tim Penhey (thumper)]

Looks fine to me.

review: Approve

[Didier Roche-Tolomelli (didrocks)]

Time to fire the job, the packaging changes have been done.

review: Approve

[Unity Merger (unity-merger)]

Attempt to merge into lp:nux failed due to conflicts:

text conflict in configure.ac

[lp:~gordallott/nux/nux-5.0]

514. By Gord Allott on 2011-12-06

resolved conflicts, updated to latest trunk

=== modified file 'configure.ac'
--- configure.ac	2011-12-05 16:14:44 +0000
+++ configure.ac	2011-12-06 11:32:24 +0000
@@ -13,14 +13,11 @@
 #   - Increase micro_version to the next odd number
 #   - Increase interface_version to the next odd number
 # 
-m4_define([nux_major_version], [1])
-m4_define([nux_minor_version], [16])
+m4_define([nux_major_version], [2])
+m4_define([nux_minor_version], [0])
 m4_define([nux_micro_version], [0])
 
-# Bump this when we break API
-m4_define([nux_api_version], [1.0])
-
-# Bump this when we break ABI
+m4_define([nux_api_version], [2.0])
 # Increase the number (to the current date) everytime you propose a branch that breaks the API or ABI
 # The number format is : year/month/day
 # e.g.: december 5th, 2011 is: 20111205