[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. debian/7.4.121.14026+dfsg-3-22-g8e3de09

[Jo Shields]

The following commit has been merged in the master branch:
commit aa0a90da2b4a514ede3085acd477212b9c87ffee
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Aug 14 19:41:19 2011 +0100

    Don't try to put files outside $(CURDIR) in debian/install. Instead, copy
    them to a local folder and use that.

diff --git a/debian/db4otool.install b/debian/db4otool.install
index f21040a..af9c839 100644
--- a/debian/db4otool.install
+++ b/debian/db4otool.install
@@ -1,3 +1,4 @@
 debian/db4otool						/usr/bin/
 src/Db4oTool/Db4oTool/bin/Release/Db4oTool.exe*		/usr/lib/db4o/
-/usr/lib/cecil-flowanalysis/*				/usr/lib/db4o/
+tmp/Cecil.FlowAnalysis.dll*				/usr/lib/db4o/
+tmp/Mono.Cecil.dll*					/usr/lib/db4o/
diff --git a/debian/libdb4o8.0-cil.install b/debian/libdb4o8.0-cil.install
index 262a81b..d9fc7a2 100644
--- a/debian/libdb4o8.0-cil.install
+++ b/debian/libdb4o8.0-cil.install
@@ -1,11 +1,11 @@
 src/Db4objects.Db4o/bin/Release/Db4objects.Db4o.dll*					/usr/lib/cli/Db4objects.Db4o-8.0/
 src/Db4objects.Db4o.Linq/bin/Release/Db4objects.Db4o.Linq.dll*				/usr/lib/cli/Db4objects.Db4o.Linq-8.0/
-/usr/lib/mono.reflection/Mono.Reflection.dll*						/usr/lib/cli/Db4objects.Db4o.Linq-8.0/
+tmp/Mono.Reflection.dll*								/usr/lib/cli/Db4objects.Db4o.Linq-8.0/
 src/Db4objects.Db4o.Instrumentation/bin/Release/Db4objects.Db4o.Instrumentation.dll*	/usr/lib/cli/Db4objects.Db4o.Instrumentation-8.0/
-/usr/lib/cecil-flowanalysis/Cecil.FlowAnalysis.dll*					/usr/lib/cli/Db4objects.Db4o.Instrumentation-8.0/
-/usr/lib/cecil-flowanalysis/Mono.Cecil.dll*						/usr/lib/cli/Db4objects.Db4o.Instrumentation-8.0/
+tmp/Cecil.FlowAnalysis.dll*								/usr/lib/cli/Db4objects.Db4o.Instrumentation-8.0/
+tmp/Mono.Cecil.dll*									/usr/lib/cli/Db4objects.Db4o.Instrumentation-8.0/
 src/Db4objects.Db4o.CS/bin/Release/Db4objects.Db4o.CS.dll*				/usr/lib/cli/Db4objects.Db4o.CS-8.0/
 src/Db4objects.Db4o.NativeQueries/bin/Release/Db4objects.Db4o.NativeQueries.dll*	/usr/lib/cli/Db4objects.Db4o.NativeQueries-8.0/
-/usr/lib/cecil-flowanalysis/Cecil.FlowAnalysis.dll*					/usr/lib/cli/Db4objects.Db4o.NativeQueries-8.0/
-/usr/lib/cecil-flowanalysis/Mono.Cecil.dll*						/usr/lib/cli/Db4objects.Db4o.NativeQueries-8.0/
+tmp/Cecil.FlowAnalysis.dll*								/usr/lib/cli/Db4objects.Db4o.NativeQueries-8.0/
+tmp/Mono.Cecil.dll*									/usr/lib/cli/Db4objects.Db4o.NativeQueries-8.0/
 src/Db4objects.Db4o.Optional/bin/Release/Db4objects.Db4o.Optional.dll*			/usr/lib/cli/Db4objects.Db4o.Optional-8.0/
diff --git a/debian/rules b/debian/rules
index f9741cf..950bdb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,9 @@ override_dh_auto_clean:
 	find src -type d -name obj -exec rm -rf {} \;
 
 override_dh_auto_install:
+	cp $(pkg-config --variable=Libraries mono-cecil) tmp/
+	cp $(pkg-config --variable=Libraries cecil-flowanalysis) tmp/
+	cp $(pkg-config --variable=Libraries mono.reflection) tmp/
 	perl -pe 's/#PACKAGE_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/g' \
 	  $(CURDIR)/debian/db4o.pc.in > debian/db4o.pc
 	dh_auto_install

-- 
db4o