Merge lp:~barry/ubuntu/natty/ethos/618809-ftbfs into lp:ubuntu/natty/ethos

[Barry Warsaw]

This fixes the FTBFS by completing the libvala-dev to libvala-0.10-dev transition. Note however that the rules file as currently defined only builds the Python bindings for the default version of Python, meaning 2.7 only for Natty.

Because the original bug report is really related to the libvala transition and is already overloaded, a new bug should be reported on ethos for Python 2.6 support (should we decide to keep Python 2.6 for Natty).

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-01-05 22:06:20 +0000
@@ -0,0 +1,1 @@
+.pc

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-08 15:02:37 +0000
+++ debian/changelog	2011-01-05 22:06:20 +0000
@@ -1,3 +1,9 @@
+ethos (0.2.2-1.1ubuntu1) natty; urgency=low
+
+  * Transition from libvala-dev to libvala-0.10-dev. (LP: #618809)
+
+ -- Barry Warsaw <[e-mail]>  Tue, 04 Jan 2011 14:00:20 -0500
+
 ethos (0.2.2-1.1build1) natty; urgency=low
 
   * Rebuild with python 2.7 as the python default.

=== modified file 'debian/control'
--- debian/control	2010-04-07 15:07:09 +0000
+++ debian/control	2011-01-05 22:06:20 +0000
@@ -1,16 +1,17 @@
 Source: ethos
 Section: libs
 Priority: optional
-Maintainer: Mathieu Trudel <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Mathieu Trudel <[e-mail]>
 Build-Depends: debhelper (>= 7),
                cdbs (>= 0.4.49),
                quilt,
-               valac,
+               valac-0.10,
                gnome-pkg-tools (>= 0.11),
                pkg-config (>= 0.14),
                libglib2.0-dev (>= 2.16.0),
                libgtk2.0-dev (>= 2.10.0),
-               libvala-dev,
+               libvala-0.10-dev,
                gtk-doc-tools (>= 1.9),
                python-dev (>= 2.2),
                python-gtk2-dev,

=== added file 'debian/patches/02-pkg-config-for-vala-0.10.patch'
--- debian/patches/02-pkg-config-for-vala-0.10.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02-pkg-config-for-vala-0.10.patch	2011-01-05 22:06:20 +0000
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,9 +81,9 @@
+ 
+ dnl = Enable Vala ==========================================================
+ enable_vala=no
+-PKG_CHECK_MODULES(VALA, vala-1.0, enable_vala=yes, enable_vala=no)
++PKG_CHECK_MODULES(VALA, vala-0.10, enable_vala=yes, enable_vala=no)
+ if test "x$enable_vala" = "xyes"; then
+-	VAPI_DIR=`pkg-config --variable=vapidir vala-1.0`
++	VAPI_DIR=`pkg-config --variable=vapidir vala-0.10`
+ else
+ 	VAPI_DIR=
+ fi

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-11-16 11:15:57 +0000
+++ debian/patches/series	2011-01-05 22:06:20 +0000
@@ -1,1 +1,2 @@
 01-ethos-manager-typo.patch
+02-pkg-config-for-vala-0.10.patch