[Pkg-cli-apps-commits] [SCM] f-spot branch, master, updated. debian/0.6.1.5-3-14-g486a410

[Iain Lane]

The following commit has been merged in the master branch:
commit 05b45922aea119a47ba4bc206ce28058ae22dfe2
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed May 19 16:22:06 2010 +0100

    Don't try to install the gconf schemas when building

diff --git a/debian/changelog b/debian/changelog
index d49da04..47c37e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,7 @@ f-spot (0.6.2-1) UNRELEASED; urgency=low
     600ms. 
   * debian/rules: Incorporate Ubuntu specific changes, and guard by a call to
     dpkg-vendor.
+  * debian/rules: Don't try to install the gconf schemas when building 
 
  -- Iain Lane <laney at ubuntu.com>  Mon, 17 May 2010 11:59:58 +0100
 
diff --git a/debian/rules b/debian/rules
index 54e3deb..3ae9a20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,9 @@ override_dh_auto_configure: autoreconf-stamp
 		LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--as-needed" \
 		MCS=/usr/bin/mono-csc
 
+override_dh_auto_install:
+	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 dh_auto_install
+
 override_dh_install:
 	rm -f $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.a \
 	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.la \

-- 
f-spot