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

[Chow Loong Jin]

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

    Don't copy Banshee.CollectionIndexer
    
     * Don't copy Banshee.CollectionIndexer over; it isn't needed due to the
       booter script containing /usr/lib/banshee-1 in the MONO_PATH
     * Drop all .dll.config files since they're no longer needed

diff --git a/debian/Util.dll.config b/debian/Util.dll.config
deleted file mode 100644
index 917fd6e..0000000
--- a/debian/Util.dll.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<configuration>
-  <dllmap dll="libbeagleglue" target="/usr/lib/beagle/libbeagleglue.so"/>
-  <dllmap dll="libbeagleglue.so" target="/usr/lib/beagle/libbeagleglue.so"/>
-  <dllmap dll="libexif.dll" target="libexif.so.12"/>
-</configuration>
diff --git a/debian/changelog b/debian/changelog
index 37f1222..ff5dc4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,8 +28,6 @@ tangerine (0.3.2.2-1) UNRELEASED; urgency=low
     + Clean up get-orig-source rule
     + Add some custom configure flags
     + Add dh_{,cli}strip overrides to strip into tangerine-dbg
-    + Copy over Banshee.CollectionIndexer.dll into
-      /usr/lib/tangerine/plugins
     + Remove /usr/share/doc/tangerine/sample.conf since it's handled by
       dh_installexamples
   * debian/compat:
@@ -48,8 +46,10 @@ tangerine (0.3.2.2-1) UNRELEASED; urgency=low
       - Dropped, applied upstream
     + 06_no_amarok.patch: Update and add DEP-3 header
     + 99_autoreconf.patch: Dropped, no longer relevant
+  * debian/*.dll.config:
+    + Dropped, no longer needed
 
- -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 16 Aug 2009 17:35:38 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 16 Aug 2009 22:22:26 +0800
 
 tangerine (0.3.0+dfsg-5) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 963e131..92da701 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,12 +35,9 @@ override_dh_clistrip:
 # disable dh_makeshlibs (problems with /usr/lib/tangerine/*.so*)
 override_dh_makeshlibs:
 
-# copy over banshee's collectionindexer dll and delete sample.conf (handled by
-# dh_installexamples
+# delete sample.conf (handled by dh_installexamples)
 override_dh_auto_install:
 	dh_auto_install -- DESTDIR="$(CURDIR)/debian/tangerine"
-	cp /usr/lib/banshee-1/Banshee.CollectionIndexer.dll \
-	   debian/tangerine/usr/lib/tangerine/plugins
 	rm debian/tangerine/usr/share/doc/tangerine/sample.conf
 
 %:
diff --git a/debian/tangerine-session.dll.config b/debian/tangerine-session.dll.config
deleted file mode 100644
index 823da88..0000000
--- a/debian/tangerine-session.dll.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<configuration>
-  <dllmap dll="libsessionglue" target="/usr/lib/tangerine/libsessionglue.so"/>
-</configuration>
diff --git a/debian/tangerine.dll.config b/debian/tangerine.dll.config
deleted file mode 100644
index 35de69b..0000000
--- a/debian/tangerine.dll.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<configuration>
-  <dllmap dll="libtangglue" target="/usr/lib/tangerine/libtangglue.so"/>
-</configuration>

-- 
tangerine