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

[Iain Lane]

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

    Rename wrapper script to new version of tool

diff --git a/debian/changelog b/debian/changelog
index 759777e..f6f9584 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,8 +79,9 @@ db4o (7.4.121.14026+dfsg-1) UNRELEASED; urgency=low
     for new ABI 
   * debian/db4o.pc: Fix up to include the ABI version 
   * debian/control: Add new -cil-dev package contianing pcfiles 
+  * debian/db4o{admin,tool}: Rename wrapper script to new version of tool 
 
- -- Iain Lane <laney at ubuntu.com>  Thu, 28 Jan 2010 16:07:00 +0000
+ -- Iain Lane <laney at ubuntu.com>  Thu, 28 Jan 2010 16:09:08 +0000
 
 db4o (6.1.604+dfsg-3) unstable; urgency=low
 
diff --git a/debian/db4oadmin b/debian/db4oadmin
deleted file mode 100644
index b21eab9..0000000
--- a/debian/db4oadmin
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/cli /usr/lib/db4o/Db4oAdmin.exe "$@"
diff --git a/debian/db4otool b/debian/db4otool
new file mode 100644
index 0000000..46cc712
--- /dev/null
+++ b/debian/db4otool
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/cli /usr/lib/db4o/Db4oTool.exe "$@"
diff --git a/debian/rules b/debian/rules
index 49f6ed1..e867d8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,10 +34,10 @@ override_dh_auto_install:
 	cp $(CURDIR)/src/bin/*.dll $(CURDIR)/debian/tmp/usr/lib/db4o/
 	cp $(CURDIR)/src/bin/*.exe $(CURDIR)/debian/tmp/usr/lib/db4o/
 	
-	# db4oadmin shell wrapper
+	# db4otool shell wrapper
 	mkdir -p $(CURDIR)/debian/tmp/usr/bin
-	cp $(CURDIR)/debian/db4oadmin $(CURDIR)/debian/tmp/usr/bin/
-	chmod +x $(CURDIR)/debian/tmp/usr/bin/db4oadmin
+	cp $(CURDIR)/debian/db4otool $(CURDIR)/debian/tmp/usr/bin/
+	chmod +x $(CURDIR)/debian/tmp/usr/bin/db4otool
 
 	# db4o docs
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/db4o

-- 
db4o