[Pkg-cli-apps-commits] [SCM] monodevelop-vala branch, master, updated. debian/2.8.6.3-1-3-g2e1f680

[Julian Taylor]

The following commit has been merged in the master branch:
commit 05d8eb37b16de9ff215297b1c3506e2cc8f3a3e5
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Sat Apr 21 22:13:54 2012 +0200

    use vala 0.14. Closes #663326
    
    add dh-autoreconf dependency needed to change configure.in

diff --git a/debian/MonoDevelop.ValaBinding.dll.config b/debian/MonoDevelop.ValaBinding.dll.config
index 0059e56..8975cc5 100644
--- a/debian/MonoDevelop.ValaBinding.dll.config
+++ b/debian/MonoDevelop.ValaBinding.dll.config
@@ -1,5 +1,5 @@
 <configuration>
-	<dllmap dll="vala" target="libvala-0.12.so.0" />
+	<dllmap dll="vala" target="libvala-0.14.so.0" />
 	<dllmap dll="afrodite" target="libafrodite-0.12.so.2" />
 </configuration>
 
diff --git a/debian/control b/debian/control
index 58599d8..887a33f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: cli-mono
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>, Jo Shields <directhex at apebox.org>
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf
 Build-Depends-Indep: cli-common-dev (>= 0.8~),
                      libafrodite-0.12-dev,
                      libgconf2.0-cil-dev,
@@ -12,7 +12,7 @@ Build-Depends-Indep: cli-common-dev (>= 0.8~),
                      libgtk2.0-cil-dev,
                      libmono-addins-cil-dev,
                      libmono-addins-gui-cil-dev,
-                     libvala-0.12-dev,
+                     libvala-0.14-dev,
                      mono-devel (>= 2.10),
                      monodevelop (>= 2.8.6.3),
                      monodevelop-nunit (>= 2.8.6.3),
@@ -27,7 +27,7 @@ Architecture: all
 Enhances: mono-debugger
 Depends: monodevelop (<< ${source:Upstream-Version}.),
          monodevelop (>= ${source:Upstream-Version}),
-         valac-0.12,
+         valac-0.14,
          ${cli:Depends},
          ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9c34077
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-vala-0.14.patch
diff --git a/debian/patches/use-vala-0.14.patch b/debian/patches/use-vala-0.14.patch
new file mode 100644
index 0000000..3cc51fa
--- /dev/null
+++ b/debian/patches/use-vala-0.14.patch
@@ -0,0 +1,23 @@
+Description: vala 0.12 is going to be removed from wheezy
+ change to vala 0.14
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663326
+--- a/configure.in
++++ b/configure.in
+@@ -53,7 +53,7 @@
+ MONOADDINS_REQUIRED_VERSION=0.3
+ GTKSHARP_REQUIRED_VERSION=2.12.8
+ MONODEVELOP_REQUIRED_VERSION=2.8.6.3
+-LIBVALA_REQUIRED_VERSION=0.12.0
++LIBVALA_REQUIRED_VERSION=0.14.0
+ 
+ PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)
+ AC_SUBST(MONO_ADDINS_LIBS)
+@@ -82,7 +82,7 @@
+ PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gconf_sharp=yes], [gconf_sharp=no])
+ AC_SUBST(GCONF_SHARP_LIBS)
+ AM_CONDITIONAL(HAVE_GCONF_SHARP, test x$gconf_sharp = xyes)
+-PKG_CHECK_MODULES(LIBVALA, libvala-0.12 >= $LIBVALA_REQUIRED_VERSION)
++PKG_CHECK_MODULES(LIBVALA, libvala-0.14 >= $LIBVALA_REQUIRED_VERSION)
+ AC_SUBST(LIBVALA_LIBS)
+ 
+ AC_SEARCH_LIBS(afrodite_utils_get_package_paths, afrodite-0.12, [], [
diff --git a/debian/rules b/debian/rules
index 5e9e18c..bf29e32 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,4 +23,4 @@ get-orig-source:
 		--rename 
 
 %:
-	dh $@ --with cli
+	dh $@ --with cli,autoreconf

-- 
monodevelop-vala