[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. upstream/7.4.120.14002+dfsg-42-gb3ca466

[Jo Shields]

The following commit has been merged in the master branch:
commit d53dc6b22b80a00f95dba90c27d2d694ea93b3d2
Author: Jo Shields <directhex at apebox.org>
Date:   Thu Jan 28 19:04:43 2010 +0000

    Policy 0.7 install location

diff --git a/debian/changelog b/debian/changelog
index 2961ce8..624175f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,11 @@ db4o (7.4.121.14026+dfsg-1) UNRELEASED; urgency=low
     - rewritten using overriden targets and dh7
   * debian/patches/* converted to quilt
 
+  [ Jo Shields ]
+  * debian/libdb4o7.4-cil.install*,
+    debian/db4o.pc:
+    + CLI Policy 0.7 install location
+
   [ Iain Lane ]
   * debian/patches/01-dos2unix.patch: Regenerate; didn't apply before
   * debian/rules:
diff --git a/debian/db4o.pc b/debian/db4o.pc
index 02a7002..8d9a531 100644
--- a/debian/db4o.pc
+++ b/debian/db4o.pc
@@ -1,6 +1,6 @@
 prefix=/usr
 libdir=${prefix}/lib
-pkglibdir=${libdir}/cli/db4o-#PACKAGE_ABI_VERSION#
+pkglibdir=${libdir}/cli/Db4objects.Db4o-#PACKAGE_ABI_VERSION#
 
 Name: db4o
 Description: db4o - native OODBMS for CLI
diff --git a/debian/libdb4o7.4-cil-dev.install b/debian/libdb4o-cil-dev.install
similarity index 100%
rename from debian/libdb4o7.4-cil-dev.install
rename to debian/libdb4o-cil-dev.install
diff --git a/debian/libdb4o7.4-cil-dev.links b/debian/libdb4o7.4-cil-dev.links
deleted file mode 100644
index 4e7c781..0000000
--- a/debian/libdb4o7.4-cil-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/pkgconfig/db4o-7.4.pc /usr/lib/pkgconfig/db4o.pc
diff --git a/debian/libdb4o7.4-cil.install b/debian/libdb4o7.4-cil.install
index 64993b0..67e02d6 100644
--- a/debian/libdb4o7.4-cil.install
+++ b/debian/libdb4o7.4-cil.install
@@ -1,3 +1,8 @@
-usr/lib/db4o/*.dll /usr/lib/cli/db4o-7.4/
 usr/lib/db4o/*.exe	/usr/lib/db4o/
 usr/bin/
+usr/lib/db4o/Db4objects.Db4o.dll			/usr/lib/cli/Db4objects.Db4o-7.4/
+usr/lib/db4o/Mono.Cecil.dll				/usr/lib/cli/Db4objects.Db4o-7.4/
+usr/lib/db4o/Db4objects.Db4o.Linq.dll			/usr/lib/cli/Db4objects.Db4o.Linq-7.4/
+usr/lib/db4o/Db4objects.Db4o.Instrumentation.dll	/usr/lib/cli/Db4objects.Db4o.Instrumentation-7.4/
+usr/lib/db4o/Db4objects.Db4o.NativeQueries.dll		/usr/lib/cli/Db4objects.Db4o.NativeQueries-7.4/
+
diff --git a/debian/libdb4o7.4-cil.installcligac b/debian/libdb4o7.4-cil.installcligac
index b500c98..112e631 100644
--- a/debian/libdb4o7.4-cil.installcligac
+++ b/debian/libdb4o7.4-cil.installcligac
@@ -1,3 +1,4 @@
-/usr/lib/cli/db4o-7.4/Db4objects.Db4o.dll
-/usr/lib/cli/db4o-7.4/Db4objects.Db4o.Instrumentation.dll
-/usr/lib/cli/db4o-7.4/Db4objects.Db4o.NativeQueries.dll
+/usr/lib/cli/Db4objects.Db4o-7.4/Db4objects.Db4o.dll
+/usr/lib/cli/Db4objects.Db4o.Linq-7.4/Db4objects.Db4o.Linq.dll
+/usr/lib/cli/Db4objects.Db4o.Instrumentation-7.4/Db4objects.Db4o.Instrumentation.dll
+/usr/lib/cli/Db4objects.Db4o.NativeQueries-7.4/Db4objects.Db4o.NativeQueries.dll
diff --git a/debian/rules b/debian/rules
index e867d8f..21e7170 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,8 +63,6 @@ override_dh_auto_install:
 	# pkg-config
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
 	cp debian/db4o.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig/
-	mv $(CURDIR)/debian/tmp/usr/lib/pkgconfig/db4o.pc \
-	   $(CURDIR)/debian/tmp/usr/lib/pkgconfig/db4o-$(DEB_CLI_ABI_VERSION).pc
 
 	perl -pe 's/#PACKAGE_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/' -i \
 	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/db4o-$(DEB_CLI_ABI_VERSION).pc

-- 
db4o