[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 5a6299875d52fb30606834626a5ea2ba3ffa3911
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Aug 1 09:15:28 2012 +0200

    Use libyarp-doc.links instead of manually adding the link

diff --git a/debian/libyarp-doc.links b/debian/libyarp-doc.links
index b19e219..14586a7 100644
--- a/debian/libyarp-doc.links
+++ b/debian/libyarp-doc.links
@@ -1 +1,2 @@
 usr/share/doc/libyarp-doc usr/share/doc/yarp
+usr/share/javascript/jquery/jquery.js usr/share/doc/libyarp-doc/html/jquery.js
diff --git a/debian/rules b/debian/rules
index aab79c4..ee87a2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,8 @@ build/libyarp-doc::
 	$(MAKE) -C $(DEB_BUILDDIR) dox
 
 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/
+	rm $(DEB_BUILDDIR)/dox/html/jquery.js
+	cp -au $(DEB_BUILDDIR)/dox/html $(CURDIR)/debian/libyarp-doc/usr/share/doc/libyarp-doc
 
 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