[DRE-commits] [ruby-activeldap] 02/03: [fix] don't use embedded rdoc jquery

[Marc Dequènes]

This is an automated email from the git hooks/post-receive script.

duck pushed a commit to branch master
in repository ruby-activeldap.

commit aebbc7e5668cff70f579f88717b8fa6ddfd176a2
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Mon Dec 2 20:38:37 2013 +0100

    [fix] don't use embedded rdoc jquery
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 44f1d89..2a0c845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ruby-activeldap (3.2.2-2) UNRELEASED; urgency=low
     Test::Unit::Notify.
   * Added missing build dependencies for tests.
   * Depends on ruby-activemodel instead of ruby-activerecord.
+  * Use system JQuery library instead of embedded one for documentation.
 
  -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Mon, 02 Dec 2013 19:46:23 +0100
 
diff --git a/debian/control b/debian/control
index 0ecb031..9a9acd2 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Description: ActiveLdap is a object-oriented API to LDAP
 Package: ruby-activeldap-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Replaces: libactiveldap-ruby-doc (<< 1.2.4-1~)
 Breaks: libactiveldap-ruby-doc (<< 1.2.4-1~)
 Provides: libactiveldap-ruby-doc
diff --git a/debian/rules b/debian/rules
index 9539413..f53941f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,12 @@ override_dh_auto_build:
 	rdoc --all --inline-source --diagram --fileboxes --line-numbers --fmt=html \
 		-o build-doc/rdoc lib
 
+override_dh_installdocs:
+	dh_installdocs
+	# use the system library
+	rm debian/ruby-activeldap-doc/usr/share/doc/ruby-activeldap-doc/rdoc/js/jquery.js
+	dh_link -p ruby-activeldap-doc usr/share/javascript/jquery/jquery.js usr/share/doc/ruby-activeldap-doc/rdoc/js/jquery.js
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf build-doc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-activeldap.git