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

[Iain Lane]

The following commit has been merged in the master branch:
commit af840d1ba7a3ef4be07fbd61f8ef52757065df87
Author: Iain Lane <laney at ubuntu.com>
Date:   Tue Jan 26 11:02:53 2010 +0000

    Copy cecil into correct location & build correct targets & ignore chm

diff --git a/debian/changelog b/debian/changelog
index bfdc702..279c95c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,8 +67,10 @@ db4o (7.4.121.14026+dfsg-1) UNRELEASED; urgency=low
     - doc/api/db4o.chm
   * debian/control: Update deps to point at -cil-dev packages 
   * debian/patches/*: Refresh to apply cleanly
+  * debian/rules: Can no longer extract information from CHM documentation as
+    it has been dfsged out.
 
- -- Iain Lane <laney at ubuntu.com>  Sun, 13 Dec 2009 12:41:17 +0000
+ -- Iain Lane <laney at ubuntu.com>  Tue, 26 Jan 2010 11:09:48 +0000
 
 db4o (6.1.604+dfsg-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index b3c597d..fff12b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,10 @@ include /usr/share/cli-common/cli.make
 include /usr/share/quilt/quilt.make
 
 override_dh_auto_build:
-	cp $(shell pkg-config --variable=Libraries mono-cecil) $(CURDIR)/bin/
+	[ -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 admin
+	dh_auto_build -D src -- MCS=/usr/bin/mono-csc core instr nq tool
 	mdoc update \
 	  -i $(CURDIR)/src/bin/Db4objects.Db4o.dll.xml \
 	  -o $(CURDIR)/src/bin/monodocer \
@@ -52,10 +53,11 @@ override_dh_auto_install:
 	# </$(MAKE) install>
 
 	# convert db4o.chm to HTML
-	extract_chmLib $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/db4o.chm $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/html/
-	ln -s html/R_Project.htm $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/html/index.html
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/chm
-	mv $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/db4o.chm \
+        # no don't, we can't build this any more
+	#extract_chmLib $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/db4o.chm $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/html/
+	#ln -s html/R_Project.htm $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/html/index.html
+	#mkdir -p $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/chm
+	#mv $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/db4o.chm \
 	   $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/chm/
 		
 	# pkg-config

-- 
db4o