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

[Iain Lane]

The following commit has been merged in the master branch:
commit 9d2d7df7cd07ec1d1b8af469c0ecc338a9599307
Author: Iain Lane <laney at ubuntu.com>
Date:   Tue May 18 17:19:58 2010 +0100

    Pass correct include dirs to autoreconf
    
    * debian/rules: Pass include directories to autoreconf to have the correct
      macros in scope for the new build system

diff --git a/debian/changelog b/debian/changelog
index 80a4ae6..9aac17f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,8 @@ f-spot (0.6.2-1) UNRELEASED; urgency=low
     unique-sharp bindings which f-spot now uses to handle activation.
   * debian/patches/debian_link-system-mono-addins.patch: Drop, now upstream 
   * debian/patches/*: Refresh to apply to new upstream version 
+  * debian/rules: Pass include directories to autoreconf to have the correct
+    macros in scope for the new build system 
 
  -- Iain Lane <laney at ubuntu.com>  Mon, 17 May 2010 11:59:58 +0100
 
diff --git a/debian/rules b/debian/rules
index 173c4ae..804f1e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,')
 # robbed from tomboy
 autoreconf: autoreconf-stamp
 autoreconf-stamp:
-	autoreconf -f -i -s
+	autoreconf -f -i -s -I $(CURDIR)/build/m4/shamrock -I $(CURDIR)/build/m4/shave
 	# replace ltmain.sh with our patched one that supports --as-needed
 	install --mode=755 $(CURDIR)/debian/ltmain-as-needed.sh $(CURDIR)/ltmain.sh
 	touch $@

-- 
f-spot