[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. upstream/6.1.604+dfsg-14-g6ecd0c5

[Iain Lane]

The following commit has been merged in the master branch:
commit 6ecd0c5c618048e1c7c92558ff9b8a55757798ab
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon Nov 9 14:04:28 2009 +0000

    Use compat 7 to make dh_install sexy

debian/compat: Use compat level 7 so that dh_install looks in debian/tmp without having to be explicitly told so

diff --git a/debian/changelog b/debian/changelog
index 5eda855..fd49dae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,10 @@ db4o (6.1.604+dfsg-4) UNRELEASED; urgency=low
     + Use mono-csc as compiler, per latest CLI policy
   * debian/control: Bump mono-devel build-dep to >= 2.4.2.3 to have mono-csc
     available
+  * debian/compat: Use compat level 7 so that dh_install looks in debian/tmp
+    without having to be explicitly told so 
 
- -- Iain Lane <laney at ubuntu.com>  Mon, 09 Nov 2009 00:08:05 +0000
+ -- Iain Lane <laney at ubuntu.com>  Mon, 09 Nov 2009 14:02:08 +0000
 
 db4o (6.1.604+dfsg-3) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/rules b/debian/rules
index 433e0b0..02f83a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,10 +66,6 @@ override_dh_auto_install:
 	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/db4o-$(DEB_CLI_ABI_VERSION).pc
 	dh_auto_install
 
-# Should this really be necessary? :(
-override_dh_install:
-	dh_install --sourcedir=$(CURDIR)/debian/tmp
-
 override_dh_compress:
 	dh_compress -i -Xapi/ -Xtutorial/ -Xreference/
 

-- 
db4o