r36070 - in /desktop/experimental/librsvg/debian: changelog control control.in librsvg2-dev.install rules

[smcv at users.alioth.debian.org]

Author: smcv
Date: Mon Oct 22 19:17:09 2012
New Revision: 36070

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36070
Log:
* Enable Vala bindings (based on Ubuntu changes, thanks to Robert Ancell)
  - Build-Conflicts: valac-0.16 because if both are installed, the
    default version 0.16 is selected, breaking our build

Modified:
    desktop/experimental/librsvg/debian/changelog
    desktop/experimental/librsvg/debian/control
    desktop/experimental/librsvg/debian/control.in
    desktop/experimental/librsvg/debian/librsvg2-dev.install
    desktop/experimental/librsvg/debian/rules

Modified: desktop/experimental/librsvg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/librsvg/debian/changelog?rev=36070&op=diff
==============================================================================
--- desktop/experimental/librsvg/debian/changelog [utf-8] (original)
+++ desktop/experimental/librsvg/debian/changelog [utf-8] Mon Oct 22 19:17:09 2012
@@ -4,6 +4,9 @@
   * New upstream version (LP: #1038843)
   * Use dh-autoreconf with --as-needed instead of patching ltmain.sh
     (from Ubuntu, thanks Iain Lane)
+  * Enable Vala bindings (based on Ubuntu changes, thanks to Robert Ancell)
+    - Build-Conflicts: valac-0.16 because if both are installed, the
+      default version 0.16 is selected, breaking our build
 
  -- Simon McVittie <smcv at debian.org>  Mon, 22 Oct 2012 19:30:23 +0100
 

Modified: desktop/experimental/librsvg/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/librsvg/debian/control?rev=36070&op=diff
==============================================================================
--- desktop/experimental/librsvg/debian/control [utf-8] (original)
+++ desktop/experimental/librsvg/debian/control [utf-8] Mon Oct 22 19:17:09 2012
@@ -28,7 +28,8 @@
                gir1.2-freedesktop,
                libglib2.0-doc,
                libgtk2.0-doc,
-               libcairo2-doc
+               libcairo2-doc,
+               valac (>= 0.17.5) | valac-0.18 (>= 0.17.5)
 Standards-Version: 3.9.3
 Homepage: http://librsvg.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/librsvg

Modified: desktop/experimental/librsvg/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/librsvg/debian/control.in?rev=36070&op=diff
==============================================================================
--- desktop/experimental/librsvg/debian/control.in [utf-8] (original)
+++ desktop/experimental/librsvg/debian/control.in [utf-8] Mon Oct 22 19:17:09 2012
@@ -23,7 +23,9 @@
                gir1.2-freedesktop,
                libglib2.0-doc,
                libgtk2.0-doc,
-               libcairo2-doc
+               libcairo2-doc,
+               valac-0.18 (>= 0.17.5)
+Build-Conflicts: valac-0.16
 Standards-Version: 3.9.3
 Homepage: http://librsvg.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/librsvg

Modified: desktop/experimental/librsvg/debian/librsvg2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/librsvg/debian/librsvg2-dev.install?rev=36070&op=diff
==============================================================================
--- desktop/experimental/librsvg/debian/librsvg2-dev.install [utf-8] (original)
+++ desktop/experimental/librsvg/debian/librsvg2-dev.install [utf-8] Mon Oct 22 19:17:09 2012
@@ -3,3 +3,4 @@
 usr/lib/*/lib*.so
 usr/lib/*/pkgconfig
 usr/share/gir-*/
+usr/share/vala/

Modified: desktop/experimental/librsvg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/librsvg/debian/rules?rev=36070&op=diff
==============================================================================
--- desktop/experimental/librsvg/debian/rules [utf-8] (original)
+++ desktop/experimental/librsvg/debian/rules [utf-8] Mon Oct 22 19:17:09 2012
@@ -20,8 +20,10 @@
 	--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	--enable-pixbuf-loader \
 	--enable-introspection \
+	--enable-vala \
 	--enable-gtk-doc \
-	--disable-gtk-theme
+	--disable-gtk-theme \
+	$(NULL)
 
 DEB_DH_MAKESHLIBS_ARGS_$(LIBRSVG2_PKG) += -V -- -c4
 DEB_DH_MAKESHLIBS_ARGS_librsvg2-common = --no-act