[Pkg-mono-svn-commits] [SCM] mono-tools branch, master, updated. debian/2.6.2-3

[Jo Shields]

The following commit has been merged in the master branch:
commit fb720eb98fecabec5b2311758dfb5b7fefd8d2ab
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Jun 7 21:58:59 2010 +0100

    use external xmlextras.js

diff --git a/debian/changelog b/debian/changelog
index 347d9f1..3e6ea68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ mono-tools (2.6.2-1) UNRELEASED; urgency=low
   * debian/control,
     debian/mono-tools-devel.install:
     + Add minvoke to mono-tools-devel
+  * debian/rules,
+    debian/control:
+    + Use xmlextras.js from libjs-xmlextras, not the bundled copy
+      (Closes: #584471)
 
  -- Jo Shields <directhex at apebox.org>  Mon, 07 Jun 2010 20:14:57 +0100
 
diff --git a/debian/control b/debian/control
index 5aa48da..280a714 100644
--- a/debian/control
+++ b/debian/control
@@ -83,6 +83,7 @@ Architecture: all
 Depends: monodoc-manual,
  ${cli:Depends},
  ${cli:XspServer2},
+ libjs-xmlextras,
  monodoc-base
 Recommends: lynx | www-browser
 Description: MonoDoc http based viewer
diff --git a/debian/rules b/debian/rules
index 37894fc..bb3cd21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,6 +58,8 @@ binary-indep: build install
 	# fix upstream file permissions
 	find debian/monodoc-http/usr/*/monodoc/web -type f -exec chmod 644 {} \;
 	find debian/monodoc-http/usr/*/monodoc/web -type d -exec chmod 755 {} \;
+	rm debian/monodoc-http/usr/lib/monodoc/web/xtree/xmlextras.js
+	ln -s /usr/share/javascript/xmlextras/xmlextras.js debian/monodoc-http/usr/lib/monodoc/web/xtree/xmlextras.js
 	# remove directories moved to /usr/share/
 	#find debian/monodoc-http/usr/lib/monodoc/web -type d -name "images" -o -name "xtree" | xargs rm -rf
 	dh_installchangelogs ChangeLog

-- 
mono-tools