f-spot r3692 - in branches/FSPOT_0_4_2_STABLE: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Mon Feb 18 14:50:50 2008
New Revision: 3692
URL: http://svn.gnome.org/viewvc/f-spot?rev=3692&view=rev

Log:
backporting the fix to 042_stable

Added:
   branches/FSPOT_0_4_2_STABLE/src/Cms.dll.config.in
Removed:
   branches/FSPOT_0_4_2_STABLE/src/Cms.dll.config
Modified:
   branches/FSPOT_0_4_2_STABLE/configure.in
   branches/FSPOT_0_4_2_STABLE/src/Makefile.am

Modified: branches/FSPOT_0_4_2_STABLE/configure.in
==============================================================================
--- branches/FSPOT_0_4_2_STABLE/configure.in	(original)
+++ branches/FSPOT_0_4_2_STABLE/configure.in	Mon Feb 18 14:50:50 2008
@@ -292,6 +292,7 @@
 src/Core/Defines.cs
 src/AssemblyInfo.cs
 src/f-spot.exe.config
+src/Cms.dll.config
 src/Makefile
 glitz-sharp/Makefile
 glitz-sharp/src/Makefile

Added: branches/FSPOT_0_4_2_STABLE/src/Cms.dll.config.in
==============================================================================
--- (empty file)
+++ branches/FSPOT_0_4_2_STABLE/src/Cms.dll.config.in	Mon Feb 18 14:50:50 2008
@@ -0,0 +1,5 @@
+<configuration>
+  <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
+  <dllmap dll="libfspot" target="@expanded_libdir@/f-spot/libfspot.so.0"/>
+</configuration>
+

Modified: branches/FSPOT_0_4_2_STABLE/src/Makefile.am
==============================================================================
--- branches/FSPOT_0_4_2_STABLE/src/Makefile.am	(original)
+++ branches/FSPOT_0_4_2_STABLE/src/Makefile.am	Mon Feb 18 14:50:50 2008
@@ -384,7 +384,7 @@
 	$(F_SPOT_DISTRESOURCES)			\
 	f-spot.exe.config.in			\
 	f-spot.in				\
-	Cms.dll.config
+	Cms.dll.config.in
 
 CLEANFILES =					\
 	f-spot.exe.config			\
@@ -398,7 +398,8 @@
 	FSpot.Query.dll				\
 	FSpot.Query.dll.mdb			\
 	FSpot.Core.dll.mdb			\
-	FSpot.Core.dll
+	FSpot.Core.dll				\
+	Cms.dll.config
 
 
 DISTCLEANFILES = 				\