[SCM] Libraries, protocols, and tools to keep robot software modules and devices cleanly decoupled branch, master, updated. upstream/2.3.19-30-gf9b24be

[Daniele E. Domenichelli]

The following commit has been merged in the master branch:
commit 61ae51e9daf14ab46cde2894ed026867dab0f1f0
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Jul 31 17:48:27 2012 +0200

    Fix libyarp-doc: embedded-javascript-library usr/share/doc/libyarp-doc/html/jquery.js

diff --git a/debian/control b/debian/control
index 97277fd..22e02f6 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Package: libyarp-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends},
- lynx | www-browser, doc-base
+ lynx | www-browser, doc-base, libjs-jquery
 Description: thin middleware for humanoid robots and more - documentation and examples
  [TODO add description]
  .
diff --git a/debian/rules b/debian/rules
index baf0e5d..aab79c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,8 @@ build/libyarp-doc::
 
 binary-install/libyarp-doc::
 	cp -R $(DEB_BUILDDIR)/dox/html $(CURDIR)/debian/libyarp-doc/usr/share/doc/libyarp-doc
+	rm $(CURDIR)/debian/libyarp-doc/usr/share/doc/libyarp-doc/html/jquery.js
+	ln -s /usr/share/javascript/jquery/jquery.js $(CURDIR)/debian/libyarp-doc/usr/share/doc/libyarp-doc/html/
 
 binary-fixup/libyarp-doc::
 	chmod -x $(CURDIR)/debian/libyarp-doc/usr/share/doc/libyarp-doc/examples/matrix/basic_ops.cpp \

-- 
Libraries, protocols, and tools to keep robot software modules and devices cleanly decoupled