diff -Nru libchamplain-0.12.2/debian/changelog libchamplain-0.12.2/debian/changelog
--- libchamplain-0.12.2/debian/changelog	2012-03-15 01:13:16.000000000 +0000
+++ libchamplain-0.12.2/debian/changelog	2012-03-29 18:25:21.000000000 +0000
@@ -1,13 +1,12 @@
-libchamplain (0.12.2-0ubuntu1) precise; urgency=low
+libchamplain (0.12.2-1) unstable; urgency=low
 
-  * New upstream release.
-  * debian/rules:
-    - Drop --enable-vala option which would cause the build to fail
-      with recent vala & cogl (GNOME: #671807)
-  * debian/patches/99_ltmain_as-needed.patch:
-    -Dropped, doesn't seem to be needed
+  * New upstream release
+  * debian/control:
+    - Bump Standards-Version to 3.9.3 (no further changes)
+    - Bump valac build-dependency to 0.16 (Closes: #664996)
+  * debian/patches/99_ltmain_as-needed.patch: Refreshed
 
- -- Jeremy Bicha <jbicha@ubuntu.com>  Wed, 14 Mar 2012 21:12:49 -0400
+ -- Laurent Bigonville <bigon@debian.org>  Thu, 29 Mar 2012 20:25:19 +0200
 
 libchamplain (0.12.1-1) unstable; urgency=low
 
diff -Nru libchamplain-0.12.2/debian/control libchamplain-0.12.2/debian/control
--- libchamplain-0.12.2/debian/control	2012-03-15 01:13:18.000000000 +0000
+++ libchamplain-0.12.2/debian/control	2012-03-29 18:27:43.000000000 +0000
@@ -6,8 +6,7 @@
 Source: libchamplain
 Section: libs
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Sjoerd Simons <sjoerd@debian.org>
+Maintainer: Sjoerd Simons <sjoerd@debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Laurent Bigonville <bigon@debian.org>
 Build-Depends: debhelper (>= 8.1.3~),
                cdbs (>= 0.4.93~),
@@ -25,8 +24,8 @@
                libgirepository1.0-dev (>= 0.9.12),
                gir1.2-gtk-3.0,
                gir1.2-clutter-1.0,
-               valac-0.14
-Standards-Version: 3.9.2
+               valac-0.16
+Standards-Version: 3.9.3
 Homepage: http://projects.gnome.org/libchamplain/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libchamplain
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/libchamplain/
diff -Nru libchamplain-0.12.2/debian/control.in libchamplain-0.12.2/debian/control.in
--- libchamplain-0.12.2/debian/control.in	2012-03-15 01:13:16.000000000 +0000
+++ libchamplain-0.12.2/debian/control.in	2012-03-29 18:02:07.000000000 +0000
@@ -1,8 +1,7 @@
 Source: libchamplain
 Section: libs
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Sjoerd Simons <sjoerd@debian.org>
+Maintainer: Sjoerd Simons <sjoerd@debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 8.1.3~),
                cdbs (>= 0.4.93~),
@@ -20,8 +19,8 @@
                libgirepository1.0-dev (>= 0.9.12),
                gir1.2-gtk-3.0,
                gir1.2-clutter-1.0,
-               valac-0.14
-Standards-Version: 3.9.2
+               valac-0.16
+Standards-Version: 3.9.3
 Homepage: http://projects.gnome.org/libchamplain/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libchamplain
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/libchamplain/
diff -Nru libchamplain-0.12.2/debian/patches/99_ltmain_as-needed.patch libchamplain-0.12.2/debian/patches/99_ltmain_as-needed.patch
--- libchamplain-0.12.2/debian/patches/99_ltmain_as-needed.patch	1970-01-01 00:00:00.000000000 +0000
+++ libchamplain-0.12.2/debian/patches/99_ltmain_as-needed.patch	2012-03-29 18:14:36.000000000 +0000
@@ -0,0 +1,33 @@
+Bug-Debian: http://bugs.debian.org/347650
+Last-Update: 2011-06-14
+
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5800,6 +5800,11 @@ func_mode_link ()
+ 	arg=$func_stripname_result
+ 	;;
+ 
++      -Wl,--as-needed|-Wl,--no-as-needed)
++	deplibs="$deplibs $arg"
++	continue
++	;;
++
+       -Wl,*)
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -6163,6 +6168,15 @@ func_mode_link ()
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-Wl,--as-needed|-Wl,--no-as-needed)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    deplibs="$deplib $deplibs"
++	  fi
++	  continue
++	  ;;
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
diff -Nru libchamplain-0.12.2/debian/patches/series libchamplain-0.12.2/debian/patches/series
--- libchamplain-0.12.2/debian/patches/series	2012-03-15 01:13:16.000000000 +0000
+++ libchamplain-0.12.2/debian/patches/series	2012-03-29 18:14:41.000000000 +0000
@@ -0,0 +1 @@
+99_ltmain_as-needed.patch
diff -Nru libchamplain-0.12.2/debian/rules libchamplain-0.12.2/debian/rules
--- libchamplain-0.12.2/debian/rules	2012-03-15 01:13:16.000000000 +0000
+++ libchamplain-0.12.2/debian/rules	2011-09-06 18:08:06.000000000 +0000
@@ -12,6 +12,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS := --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
                              --enable-gtk-doc \
+                             --enable-vala \
                              --enable-introspection
 
 common-binary-predeb-arch:: list-missing