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

Thu Jan 28 16:21:50 UTC 2010

The following commit has been merged in the master branch:
commit 41e09a0d9e562ac935cc68421d1d68a08221d1aa
Author: Iain Lane <laney at ubuntu.com>
Date:   Thu Jan 28 11:10:48 2010 +0000

    Binary package rename & pc fix
    
    debian/control, debian/libdb4o6.0-cil*: Rename package to libdb4o7.4-cil
    for new ABI
    debian/db4o.pc: Fix up to include the ABI version

diff --git a/debian/changelog b/debian/changelog
index 1e9238d..2d9f08b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,5 @@
 db4o (7.4.121.14026+dfsg-1) UNRELEASED; urgency=low
 
-  *** NEEDS NEW UPSTREAM UPDATE STILL! ***
-  Check ABI/API, adjust as necessary
-
   [ David Paleino ]
   * debian/control:
     - Vcs-* fields updated, package moved to Git
@@ -78,8 +75,11 @@ db4o (7.4.121.14026+dfsg-1) UNRELEASED; urgency=low
     now 
   * debian/patches/05-cecil-api: Add new patch to remove call to method that
     isn't in the API of the version of cecil we have 
+  * debian/control, debian/libdb4o6.0-cil*: Rename package to libdb4o7.4-cil
+    for new ABI 
+  * debian/db4o.pc: Fix up to include the ABI version 
 
- -- Iain Lane <laney at ubuntu.com>  Tue, 26 Jan 2010 12:06:17 +0000
+ -- Iain Lane <laney at ubuntu.com>  Thu, 28 Jan 2010 11:09:52 +0000
 
 db4o (6.1.604+dfsg-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index fbbbc25..6624f60 100644
--- a/debian/control
+++ b/debian/control
@@ -9,17 +9,16 @@ Build-Depends-Indep: cli-common-dev (>= 0.5.7),
  libmono-cecil-cil-dev,
  libmono-cecil-flowanalysis-cil-dev,
  pkg-config,
- libchm-bin,
  monodoc-base
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Homepage: http://www.db4o.com/
 Vcs-Browser: http://git.debian.org/?p=pkg-cli-libs/packages/db4o.git
 Vcs-Git: git://git.debian.org/git/pkg-cli-libs/packages/db4o.git
 
-Package: libdb4o6.0-cil
+Package: libdb4o7.4-cil
 Architecture: all
-Replaces: libdb4o6.1-cil (<< 6.1.604)
-Conflicts: libdb4o6.1-cil (<< 6.1.604)
+Replaces: libdb4o6.1-cil (<< 6.1.604), libdb4o6.0-cil (<< 7.4.121.14026)
+Conflicts: libdb4o6.1-cil (<< 6.1.604), libdb4o6.0-cil (<< 7.4.121.14026)
 Suggests: libdb4o-doc, monodoc-db4o-manual
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
 Description: native OODBMS for CLI
@@ -39,7 +38,7 @@ Description: native OODBMS for CLI (documentation)
  to store and retrieve any application object with only one line of code,
  eliminating the need to predefine or maintain a separate, rigid data model.
  .
- This package contains API reference and tutorial on db4o in HTML and CHM form.
+ This package contains API reference and tutorial on db4o in HTML form.
 
 Package: monodoc-db4o-manual
 Section: doc
diff --git a/debian/db4o.pc b/debian/db4o.pc
index 7f8b770..02a7002 100644
--- a/debian/db4o.pc
+++ b/debian/db4o.pc
@@ -4,5 +4,5 @@ pkglibdir=${libdir}/cli/db4o-#PACKAGE_ABI_VERSION#
 
 Name: db4o
 Description: db4o - native OODBMS for CLI
-Version: 6.0.1.0
-Libs: -r:${pkglibdir}/Db4objects.Db4o.dll -r:${pkglibdir}/Db4objects.Db4o.Tools
+Version: #PACKAGE_ABI_VERSION#
+Libs: -r:${pkglibdir}/Db4objects.Db4o.dll
diff --git a/debian/libdb4o6.0-cil.installcligac b/debian/libdb4o6.0-cil.installcligac
deleted file mode 100644
index 0b01fc8..0000000
--- a/debian/libdb4o6.0-cil.installcligac
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/lib/cli/db4o-6.0/Db4objects.Db4o.dll
-/usr/lib/cli/db4o-6.0/Db4objects.Db4o.Instrumentation.dll
-/usr/lib/cli/db4o-6.0/Db4objects.Db4o.NativeQueries.dll
diff --git a/debian/libdb4o6.0-cil.links b/debian/libdb4o6.0-cil.links
deleted file mode 100644
index b83b06f..0000000
--- a/debian/libdb4o6.0-cil.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/pkgconfig/db4o-6.0.pc /usr/lib/pkgconfig/db4o.pc
diff --git a/debian/libdb4o6.0-cil.install b/debian/libdb4o7.4-cil.install
similarity index 59%
rename from debian/libdb4o6.0-cil.install
rename to debian/libdb4o7.4-cil.install
index c26d3e8..c1e84ae 100644
--- a/debian/libdb4o6.0-cil.install
+++ b/debian/libdb4o7.4-cil.install
@@ -1,4 +1,4 @@
-usr/lib/db4o/*.dll /usr/lib/cli/db4o-6.0/
+usr/lib/db4o/*.dll /usr/lib/cli/db4o-7.4/
 usr/lib/db4o/*.exe	/usr/lib/db4o/
 usr/lib/pkgconfig/
 usr/bin/
diff --git a/debian/libdb4o7.4-cil.installcligac b/debian/libdb4o7.4-cil.installcligac
new file mode 100644
index 0000000..b500c98
--- /dev/null
+++ b/debian/libdb4o7.4-cil.installcligac
@@ -0,0 +1,3 @@
+/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
diff --git a/debian/libdb4o7.4-cil.links b/debian/libdb4o7.4-cil.links
new file mode 100644
index 0000000..4e7c781
--- /dev/null
+++ b/debian/libdb4o7.4-cil.links
@@ -0,0 +1 @@
+usr/lib/pkgconfig/db4o-7.4.pc /usr/lib/pkgconfig/db4o.pc
diff --git a/debian/rules b/debian/rules
index b60932a..49f6ed1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,8 @@
 
 #export DH_VERBOSE=1
 
-DEB_CLI_ABI_VERSION = 6.0
-DEB_CLI_API_VERSION = 6.1.604
+DEB_CLI_ABI_VERSION = 7.4
+DEB_CLI_API_VERSION = 7.4.121.14026
 
 include /usr/share/cli-common/cli.make
 include /usr/share/quilt/quilt.make
@@ -12,7 +12,7 @@ override_dh_auto_build:
 	[ -d $(CURDIR)/src/bin ] || mkdir -p $(CURDIR)/src/bin
 	cp $(shell pkg-config --variable=Libraries mono-cecil) $(CURDIR)/src/bin/
 
-	dh_auto_build -D src -- MCS=/usr/bin/mono-csc core instr nq tool
+	dh_auto_build -D src -- MCS=/usr/bin/mono-csc core instr nq tool linq
 	mdoc update \
 	  -i $(CURDIR)/src/bin/Db4objects.Db4o.dll.xml \
 	  -o $(CURDIR)/src/bin/monodocer \

-- 
db4o

