[Pkg-cli-apps-commits] [SCM] tangerine branch, master, updated. upstream/0.3.2.1-26-gaeccb11

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit aeccb11de6c5b2d22d987e3932e8c0b55fab33f1
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Sun Aug 16 16:31:05 2009 +0800

    Beagle support, configure flag, dh_auto_install
    
     * Add beagle-dev to build-dep again
     * Exchange --disable-beagle with --enable-beagle
     * Add --enable-file
     * dh_auto_install into debian/tangerine instead of debian/tmp
     * Copy into debian/tangerine rather than debian/tmp

diff --git a/debian/control b/debian/control
index ffa9c8d..d6ca911 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 7),
                libndesk-dbus-glib1.0-cil,
                libsm-dev,
                banshee (>= 1.4.2),
+               beagle-dev (>= 0.1.4)
 Standards-Version: 3.8.2
 Homepage: http://launchpad.net/tangerine/
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/tangerine.git
diff --git a/debian/rules b/debian/rules
index b9e21e3..794a03b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,8 @@ override_dh_auto_configure:
 		MCS=/usr/bin/mono-csc \
 		--enable-debug \
 		--enable-banshee \
-		--disable-beagle
+		--enable-beagle \
+		--enable-file
 
 override_dh_strip:
 	dh_strip --dbg-package=tangerine-dbg
@@ -36,9 +37,9 @@ override_dh_makeshlibs:
 
 # copy over banshee's collectionindexer dll
 override_dh_auto_install:
-	dh_auto_install
+	dh_auto_install -- DESTDIR="$(CURDIR)/debian/tangerine"
 	cp /usr/lib/banshee-1/Banshee.CollectionIndexer.dll \
-	   debian/tmp/usr/lib/tangerine/plugins
+	   debian/tangerine/usr/lib/tangerine/plugins
 
 %:
 	dh $@

-- 
tangerine