[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 ae7153622ccedfa83777abdbf8ae34649fa042ee
Author: Iain Lane <laney at ubuntu.com>
Date:   Tue Jan 26 11:31:18 2010 +0000

    Remove mdoc postinst and postrm
    
    debian/monodoc-db4o-manual.post{inst,rm}: Remove obsolete maintainer
    scripts which are either not required due to new monodoc features or
    packaging improvements

diff --git a/debian/changelog b/debian/changelog
index 06176b9..144af2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,8 +71,11 @@ db4o (7.4.121.14026+dfsg-1) UNRELEASED; urgency=low
     it has been dfsged out.
   * debian/patches/04-update-relative-paths: Update buildsys to use correct
     relative paths so that lib can be built 
+  * debian/monodoc-db4o-manual.post{inst,rm}: Remove obsolete maintainer
+    scripts which are either not required due to new monodoc features or
+    packaging improvements
 
- -- Iain Lane <laney at ubuntu.com>  Tue, 26 Jan 2010 11:28:20 +0000
+ -- Iain Lane <laney at ubuntu.com>  Tue, 26 Jan 2010 11:30:06 +0000
 
 db4o (6.1.604+dfsg-3) unstable; urgency=low
 
diff --git a/debian/monodoc-db4o-manual.postinst b/debian/monodoc-db4o-manual.postinst
deleted file mode 100644
index a3eae2b..0000000
--- a/debian/monodoc-db4o-manual.postinst
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = "configure" ]; then
-	# Add the node entry
-	grep -v db4o /usr/lib/monodoc/monodoc.xml \
-	           | sed 's@  <node label="Various" name="various">@  <node label="Various" name="various">\n    <node label="db4o" name="db4o"/>@' \
-	           > /usr/lib/monodoc/monodoc.xml.new
-	mv /usr/lib/monodoc/monodoc.xml.new \
-	   /usr/lib/monodoc/monodoc.xml
-	
-	# Rebuild the index
-	if [ -x /usr/bin/monodoc ]; then
-		echo "generating monodoc search index..."
-		/usr/bin/monodoc --make-index > /dev/null
-	fi
-fi
-
-#DEBHELPER#
diff --git a/debian/monodoc-db4o-manual.postrm b/debian/monodoc-db4o-manual.postrm
deleted file mode 100644
index 192023c..0000000
--- a/debian/monodoc-db4o-manual.postrm
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = "remove" ]; then
-	# Remove the node entry
-	grep -v db4o /usr/lib/monodoc/monodoc.xml \
-	           > /usr/lib/monodoc/monodoc.xml.new
-	mv /usr/lib/monodoc/monodoc.xml.new \
-	   /usr/lib/monodoc/monodoc.xml
-
-	# Rebuild the index
-	if [ -x /usr/bin/monodoc ]; then
-		echo "generating monodoc search index..."
-		/usr/bin/monodoc --make-index > /dev/null
-	fi
-fi
-                
-#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index fff12b4..b60932a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,7 @@ override_dh_auto_install:
 	#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/
+	#   $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/chm/
 		
 	# pkg-config
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig

-- 
db4o